diff --git a/gearmand-0.28-lp932994.patch b/gearmand-0.28-lp932994.patch deleted file mode 100644 index a3bfee0..0000000 --- a/gearmand-0.28-lp932994.patch +++ /dev/null @@ -1,21 +0,0 @@ -Resolves https://bugs.launchpad.net/gearmand/+bug/932994 ---- gearmand-0.28/util/pidfile.cc.orig 2011-08-17 10:38:30.000000000 -0500 -+++ gearmand-0.28/util/pidfile.cc 2012-03-07 11:28:22.626664434 -0600 -@@ -48,6 +48,7 @@ - #include - #include - #include -+#include - - extern "C" { - ---- gearmand-0.28/util/logfile.cc.orig 2011-08-17 10:38:30.000000000 -0500 -+++ gearmand-0.28/util/logfile.cc 2012-03-07 11:48:21.600108725 -0600 -@@ -49,6 +49,7 @@ - #include - #include - #include -+#include - - namespace datadifferential { - namespace util { diff --git a/gearmand.spec b/gearmand.spec index bf668ac..6676ee0 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -34,6 +34,7 @@ Requires(postun): systemd-units #Patch0: gearmand-0.27-lp914495.patch #Patch1: gearmand-0.28-lp932994.patch +Patch2: gearmand-0.31-lp978235.patch %description Gearman provides a generic framework to farm out work to other machines @@ -81,6 +82,7 @@ Development headers for %{name} 1.0. %prep %setup -q #%%patch1 -p1 -b .lp932994 +%patch2 -p1 -b .lp978235 %build %ifarch ppc64 sparc64 @@ -195,6 +197,7 @@ fi https://launchpad.net/gearmand/trunk/0.31 https://launchpad.net/gearmand/trunk/0.29 - Removed Patch1: gearmand-0.28-lp932994.patch (applied upstream) +- Added Patch2: gearmand-0.31-lp978235.patch. Resolves LP#978235. * Wed Mar 07 2012 BJ Dierkes - 0.28-3 - Adding back _smp_mflags