summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@fedoraproject.org>2008-12-23 04:48:50 +0000
committerMatthias Clasen <mclasen@fedoraproject.org>2008-12-23 04:48:50 +0000
commit67ec205178a7bf909825f8709e69fc54ddc21e3d (patch)
tree56fb55f18b33e6475686ce516fa77b9949eaf5c5
parentb9928709a0a9dd44e2f606ccc2ef97852a43f7f7 (diff)
downloadgnome-applets-67ec205178a7bf909825f8709e69fc54ddc21e3d.tar.gz
gnome-applets-67ec205178a7bf909825f8709e69fc54ddc21e3d.tar.xz
gnome-applets-67ec205178a7bf909825f8709e69fc54ddc21e3d.zip
-rw-r--r--gnome-applets-libgnomeui.patch19
-rw-r--r--gnome-applets.spec7
2 files changed, 23 insertions, 3 deletions
diff --git a/gnome-applets-libgnomeui.patch b/gnome-applets-libgnomeui.patch
index 1bf5a5c..7f6be39 100644
--- a/gnome-applets-libgnomeui.patch
+++ b/gnome-applets-libgnomeui.patch
@@ -17,3 +17,22 @@ diff -up gnome-applets-2.25.2/mini-commander/src/Makefile.am.libgnomeui gnome-ap
$(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
diff --git a/gnome-applets.spec b/gnome-applets.spec
index aafc42c..aef639a 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: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -149,7 +149,6 @@ 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
@@ -158,6 +157,8 @@ tar xjf %{SOURCE2}
%patch3 -p1 -b .ppp-command
%patch34 -p1 -b .ppp-includes
+%patch43 -p1 -b .libgnomeui
+
intltoolize --force
autoreconf
@@ -343,7 +344,7 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
-* Sat Dec 20 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.25.2-3
+* Sat Dec 20 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.25.2-4
- Update to 2.25.2
* Fri Dec 19 2008 - Bastien Nocera <bnocera@redhat.com> - 1:2.25.1-8