rpms/gnome-applets/devel gnome-applets-libgnomeui.patch, 1.3, 1.4 gnome-applets.spec, 1.317, 1.318

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10639

Modified Files:
	gnome-applets-libgnomeui.patch gnome-applets.spec 
Log Message:
fix the build


gnome-applets-libgnomeui.patch:

Index: gnome-applets-libgnomeui.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets-libgnomeui.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-applets-libgnomeui.patch	23 Dec 2008 04:28:57 -0000	1.3
+++ gnome-applets-libgnomeui.patch	23 Dec 2008 04:48:50 -0000	1.4
@@ -17,3 +17,22 @@
  	$(GNOME_APPLETS_LIBS)
  
  mc_install_default_macros_SOURCES =	\
+diff -up gnome-applets-2.25.2/modemlights/Makefile.am.libgnomeui gnome-applets-2.25.2/modemlights/Makefile.am
+--- gnome-applets-2.25.2/modemlights/Makefile.am.libgnomeui	2008-12-22 23:40:19.000000000 -0500
++++ gnome-applets-2.25.2/modemlights/Makefile.am	2008-12-22 23:40:49.000000000 -0500
+@@ -2,6 +2,7 @@ SUBDIRS = docs
+ 
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	$(GNOME_APPLETS_CFLAGS)				\
++	$(GNOME_LIBS2_CLFAGS)				\
+ 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
+ 	-DVERSION=\""$(VERSION)"\"
+ 
+@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
+ 	properties.c
+ 
+ modemlights_applet2_LDADD = \
++		$(GNOME_LIBS2_LIBS)	\
+ 		     $(GNOME_APPLETS_LIBS)
+ 
+ uidir		= $(datadir)/gnome-2.0/ui


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- gnome-applets.spec	23 Dec 2008 04:28:57 -0000	1.317
+++ gnome-applets.spec	23 Dec 2008 04:48:50 -0000	1.318
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.25.2
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -149,7 +149,6 @@
 mv mixer/GNOME_MixerApplet.server.in.in null_applet/GNOME_MixerApplet.server.in
 rm -rf mixer/
 %patch42 -p1 -b .mixer-null
-%patch43 -p1 -b .libgnomeui
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -158,6 +157,8 @@
 %patch3 -p1 -b .ppp-command
 %patch34 -p1 -b .ppp-includes
 
+%patch43 -p1 -b .libgnomeui
+
 intltoolize --force
 autoreconf
 
@@ -343,7 +344,7 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
-* Sat Dec 20 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.25.2-3
+* Sat Dec 20 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.25.2-4
 - Update to 2.25.2
 
 * Fri Dec 19 2008 - Bastien Nocera <bnocera at redhat.com> - 1:2.25.1-8