rpms/gnome-applets/devel gnome-applets-pangoxft.patch, 1.1, 1.2 gnome-applets.spec, 1.84, 1.85

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Aug 18 03:48:00 UTC 2005


Author: katzj

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20311

Modified Files:
	gnome-applets-pangoxft.patch gnome-applets.spec 
Log Message:
* Wed Aug 17 2005 Jeremy Katz <katzj at redhat.com> - 1:2.11.91-5
- fun with auto* to really get the build working


gnome-applets-pangoxft.patch:
 configure.in          |    4 ++++
 gswitchit/Makefile.am |    4 +++-
 gswitchit/Makefile.in |    4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

Index: gnome-applets-pangoxft.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets-pangoxft.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-applets-pangoxft.patch	18 Aug 2005 02:58:21 -0000	1.1
+++ gnome-applets-pangoxft.patch	18 Aug 2005 03:47:56 -0000	1.2
@@ -1,11 +1,43 @@
-Index: gswitchit/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gnome-applets/gswitchit/Makefile.am,v
-retrieving revision 1.26
-retrieving revision 1.27
-diff -u -r1.26 -r1.27
---- gswitchit/Makefile.am	28 Jul 2005 13:10:44 -0000	1.26
-+++ gswitchit/Makefile.am	14 Aug 2005 21:27:38 -0000	1.27
+--- gnome-applets-2.11.91/configure.in.pangoxft	2005-08-17 23:14:12.000000000 -0400
++++ gnome-applets-2.11.91/configure.in	2005-08-17 23:39:29.000000000 -0400
+@@ -116,6 +116,10 @@
+ AC_SUBST(LIBGLADE_CFLAGS)
+ AC_SUBST(LIBGLADE_LIBS)
+ 
++PKG_CHECK_MODULES(PANGOXFT, pangoxft)
++AC_SUBST(PANGOXFT_CFLAGS)
++AC_SUBST(PANGOXFT_LIBS)
++
+ AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
+ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+ 
+--- gnome-applets-2.11.91/gswitchit/Makefile.in.pangoxft	2005-08-17 23:15:18.000000000 -0400
++++ gnome-applets-2.11.91/gswitchit/Makefile.in	2005-08-17 23:39:52.000000000 -0400
+@@ -272,6 +272,8 @@
+ LIBWNCK_LIBS = @LIBWNCK_LIBS@
+ LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
+ LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
++PANGOXFT_CFLAGS = @PANGOXFT_CFLAGS@
++PANGOXFT_LIBS = @PANGOXFT_LIBS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+@@ -386,11 +388,13 @@
+ 	-I.				\
+ 	-DG_LOG_DOMAIN=\"GSwitchIt\"	\
+ 	$(LIBXKLAVIER_CFLAGS)		\
++	$(PANGOXFT_CFLAGS)              \
+ 	$(flags_CFLAGS)			\
+ 	$(LIBGLADE_CFLAGS)
+ 
+ COMMON_LIBS = $(LIBXKLAVIER_LIBS) \
+               $(LIBGLADE_LIBS)	\
++              $(PANGOXFT_LIBS) \
+ 	      $(X_LIBS)
+ 
+ libgswitchit_applet_a_CFLAGS = $(COMMON_CFLAGS) \
+--- gnome-applets-2.11.91/gswitchit/Makefile.am.pangoxft	2005-07-28 09:12:00.000000000 -0400
++++ gnome-applets-2.11.91/gswitchit/Makefile.am	2005-08-17 23:14:12.000000000 -0400
 @@ -25,11 +25,13 @@
  	-I.				\
  	-DG_LOG_DOMAIN=\"GSwitchIt\"	\
@@ -21,20 +53,3 @@
  	      $(X_LIBS)
  
  libgswitchit_applet_a_CFLAGS = $(COMMON_CFLAGS) \
-Index: configure.in
-===================================================================
-RCS file: /cvs/gnome/gnome-applets/configure.in,v
-retrieving revision 1.384
-retrieving revision 1.385
-diff -u -r1.384 -r1.385
---- configure.in	7 Aug 2005 17:45:46 -0000	1.384
-+++ configure.in	14 Aug 2005 21:27:38 -0000	1.385
-@@ -116,6 +116,8 @@
- AC_SUBST(LIBGLADE_CFLAGS)
- AC_SUBST(LIBGLADE_LIBS)
- 
-+PKG_CHECK_MODULES(PANGOXFT, pangoxft)
-+
- AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
- AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
- 


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- gnome-applets.spec	18 Aug 2005 02:59:11 -0000	1.84
+++ gnome-applets.spec	18 Aug 2005 03:47:56 -0000	1.85
@@ -17,7 +17,7 @@
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
 Version: 	2.11.91
-Release:        4
+Release: 5
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -27,6 +27,7 @@
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
 Patch4:		gnome-applets-2.11.1-cpufreq.patch
+# drop this patch when we go to the next version
 Patch5:         gnome-applets-pangoxft.patch
 URL:		http://www.gnome.org/
 
@@ -86,10 +87,9 @@
 
 %patch3 -p1 -b .ppp-command
 
-automake
 autoconf
-%build
 
+%build
 %configure  --enable-suid=no --disable-scrollkeeper
 make
 
@@ -165,6 +165,9 @@
 %{_libdir}/pkgconfig/gswitchit.pc
 
 %changelog
+* Wed Aug 17 2005 Jeremy Katz <katzj at redhat.com> - 1:2.11.91-5
+- fun with auto* to really get the build working
+
 * Wed Aug 17 2005 Jeremy Katz <katzj at redhat.com> - 1:2.11.91-4
 - patch from upstream cvs to fix build with new pango (bgo #313368)
 




More information about the fedora-cvs-commits mailing list