From 10b3bf6ae75f02f8eb88f0eec376c51f82801898 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 20 Jan 2009 19:49:41 +0000
Subject: fix modemlights build

---
 gnome-applets.spec         |  2 ++
 mini-commander.patch       | 30 ------------------------------
 modemlights-libgnome.patch | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 30 deletions(-)
 delete mode 100644 mini-commander.patch
 create mode 100644 modemlights-libgnome.patch

diff --git a/gnome-applets.spec b/gnome-applets.spec
index 8ee75d0..3f1e6ee 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -54,6 +54,7 @@ Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 Patch31:        gnome-applets-2.18.0-fix-find.patch
 
 Patch34:        ppp-includes.patch
+Patch35:        modemlights-libgnome.patch
 
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
@@ -148,6 +149,7 @@ tar xjf %{SOURCE2}
 
 %patch3 -p1 -b .ppp-command
 %patch34 -p1 -b .ppp-includes
+%patch35 -p1 -b .modemlights-libgnome
 
 intltoolize --force
 autoreconf
diff --git a/mini-commander.patch b/mini-commander.patch
deleted file mode 100644
index b8cf16f..0000000
--- a/mini-commander.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up gnome-applets-2.25.3/mini-commander/src/Makefile.am.mini-commander gnome-applets-2.25.3/mini-commander/src/Makefile.am
---- gnome-applets-2.25.3/mini-commander/src/Makefile.am.mini-commander	2009-01-06 21:39:16.000000000 -0500
-+++ gnome-applets-2.25.3/mini-commander/src/Makefile.am	2009-01-06 21:42:34.000000000 -0500
-@@ -35,6 +35,7 @@ mini_commander_applet_SOURCES =			\
- 	mc-default-macros.h
- 
- mini_commander_applet_LDADD =	\
-+	$(GNOME_LIBS2_LIBS)	\
- 	$(GNOME_APPLETS_LIBS)
- 
- mc_install_default_macros_SOURCES =	\
-diff -up gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander gnome-applets-2.25.3/modemlights/Makefile.am
---- gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander	2009-01-06 22:00:00.000000000 -0500
-+++ gnome-applets-2.25.3/modemlights/Makefile.am	2009-01-06 21:59:20.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 --git a/modemlights-libgnome.patch b/modemlights-libgnome.patch
new file mode 100644
index 0000000..6612a4d
--- /dev/null
+++ b/modemlights-libgnome.patch
@@ -0,0 +1,19 @@
+diff -up gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander gnome-applets-2.25.3/modemlights/Makefile.am
+--- gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander	2009-01-06 22:00:00.000000000 -0500
++++ gnome-applets-2.25.3/modemlights/Makefile.am	2009-01-06 21:59:20.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
-- 
cgit