Sophie

Sophie

distrib > Mageia > 5 > i586 > by-pkgid > 31e45edda8f5cebe0f01d773d2c33cd6 > files > 6

gyachi-1.2.11-7.mga5.src.rpm

diff -up ./aclocal.m4.globdiff ./aclocal.m4
--- ./aclocal.m4.globdiff	2009-07-12 13:54:18.000000000 +0100
+++ ./aclocal.m4	2013-10-05 16:53:25.919526792 +0100
@@ -1427,7 +1427,7 @@ changequote([,])dnl
 ])
 
 
-dnl gt_CHECK_DECL(FUNC, INCLUDES)
+dnl gt_CHECK_DECL(FUNC, AM_CPPFLAGS)
 dnl Check whether a function is declared.
 AC_DEFUN([gt_CHECK_DECL],
 [
diff -up ./client/Makefile.am.globdiff ./client/Makefile.am
--- ./client/Makefile.am.globdiff	2011-09-03 09:52:56.000000000 +0100
+++ ./client/Makefile.am	2013-10-05 16:53:25.890526438 +0100
@@ -65,4 +65,4 @@ gyachi_LDFLAGS = -rdynamic
 # Required for localization
 localedir = $(datadir)/locale
 
-INCLUDES = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @HTML_CFLAGS@ @XML_CFLAGS@ @OPENSSL_CFLAGS@
+AM_CPPFLAGS = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @HTML_CFLAGS@ @XML_CFLAGS@ @OPENSSL_CFLAGS@
diff -up ./gyvoice/Makefile.am.globdiff ./gyvoice/Makefile.am
--- ./gyvoice/Makefile.am.globdiff	2009-04-04 17:36:36.000000000 +0100
+++ ./gyvoice/Makefile.am	2013-10-05 16:53:25.889526426 +0100
@@ -59,5 +59,5 @@ gyachivoice_LDADD = @GYACHI_LIB@ @GTK_LI
 # Required for localization
 localedir = $(datadir)/locale
 
-INCLUDES = -DLOCALEDIR=\"$(localedir)\" $(DEPS_CFLAGS) @GTK_CFLAGS@ @GLIB_CFLAGS@ @ALSA_CFLAGS@
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(DEPS_CFLAGS) @GTK_CFLAGS@ @GLIB_CFLAGS@ @ALSA_CFLAGS@
 
diff -up ./lib/Makefile.am.globdiff ./lib/Makefile.am
--- ./lib/Makefile.am.globdiff	2008-11-25 13:00:24.000000000 +0000
+++ ./lib/Makefile.am	2013-10-05 16:53:25.891526450 +0100
@@ -19,5 +19,5 @@ libgyachi_la_LDFLAGS = -shared -fpic -fP
 # Required for localization
 localedir = $(datadir)/locale
 
-INCLUDES = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ -fpic -FPIC
+AM_CPPFLAGS = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ -fpic -FPIC
 
diff -up ./m4/gettext.m4.globdiff ./m4/gettext.m4
--- ./m4/gettext.m4.globdiff	2006-03-12 23:27:44.000000000 +0000
+++ ./m4/gettext.m4	2013-10-05 16:53:25.921526816 +0100
@@ -525,7 +525,7 @@ AC_DEFUN([gt_INTL_MACOSX],
 ])
 
 
-dnl gt_CHECK_DECL(FUNC, INCLUDES)
+dnl gt_CHECK_DECL(FUNC, AM_CPPFLAGS)
 dnl Check whether a function is declared.
 AC_DEFUN([gt_CHECK_DECL],
 [
diff -up ./plugins/alsa/Makefile.am.globdiff ./plugins/alsa/Makefile.am
--- ./plugins/alsa/Makefile.am.globdiff	2008-11-18 20:59:18.000000000 +0000
+++ ./plugins/alsa/Makefile.am	2013-10-05 16:53:25.883526352 +0100
@@ -8,5 +8,5 @@ libgyachialsa_la_LDFLAGS = -shared -fpic
 # Required for localization
 localedir = $(datadir)/locale
 
-INCLUDES = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ -fpic -FPIC
+AM_CPPFLAGS = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ -fpic -FPIC
 
diff -up ./plugins/blowfish/Makefile.am.globdiff ./plugins/blowfish/Makefile.am
--- ./plugins/blowfish/Makefile.am.globdiff	2008-11-18 20:59:18.000000000 +0000
+++ ./plugins/blowfish/Makefile.am	2013-10-05 16:53:25.877526277 +0100
@@ -8,4 +8,4 @@ libgyachiblowfish_la_LDFLAGS = -shared -
 # Required for localization
 localedir = $(datadir)/locale
 
-INCLUDES = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ -fpic -FPIC
+AM_CPPFLAGS = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ -fpic -FPIC
diff -up ./plugins/esd/Makefile.am.globdiff ./plugins/esd/Makefile.am
--- ./plugins/esd/Makefile.am.globdiff	2008-11-18 20:59:18.000000000 +0000
+++ ./plugins/esd/Makefile.am	2013-10-05 16:53:25.880526317 +0100
@@ -8,4 +8,4 @@ libgyachiesd_la_LDFLAGS = -shared -fpic
 # Required for localization
 localedir = $(datadir)/locale
 
-INCLUDES = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ -fpic -FPIC
+AM_CPPFLAGS = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ -fpic -FPIC
diff -up ./plugins/gpgme/Makefile.am.globdiff ./plugins/gpgme/Makefile.am
--- ./plugins/gpgme/Makefile.am.globdiff	2008-11-18 20:59:18.000000000 +0000
+++ ./plugins/gpgme/Makefile.am	2013-10-05 16:53:25.881526329 +0100
@@ -8,4 +8,4 @@ libgyachigpgme_la_LDFLAGS = -shared -fpi
 # Required for localization
 localedir = $(datadir)/locale
 
-INCLUDES = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ -fpic -FPIC
+AM_CPPFLAGS = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ -fpic -FPIC
diff -up ./plugins/gtkspell/Makefile.am.globdiff ./plugins/gtkspell/Makefile.am
--- ./plugins/gtkspell/Makefile.am.globdiff	2008-11-25 13:00:24.000000000 +0000
+++ ./plugins/gtkspell/Makefile.am	2013-10-05 16:53:25.884526364 +0100
@@ -8,4 +8,4 @@ libgyachigtkspell_la_LDFLAGS = -shared -
 # Required for localization
 localedir = $(datadir)/locale
 
-INCLUDES = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ @GTKSPELL_CFLAGS@ -fpic -FPIC
+AM_CPPFLAGS = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ @GTKSPELL_CFLAGS@ -fpic -FPIC
diff -up ./plugins/libnotify/Makefile.am.globdiff ./plugins/libnotify/Makefile.am
--- ./plugins/libnotify/Makefile.am.globdiff	2008-11-18 20:59:19.000000000 +0000
+++ ./plugins/libnotify/Makefile.am	2013-10-05 16:53:25.879526304 +0100
@@ -8,4 +8,4 @@ libgyachilibnotify_la_LDFLAGS = -shared
 # Required for localization
 localedir = $(datadir)/locale
 
-INCLUDES = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ @LIBNOTIFY_CFLAGS@ -fpic -FPIC
+AM_CPPFLAGS = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ @LIBNOTIFY_CFLAGS@ -fpic -FPIC
diff -up ./plugins/mcrypt/Makefile.am.globdiff ./plugins/mcrypt/Makefile.am
--- ./plugins/mcrypt/Makefile.am.globdiff	2008-11-18 20:59:19.000000000 +0000
+++ ./plugins/mcrypt/Makefile.am	2013-10-05 16:53:25.885526377 +0100
@@ -8,4 +8,4 @@ libgyachimcrypt_la_LDFLAGS = -shared -fp
 # Required for localization
 localedir = $(datadir)/locale
 
-INCLUDES = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ -fpic -FPIC
+AM_CPPFLAGS = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ -fpic -FPIC
diff -up ./plugins/photos/Makefile.am.globdiff ./plugins/photos/Makefile.am
--- ./plugins/photos/Makefile.am.globdiff	2008-11-18 20:59:19.000000000 +0000
+++ ./plugins/photos/Makefile.am	2013-10-05 16:53:25.887526402 +0100
@@ -8,4 +8,4 @@ libgyachiphotos_la_LDFLAGS = -shared -fp
 # Required for localization
 localedir = $(datadir)/locale
 
-INCLUDES = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ -fpic -FPIC
+AM_CPPFLAGS = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ -fpic -FPIC
diff -up ./plugins/pulseaudio/Makefile.am.globdiff ./plugins/pulseaudio/Makefile.am
--- ./plugins/pulseaudio/Makefile.am.globdiff	2008-11-18 20:59:19.000000000 +0000
+++ ./plugins/pulseaudio/Makefile.am	2013-10-05 16:53:25.886526389 +0100
@@ -8,4 +8,4 @@ libgyachipulseaudio_la_LDFLAGS = -shared
 # Required for localization
 localedir = $(datadir)/locale
 
-INCLUDES = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ @PULSEAUDIO_CFLAGS@ -fpic -FPIC
+AM_CPPFLAGS = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ @PULSEAUDIO_CFLAGS@ -fpic -FPIC
diff -up ./plugins/xmms/Makefile.am.globdiff ./plugins/xmms/Makefile.am
--- ./plugins/xmms/Makefile.am.globdiff	2008-11-18 20:59:19.000000000 +0000
+++ ./plugins/xmms/Makefile.am	2013-10-05 16:53:25.878526290 +0100
@@ -8,4 +8,4 @@ libgyachixmms_la_LDFLAGS = -shared -fpic
 # Required for localization
 localedir = $(datadir)/locale
 
-INCLUDES = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ -fpic -FPIC
+AM_CPPFLAGS = $(PLUGIN_DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ -fpic -FPIC
diff -up ./spec_files/gentoo/gyachi.patch.globdiff ./spec_files/gentoo/gyachi.patch
--- ./spec_files/gentoo/gyachi.patch.globdiff	2007-10-01 20:05:21.000000000 +0100
+++ ./spec_files/gentoo/gyachi.patch	2013-10-05 16:53:25.874526247 +0100
@@ -36,9 +36,9 @@ diff -Naur gyachi/plugins/Makefile.am gy
  # Required for localization
  localedir = $(datadir)/locale
  
--INCLUDES = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -I../client @GTK_CFLAGS@ @GLIB_CFLAGS@
-+#INCLUDES = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -I../client @GTK_CFLAGS@ @GLIB_CFLAGS@
-+INCLUDES = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -I../client @GTK_CFLAGS@ @GLIB_CFLAGS@ -shared -fpic -fPIC
+-AM_CPPFLAGS = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -I../client @GTK_CFLAGS@ @GLIB_CFLAGS@
++#AM_CPPFLAGS = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -I../client @GTK_CFLAGS@ @GLIB_CFLAGS@
++AM_CPPFLAGS = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -I../client @GTK_CFLAGS@ @GLIB_CFLAGS@ -shared -fpic -fPIC
 +
 diff -Naur gyachi/po/Makefile.in.in gyachi-mod/po/Makefile.in.in
 --- gyachi/po/Makefile.in.in	2006-06-05 09:16:40.000000000 -0500
diff -up ./webcam/Makefile.am.globdiff ./webcam/Makefile.am
--- ./webcam/Makefile.am.globdiff	2010-07-25 14:38:52.000000000 +0100
+++ ./webcam/Makefile.am	2013-10-05 16:53:25.876526266 +0100
@@ -26,4 +26,4 @@ gyachi_upload_LDADD = @GYACHI_LIB@ @GTK_
 # Required for localization
 localedir = $(datadir)/locale
 
-INCLUDES = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ @LIBV4L1_CFLAGS@ @LIBV4L2_CFLAGS@
+AM_CPPFLAGS = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@ @GLIB_CFLAGS@ @LIBV4L1_CFLAGS@ @LIBV4L2_CFLAGS@

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional