summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Horák <sharkcz@fedoraproject.org>2010-06-17 09:00:03 +0000
committerDan Horák <sharkcz@fedoraproject.org>2010-06-17 09:00:03 +0000
commit7ac1e4ae1796389e001503f097709caca07704e8 (patch)
tree88b6aac6b2e22109114f28b231f50e88a63b5d63
parent129b14e0f65e7cf85e449568109f5b60d07466c4 (diff)
downloadgnome-panel-2_31_2-3_fc14.tar.gz
gnome-panel-2_31_2-3_fc14.tar.xz
gnome-panel-2_31_2-3_fc14.zip
- link also with libmgnome-panel-2_31_2-3_fc14
-rw-r--r--gnome-panel-2.31.2-libm.patch12
-rw-r--r--gnome-panel.spec9
2 files changed, 20 insertions, 1 deletions
diff --git a/gnome-panel-2.31.2-libm.patch b/gnome-panel-2.31.2-libm.patch
new file mode 100644
index 0000000..97b2991
--- /dev/null
+++ b/gnome-panel-2.31.2-libm.patch
@@ -0,0 +1,12 @@
+diff -up gnome-panel-2.31.2/applets/clock/Makefile.am.libm gnome-panel-2.31.2/applets/clock/Makefile.am
+--- gnome-panel-2.31.2/applets/clock/Makefile.am.libm 2010-06-17 10:21:14.000000000 +0200
++++ gnome-panel-2.31.2/applets/clock/Makefile.am 2010-06-17 10:21:28.000000000 +0200
+@@ -67,7 +67,7 @@ CLOCK_LDADD = \
+ $(CLOCK_LIBS) \
+ $(LIBPANEL_APPLET_LIBS) \
+ $(POLKIT_LIBS) \
+- -lgweather
++ -lgweather -lm
+
+ BUILT_SOURCES = \
+ clock-marshallers.c \
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 18e7c7b..1a08c2e 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.31.2
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.gnome.org
#VCS: git:git://git.gnome.org/gnome-panel
Source0: http://download.gnome.org/sources/gnome-panel/2.31/%{name}-%{version}.tar.bz2
@@ -124,6 +124,9 @@ Patch47: fix-clock-crash.patch
Patch48: gnome-panel-libs.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=621864
+Patch49: gnome-panel-2.31.2-libm.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -174,6 +177,7 @@ Panel Applets using the libpanel-applet library.
#%patch45 -p1 -b .icon-padding
%patch47 -p1 -b .fix-clock-crash
%patch48 -p1 -b .libs
+%patch49 -p1 -b .libm
cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
cp -f %{SOURCE4} m4
@@ -367,6 +371,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Jun 17 2010 Dan Horák <dan[at]danny.cz> 2.31.2-3
+- link also with libm
+
* Sat May 29 2010 Matthias Clasen <mclasen@redhat.com> 2.31.2-2
- Rebuild