fix the build

2 files changed, 13 insertions, 216 deletions

diff --git a/gnome-applets-libgnomeui.patch b/gnome-applets-libgnomeui.patch
index 9adedd2..1bf5a5c 100644
--- a/gnome-applets-libgnomeui.patch
+++ b/gnome-applets-libgnomeui.patch
@@ -1,226 +1,19 @@
-diff -up gnome-applets-2.25.1/accessx-status/Makefile.am.libgnomeui gnome-applets-2.25.1/accessx-status/Makefile.am
---- gnome-applets-2.25.1/accessx-status/Makefile.am.libgnomeui	2008-06-11 02:34:20.000000000 -0400
-+++ gnome-applets-2.25.1/accessx-status/Makefile.am	2008-12-19 01:07:09.000000000 -0500
-@@ -1,6 +1,8 @@
- SUBDIRS = docs pixmaps
- 
--INCLUDES = $(GNOME_APPLETS_CFLAGS)
-+INCLUDES = \
-+	$(GNOME_APPLETS_CFLAGS)	\
-+	$(GNOME_LIBS2_CFLAGS)
- 
- libexec_PROGRAMS = accessx-status-applet
- 
-@@ -10,6 +12,7 @@ accessx_status_applet_SOURCES = \
- 
- accessx_status_applet_LDADD = \
- 	$(GNOME_APPLETS_LIBS) \
-+	$(GNOME_LIBS2_LIBS) \
-         $(X_LIBS)
- 
- serverdir       = $(libdir)/bonobo/servers
-diff -up gnome-applets-2.25.1/charpick/Makefile.am.libgnomeui gnome-applets-2.25.1/charpick/Makefile.am
---- gnome-applets-2.25.1/charpick/Makefile.am.libgnomeui	2008-06-11 02:31:27.000000000 -0400
-+++ gnome-applets-2.25.1/charpick/Makefile.am	2008-12-19 01:07:09.000000000 -0500
-@@ -4,6 +4,7 @@ INCLUDES =			\
- 	-I.			\
- 	-I$(srcdir)		\
- 	$(GNOME_APPLETS_CFLAGS)	\
-+	$(GNOME_LIBS2_CFLAGS)	\
- 	$(GUCHARMAP_CFLAGS)
- 
- libexec_PROGRAMS = charpick_applet2
-@@ -14,6 +15,7 @@ charpick_applet2_SOURCES = charpick.c \
- 
- charpick_applet2_LDADD = \
- 		       $(GNOME_APPLETS_LIBS)	\
-+		       $(GNOME_LIBS2_LIBS)	\
- 		       $(GUCHARMAP_LIBS)
- 
- serverdir       = $(libdir)/bonobo/servers
-diff -up gnome-applets-2.25.1/cpufreq/src/Makefile.am.libgnomeui gnome-applets-2.25.1/cpufreq/src/Makefile.am
---- gnome-applets-2.25.1/cpufreq/src/Makefile.am.libgnomeui	2008-12-19 01:10:06.000000000 -0500
-+++ gnome-applets-2.25.1/cpufreq/src/Makefile.am	2008-12-19 01:10:29.000000000 -0500
-@@ -6,6 +6,7 @@ SUBDIRS = $(selector_SUBDIR)
- 
- INCLUDES = \
- 	$(GNOME_APPLETS_CFLAGS) 				\
-+	$(GNOME_LIBS2_CFLAGS)					\
- 	$(LIBGLADE_CFLAGS)
- 
- if HAVE_POLKIT_GNOME
-@@ -33,6 +34,7 @@ cpufreq_applet_SOURCES =  \
- 
- cpufreq_applet_LDADD =  \
- 	$(GNOME_APPLETS_LIBS)   	\
-+	$(GNOME_LIBS2_LIBS)		\
- 	$(LIBGLADE_LIBS)		\
- 	$(LIBCPUFREQ_LIBS)
- 
-diff -up gnome-applets-2.25.1/drivemount/Makefile.am.libgnomeui gnome-applets-2.25.1/drivemount/Makefile.am
---- gnome-applets-2.25.1/drivemount/Makefile.am.libgnomeui	2008-06-11 02:32:46.000000000 -0400
-+++ gnome-applets-2.25.1/drivemount/Makefile.am	2008-12-19 01:07:09.000000000 -0500
-@@ -3,7 +3,8 @@ SUBDIRS = help
- INCLUDES =			\
- 	-I.			\
- 	-I$(srcdir)		\
--	$(GNOME_APPLETS_CFLAGS) 
-+	$(GNOME_APPLETS_CFLAGS)	\
-+	$(GNOME_LIBS2_CFLAGS)
- 
- libexec_PROGRAMS = drivemount_applet2
- 
-@@ -15,7 +16,8 @@ drivemount_applet2_SOURCES =	\
- 	drive-button.h
- 
- drivemount_applet2_LDADD =	\
--	$(GNOME_APPLETS_LIBS) 
-+	$(GNOME_APPLETS_LIBS)	\ 
-+	$(GNOME_LIBS2_LIBS)
- 
- serverdir       = $(libdir)/bonobo/servers
- server_in_files = GNOME_DriveMountApplet.server.in
-diff -up gnome-applets-2.25.1/geyes/Makefile.am.libgnomeui gnome-applets-2.25.1/geyes/Makefile.am
---- gnome-applets-2.25.1/geyes/Makefile.am.libgnomeui	2008-09-02 05:56:54.000000000 -0400
-+++ gnome-applets-2.25.1/geyes/Makefile.am	2008-12-19 01:07:09.000000000 -0500
-@@ -4,6 +4,7 @@ INCLUDES =						\
- 	-I.						\
- 	-I$(srcdir) 					\
- 	$(GNOME_APPLETS_CFLAGS)				\
-+	$(GNOME_LIBS2_CFLAGS)				\
- 	-I$(includedir) 				\
- 	-DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\"
- 
-@@ -14,8 +15,9 @@ geyes_applet2_SOURCES =	\
- 	themes.c \
- 	geyes.h
- 
--geyes_applet2_LDADD = \
--	$(GNOME_APPLETS_LIBS)
-+geyes_applet2_LDADD = 		\
-+	$(GNOME_APPLETS_LIBS)	\
-+	$(GNOME_LIBS2_LIBS)
- 
- serverdir       = $(libdir)/bonobo/servers
- server_in_files = GNOME_GeyesApplet.server.in
-diff -up gnome-applets-2.25.1/gswitchit/Makefile.am.libgnomeui gnome-applets-2.25.1/gswitchit/Makefile.am
---- gnome-applets-2.25.1/gswitchit/Makefile.am.libgnomeui	2008-06-11 02:27:32.000000000 -0400
-+++ gnome-applets-2.25.1/gswitchit/Makefile.am	2008-12-19 01:07:09.000000000 -0500
-@@ -23,10 +23,12 @@ COMMON_CFLAGS =				\
- 	-DG_LOG_DOMAIN=\"GSwitchIt\"	\
- 	$(LIBGNOMEKBDUI_CFLAGS)		\
- 	$(GNOME_APPLETS_CFLAGS)		\
-+	$(GNOME_LIBS2_CFLAGS)		\
- 	$(flags_CFLAGS)	
- 
- COMMON_LIBS = $(LIBGNOMEKBDUI_LIBS) \
--	      $(GNOME_APPLETS_LIBS)
-+	      $(GNOME_APPLETS_LIBS) \
-+	      $(GNOME_LIBS2_LIBS)
- 
- libgswitchit_applet_a_CFLAGS = $(COMMON_CFLAGS)
- 
-diff -up gnome-applets-2.25.1/gweather/Makefile.am.libgnomeui gnome-applets-2.25.1/gweather/Makefile.am
---- gnome-applets-2.25.1/gweather/Makefile.am.libgnomeui	2008-09-04 19:19:02.000000000 -0400
-+++ gnome-applets-2.25.1/gweather/Makefile.am	2008-12-19 01:07:09.000000000 -0500
-@@ -7,8 +7,10 @@ INCLUDES =				\
- 	-I$(top_srcdir)			\
- 	-DGTK_ENABLE_BROKEN		\
- 	$(GNOME_APPLETS_CFLAGS)		\
-+	$(GNOME_LIBS2_CFLAGS)		\
- 	$(LIBNOTIFY_CFLAGS)		\
--	$(LIBGWEATHER_CFLAGS)
-+	$(LIBGWEATHER_CFLAGS)		\
-+	$(NETWORKMANAGER_CFLAGS)
- 
- libexec_PROGRAMS = gweather-applet-2
- 
-@@ -20,10 +22,12 @@ gweather_applet_2_SOURCES = \
- 	gweather-dialog.c gweather-dialog.h \
- 	gweather-applet.c gweather-applet.h
- 
--gweather_applet_2_LDADD = \
--	$(LIBNOTIFY_LIBS) \
-+gweather_applet_2_LDADD = 	\
-+	$(LIBNOTIFY_LIBS) 	\
- 	$(GNOME_APPLETS_LIBS)	\
--	$(LIBGWEATHER_LIBS)
-+	$(GNOME_LIBS2_LIBS)	\
-+	$(LIBGWEATHER_LIBS) 	\
-+	$(NETWORKMANAGER_LIBS)
- 
- uidir = $(datadir)/gnome-2.0/ui
- ui_DATA = GNOME_GWeatherApplet.xml
-diff -up gnome-applets-2.25.1/mini-commander/src/Makefile.am.libgnomeui gnome-applets-2.25.1/mini-commander/src/Makefile.am
---- gnome-applets-2.25.1/mini-commander/src/Makefile.am.libgnomeui	2008-09-02 05:56:55.000000000 -0400
-+++ gnome-applets-2.25.1/mini-commander/src/Makefile.am	2008-12-19 01:07:09.000000000 -0500
-@@ -4,6 +4,7 @@ INCLUDES = 				\
+diff -up gnome-applets-2.25.2/mini-commander/src/Makefile.am.libgnomeui gnome-applets-2.25.2/mini-commander/src/Makefile.am
+--- gnome-applets-2.25.2/mini-commander/src/Makefile.am.libgnomeui	2008-12-22 23:13:10.000000000 -0500
++++ gnome-applets-2.25.2/mini-commander/src/Makefile.am	2008-12-22 23:13:43.000000000 -0500
+@@ -3,6 +3,7 @@
+ INCLUDES = 				\
  	-I.				\
  	-I$(srcdir)			\
- 	$(GNOME_APPLETS_CFLAGS)		\
 +	$(GNOME_LIBS2_CFLAGS)		\
+ 	$(GNOME_APPLETS_CFLAGS)		\
  	$(WARN_CFLAGS)			\
  	$(GNOME_INCLUDEDIR)
- 
 @@ -34,6 +35,7 @@ mini_commander_applet_SOURCES =			\
  	mc-default-macros.h
  
  mini_commander_applet_LDADD =	\
-+	$(GNOME_LIBS2_LIBS)	\	
++	$(GNOME_LIBS2_LIBS)	\
  	$(GNOME_APPLETS_LIBS)
  
  mc_install_default_macros_SOURCES =	\
-diff -up gnome-applets-2.25.1/modemlights/Makefile.am.libgnomeui gnome-applets-2.25.1/modemlights/Makefile.am
---- gnome-applets-2.25.1/modemlights/Makefile.am.libgnomeui	2004-11-04 06:44:55.000000000 -0500
-+++ gnome-applets-2.25.1/modemlights/Makefile.am	2008-12-19 01:07:09.000000000 -0500
-@@ -2,6 +2,7 @@ SUBDIRS = docs
- 
- INCLUDES = -I. -I$(srcdir) 				\
- 	$(GNOME_APPLETS_CFLAGS)				\
-+	$(GNOME_LIBS2_CFLAGS)				\
- 	-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
-diff -up gnome-applets-2.25.1/stickynotes/Makefile.am.libgnomeui gnome-applets-2.25.1/stickynotes/Makefile.am
---- gnome-applets-2.25.1/stickynotes/Makefile.am.libgnomeui	2008-09-29 20:27:02.000000000 -0400
-+++ gnome-applets-2.25.1/stickynotes/Makefile.am	2008-12-19 01:07:09.000000000 -0500
-@@ -12,6 +12,7 @@ INCLUDES =					\
- 	-I.					\
- 	-I$(srcdir)				\
- 	$(GNOME_APPLETS_CFLAGS)			\
-+	$(GNOME_LIBS2_CFLAGS)			\
- 	$(LIBWNCK_CFLAGS)			\
- 	$(XML2_CFLAGS)				\
- 	-DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/stickynotes/\"
-@@ -33,6 +34,7 @@ stickynotes_applet_SOURCES = \
- stickynotes_applet_LDADD =	\
- 	$(GNOME_APPLETS_LIBS)	\
- 	$(LIBWNCK_LIBS)		\
-+	$(GNOME_LIBS2_LIBS)	\
- 	$(XML2_LIBS)
- 
- builder_DATA = $(builder_files)
-diff -up gnome-applets-2.25.1/trashapplet/src/Makefile.am.libgnomeui gnome-applets-2.25.1/trashapplet/src/Makefile.am
---- gnome-applets-2.25.1/trashapplet/src/Makefile.am.libgnomeui	2008-06-11 02:26:42.000000000 -0400
-+++ gnome-applets-2.25.1/trashapplet/src/Makefile.am	2008-12-19 01:07:09.000000000 -0500
-@@ -1,5 +1,6 @@
- INCLUDES = -I$(top_srcdir)		\
- 	   $(GNOME_APPLETS_CFLAGS)	\
-+	   $(GNOME_LIBS2_CFLAGS)	\
- 	   $(GIO_CFLAGS)
- 
- libexec_PROGRAMS = trashapplet
-@@ -13,4 +14,5 @@ trashapplet_SOURCES = \
- 
- trashapplet_LDADD = 		\
- 	$(GNOME_APPLETS_LIBS) 	\
-+	$(GNOME_LIBS2_LIBS)	\
- 	$(GIO_LIBS)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0926822..aafc42c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.25.2
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -60,6 +60,9 @@ Patch40:	gnome-applets-null-battstat.patch
 # and for the mixer applet
 Patch42:	gnome-applets-remove-mixer.patch
 
+# make mini-commander build
+Patch43:	gnome-applets-libgnomeui.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -146,6 +149,7 @@ and more.
 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
@@ -339,7 +343,7 @@ fi
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
-* Sat Dec 20 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.25.2-2
+* Sat Dec 20 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.25.2-3
 - Update to 2.25.2
 
 * Fri Dec 19 2008 - Bastien Nocera <bnocera@redhat.com> - 1:2.25.1-8