[gnome-applets/f16] gah, better to actually apply a patch

[Matthias Clasen]

commit 8eef86e7a43410a70dc2e4e9c75aebf059c795c1
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Aug 31 18:27:36 2011 -0400

    gah, better to actually apply a patch

 0001-Explicitly-link-against-libm.patch |   58 +++++++++++++++++++++++++++++++
 gnome-applets-libs.patch                |   13 -------
 gnome-applets.spec                      |    3 +-
 3 files changed, 60 insertions(+), 14 deletions(-)
---
diff --git a/0001-Explicitly-link-against-libm.patch b/0001-Explicitly-link-against-libm.patch
new file mode 100644
index 0000000..6f61419
--- /dev/null
+++ b/0001-Explicitly-link-against-libm.patch
@@ -0,0 +1,58 @@
+From d9020e1eb228e780fc0bbc316a6741ed5b6cb3c5 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Thu, 1 Sep 2011 00:23:04 +0300
+Subject: [PATCH] Explicitly link against libm
+
+gdk-pixbuf used to include libm in its pkgconfig libs line, but that was
+recently changed.
+---
+ configure.in          |    3 +++
+ geyes/Makefile.am     |    3 ++-
+ multiload/Makefile.am |    3 ++-
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 118e34b..a089ac8 100644
+--- a/configure.in
++++ b/configure.in
+@@ -51,6 +51,9 @@ AM_CHECK_PYTHON_HEADERS(HAVE_PYHDRS="yes", HAVE_PYHDRS="no")
+ X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+ AC_SUBST(X_LIBS)
+ 
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ GNOME_COMPILE_WARNINGS
+ 
+ dnl Check for non-portable headers
+diff --git a/geyes/Makefile.am b/geyes/Makefile.am
+index 935d932..46abd31 100644
+--- a/geyes/Makefile.am
++++ b/geyes/Makefile.am
+@@ -16,7 +16,8 @@ geyes_applet2_SOURCES =	\
+ 	geyes.h
+ 
+ geyes_applet2_LDADD = 		\
+-	$(GNOME_APPLETS_LIBS)
++	$(GNOME_APPLETS_LIBS)	\
++	$(LIBM)
+ 
+ appletdir       = $(datadir)/gnome-panel/4.0/applets
+ applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in
+diff --git a/multiload/Makefile.am b/multiload/Makefile.am
+index a659f07..94da298 100644
+--- a/multiload/Makefile.am
++++ b/multiload/Makefile.am
+@@ -24,7 +24,8 @@ multiload_applet_2_SOURCES = \
+ multiload_applet_2_LDADD = \
+ 				$(GNOME_APPLETS_LIBS) 	\
+ 				$(GTOP_APPLETS_LIBS)	\
+-				$(GIO_UNIX_LIBS)
++				$(GIO_UNIX_LIBS)	\
++				$(LIBM)
+ 
+ schemasdir   = @GCONF_SCHEMA_FILE_DIR@
+ schemas_in_files = multiload.schemas.in
+-- 
+1.7.6.1
+
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d4343cb..0318ff5 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -41,7 +41,7 @@ Group:          User Interface/Desktops
 URL:		http://www.gnome.org/
 # VCS: git:git://git.gnome.org/gnome-applets
 Source:		http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
-Patch: gnome-applets-libs.patch
+Patch: 0001-Explicitly-link-against-libm.patch
 
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk3-devel >= %{gtk3_version}
@@ -101,6 +101,7 @@ and more.
 
 %prep
 %setup -q
+%patch0 -p1
 
 autoreconf -i -f