From 6504c0eae2f3174d10c58eaadce32b4dc121df41 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:19:21 +0000 Subject: [PATCH 01/12] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5a61321..e8d0c10 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := gearmand SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 7c10c861a82cadc2808ad1243d2ff6f786e0d08f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 7 Feb 2010 15:48:28 +0000 Subject: [PATCH 02/12] rebuilt against new libmemcached --- gearmand.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index f9b0f70..d73a4e9 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand Version: 0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -130,6 +130,9 @@ fi %changelog +* Sun Feb 07 2010 Remi Collet - 0.9-2 +- rebuilt against new libmemcached + * Fri Jul 31 2009 Ruben Kerkhof 0.9-1 - Upstream released new version From 58da3fa88e3f2cc4b293b91abf4ea3a6d8d99a0e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 7 Feb 2010 16:42:14 +0000 Subject: [PATCH 03/12] add patch to detect libmemcached --- gearmand-libmemcached.patch | 22 ++++++++++++++++++++++ gearmand.spec | 9 ++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gearmand-libmemcached.patch diff --git a/gearmand-libmemcached.patch b/gearmand-libmemcached.patch new file mode 100644 index 0000000..f709dd3 --- /dev/null +++ b/gearmand-libmemcached.patch @@ -0,0 +1,22 @@ +--- m4/pandora_have_libmemcached.m4.orig 2010-02-07 17:19:54.000000000 +0100 ++++ m4/pandora_have_libmemcached.m4 2010-02-07 17:20:05.000000000 +0100 +@@ -15,7 +15,7 @@ + ], [ + memcached_st memc; + memcached_dump_func *df; +- memcached_version(); ++ memcached_version(NULL); + ]) + + AM_CONDITIONAL(HAVE_LIBMEMCACHED, [test "x${ac_cv_libmemcached}" = "xyes"]) +--- configure.orig 2010-02-07 17:23:30.000000000 +0100 ++++ configure 2010-02-07 17:23:42.000000000 +0100 +@@ -24161,7 +24161,7 @@ + + memcached_st memc; + memcached_dump_func *df; +- memcached_version(); ++ memcached_version(NULL); + + ; + return 0; diff --git a/gearmand.spec b/gearmand.spec index d73a4e9..a763354 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand Version: 0.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -11,6 +11,8 @@ Source1: gearmand.init Source2: gearmand.sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: gearmand-libmemcached.patch + BuildRequires: libevent-devel, libuuid-devel, libmemcached-devel, memcached %ifnarch ppc64 sparc64 @@ -52,6 +54,8 @@ Development libraries for %{name} %prep %setup -q +%patch0 -p0 + %build %ifarch ppc64 sparc64 @@ -130,6 +134,9 @@ fi %changelog +* Sun Feb 07 2010 Remi Collet - 0.9-3 +- patch to detect libmemcached + * Sun Feb 07 2010 Remi Collet - 0.9-2 - rebuilt against new libmemcached From d231e879fa21aec315ccaf4254b20eb545f8a005 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Tue, 16 Feb 2010 14:55:33 +0000 Subject: [PATCH 04/12] - Update to latest upstream version (#565808) - Add missing Req. libevent-devel for libgearman-devel (#565808) --- .cvsignore | 2 +- gearmand.spec | 28 ++++++++++++++++------------ sources | 2 +- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.cvsignore b/.cvsignore index 408989f..2b1340d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gearmand-0.9.tar.gz +gearmand-0.11.tar.gz diff --git a/gearmand.spec b/gearmand.spec index a763354..93fd797 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand -Version: 0.9 -Release: 3%{?dist} +Version: 0.11 +Release: 1%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -9,9 +9,8 @@ URL: http://www.gearman.org Source0: http://launchpad.net/gearmand/trunk/%{version}/+download/gearmand-%{version}.tar.gz Source1: gearmand.init Source2: gearmand.sysconfig -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - Patch0: gearmand-libmemcached.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libevent-devel, libuuid-devel, libmemcached-devel, memcached @@ -38,6 +37,7 @@ communicates. Summary: Development headers for libgearman Requires: pkgconfig, libgearman = %{version}-%{release} Group: Development/Libraries +Requires: libevent-devel %description -n libgearman-devel Development headers for %{name} @@ -53,18 +53,17 @@ Development libraries for %{name} %prep %setup -q - -%patch0 -p0 - +%patch0 -p0 -b .libmemcached %build %ifarch ppc64 sparc64 # no tcmalloc -%configure --disable-static +%configure --disable-static --disable-rpath %else -%configure --disable-static --enable-tcmalloc +%configure --disable-static --disable-rpath --enable-tcmalloc %endif +libtoolize -f sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} @@ -73,7 +72,7 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -rm -v %{buildroot}%{_libdir}/libgearman.la +rm -v %{buildroot}%{_libdir}/libgearman*.la install -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/gearmand install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/gearmand mkdir -p %{buildroot}/var/run/gearmand @@ -123,17 +122,22 @@ fi %doc AUTHORS ChangeLog COPYING README %dir %{_includedir}/libgearman %{_includedir}/libgearman/*.h +%{_includedir}/libgearman-server/*.h %{_libdir}/pkgconfig/gearmand.pc -%{_libdir}/libgearman.so +%{_libdir}/libgearman*.so %{_mandir}/man3/gearman*.3.gz %files -n libgearman %defattr(-,root,root,-) %doc COPYING %{_libdir}/libgearman.so.* - +%{_libdir}/libgearman*.so.* %changelog +* Tue Feb 16 2010 Oliver Falk 0.11-1 +- Update to latest upstream version (#565808) +- Add missing Req. libevent-devel for libgearman-devel (#565808) + * Sun Feb 07 2010 Remi Collet - 0.9-3 - patch to detect libmemcached diff --git a/sources b/sources index abe718a..a609ae8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8bdedc7809180f5f33ec123e2c47389e gearmand-0.9.tar.gz +62da8118c76d29d07bf5e54099e11dbb gearmand-0.11.tar.gz From d3c557f669206400d4d720f087baee6a575717e8 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Tue, 16 Feb 2010 15:22:19 +0000 Subject: [PATCH 05/12] Remove libmemcache patch - should be fixed in 0.11 --- gearmand-libmemcached.patch | 22 ---------------------- gearmand.spec | 3 +-- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 gearmand-libmemcached.patch diff --git a/gearmand-libmemcached.patch b/gearmand-libmemcached.patch deleted file mode 100644 index f709dd3..0000000 --- a/gearmand-libmemcached.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- m4/pandora_have_libmemcached.m4.orig 2010-02-07 17:19:54.000000000 +0100 -+++ m4/pandora_have_libmemcached.m4 2010-02-07 17:20:05.000000000 +0100 -@@ -15,7 +15,7 @@ - ], [ - memcached_st memc; - memcached_dump_func *df; -- memcached_version(); -+ memcached_version(NULL); - ]) - - AM_CONDITIONAL(HAVE_LIBMEMCACHED, [test "x${ac_cv_libmemcached}" = "xyes"]) ---- configure.orig 2010-02-07 17:23:30.000000000 +0100 -+++ configure 2010-02-07 17:23:42.000000000 +0100 -@@ -24161,7 +24161,7 @@ - - memcached_st memc; - memcached_dump_func *df; -- memcached_version(); -+ memcached_version(NULL); - - ; - return 0; diff --git a/gearmand.spec b/gearmand.spec index 93fd797..4ec1b93 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -9,7 +9,6 @@ URL: http://www.gearman.org Source0: http://launchpad.net/gearmand/trunk/%{version}/+download/gearmand-%{version}.tar.gz Source1: gearmand.init Source2: gearmand.sysconfig -Patch0: gearmand-libmemcached.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libevent-devel, libuuid-devel, libmemcached-devel, memcached @@ -53,7 +52,6 @@ Development libraries for %{name} %prep %setup -q -%patch0 -p0 -b .libmemcached %build %ifarch ppc64 sparc64 @@ -137,6 +135,7 @@ fi * Tue Feb 16 2010 Oliver Falk 0.11-1 - Update to latest upstream version (#565808) - Add missing Req. libevent-devel for libgearman-devel (#565808) +- Remove libmemcache patch - should be fixed in 0.11 * Sun Feb 07 2010 Remi Collet - 0.9-3 - patch to detect libmemcached From f78937fb6359abe7462366128e4d4673c8037ea1 Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Wed, 17 Feb 2010 14:41:19 +0000 Subject: [PATCH 06/12] - Add BR on libtool --- gearmand.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index 4ec1b93..71b85c9 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand Version: 0.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -11,7 +11,7 @@ Source1: gearmand.init Source2: gearmand.sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libevent-devel, libuuid-devel, libmemcached-devel, memcached +BuildRequires: libevent-devel, libuuid-devel, libmemcached-devel, memcached, libtool %ifnarch ppc64 sparc64 # no google perftools @@ -132,6 +132,9 @@ fi %{_libdir}/libgearman*.so.* %changelog +* Wed Feb 17 2010 Ruben Kerkhof 0.11-2 +- Add BR on libtool + * Tue Feb 16 2010 Oliver Falk 0.11-1 - Update to latest upstream version (#565808) - Add missing Req. libevent-devel for libgearman-devel (#565808) From 2f98f9ac8deb3406233cb37038f4c2d5af1f6f22 Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Fri, 19 Feb 2010 13:38:38 +0000 Subject: [PATCH 07/12] - Upstream released new version --- .cvsignore | 2 +- gearmand.spec | 11 ++++++----- sources | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2b1340d..13026c2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gearmand-0.11.tar.gz +gearmand-0.12.tar.gz diff --git a/gearmand.spec b/gearmand.spec index 71b85c9..af7bc72 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand -Version: 0.11 -Release: 2%{?dist} +Version: 0.12 +Release: 1%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -11,7 +11,7 @@ Source1: gearmand.init Source2: gearmand.sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libevent-devel, libuuid-devel, libmemcached-devel, memcached, libtool +BuildRequires: libevent-devel, libuuid-devel, libmemcached-devel, memcached %ifnarch ppc64 sparc64 # no google perftools @@ -61,7 +61,6 @@ Development libraries for %{name} %configure --disable-static --disable-rpath --enable-tcmalloc %endif -libtoolize -f sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} @@ -120,7 +119,6 @@ fi %doc AUTHORS ChangeLog COPYING README %dir %{_includedir}/libgearman %{_includedir}/libgearman/*.h -%{_includedir}/libgearman-server/*.h %{_libdir}/pkgconfig/gearmand.pc %{_libdir}/libgearman*.so %{_mandir}/man3/gearman*.3.gz @@ -132,6 +130,9 @@ fi %{_libdir}/libgearman*.so.* %changelog +* Fri Feb 19 2010 Ruben Kerkhof 0.12-1 +- Upstream released new version + * Wed Feb 17 2010 Ruben Kerkhof 0.11-2 - Add BR on libtool diff --git a/sources b/sources index a609ae8..e5a1724 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62da8118c76d29d07bf5e54099e11dbb gearmand-0.11.tar.gz +6e88a6bfb26e50d5aed37d143184e7f2 gearmand-0.12.tar.gz From 6cd005590ed52d552e0c16ba84cd3cefdaf08645 Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Wed, 7 Apr 2010 14:29:46 +0000 Subject: [PATCH 08/12] - Upstream released new version --- .cvsignore | 2 +- gearmand.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 13026c2..998233f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gearmand-0.12.tar.gz +gearmand-0.13.tar.gz diff --git a/gearmand.spec b/gearmand.spec index af7bc72..add481d 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,5 +1,5 @@ Name: gearmand -Version: 0.12 +Version: 0.13 Release: 1%{?dist} Summary: A distributed job system @@ -130,6 +130,9 @@ fi %{_libdir}/libgearman*.so.* %changelog +* Wed Apr 07 2010 Ruben Kerkhof 0.13-1 +- Upstream released new version + * Fri Feb 19 2010 Ruben Kerkhof 0.12-1 - Upstream released new version diff --git a/sources b/sources index e5a1724..679b610 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e88a6bfb26e50d5aed37d143184e7f2 gearmand-0.12.tar.gz +8e5d126b7ef252d062a48ab47eb95e65 gearmand-0.13.tar.gz From 5e2b19e11db6436f6b7ad4cfbf1df996677a6476 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 5 May 2010 18:27:21 +0000 Subject: [PATCH 09/12] rebuild against new libmemcached --- gearmand.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index add481d..8db3831 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand Version: 0.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -130,6 +130,9 @@ fi %{_libdir}/libgearman*.so.* %changelog +* Wed May 05 2010 Remi Collet - 0.13-2 +- rebuild against new libmemcached + * Wed Apr 07 2010 Ruben Kerkhof 0.13-1 - Upstream released new version From fc77d0d5dad9b5192602b6d386e0f066bfabd41c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:22:57 +0000 Subject: [PATCH 10/12] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index e8d0c10..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: gearmand -# $Id$ -NAME := gearmand -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 4b3ff8b..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -gearmand-0_5-1_fc11:HEAD:gearmand-0.5-1.fc11.src.rpm:1241520465 From 1c516efcc16cefa1483831b74147fcaefe690603 Mon Sep 17 00:00:00 2001 From: remi Date: Wed, 6 Oct 2010 15:36:17 +0200 Subject: [PATCH 11/12] rebuild against new libmemcached --- gearmand.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index 8db3831..62609c9 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand Version: 0.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -130,6 +130,9 @@ fi %{_libdir}/libgearman*.so.* %changelog +* Wed Oct 06 2010 Remi Collet - 0.13-3 +- rebuild against new libmemcached + * Wed May 05 2010 Remi Collet - 0.13-2 - rebuild against new libmemcached From a4802640a459de17a4b030cc049934bda6db427a Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Fri, 4 Feb 2011 16:13:10 -0600 Subject: [PATCH 12/12] Latest sources from upstream. - Full changelog available from: https://launchpad.net/gearmand/trunk/0.14 --- .gitignore | 1 + gearmand.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 998233f..da50c83 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ gearmand-0.13.tar.gz +/gearmand-0.14.tar.gz diff --git a/gearmand.spec b/gearmand.spec index 62609c9..4184a5e 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand -Version: 0.13 -Release: 3%{?dist} +Version: 0.14 +Release: 1%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -130,6 +130,10 @@ fi %{_libdir}/libgearman*.so.* %changelog +* Fri Feb 04 2011 BJ Dierkes - 0.14-1 +- Latest sources from upstream. Full changelog available from: + https://launchpad.net/gearmand/trunk/0.14 + * Wed Oct 06 2010 Remi Collet - 0.13-3 - rebuild against new libmemcached diff --git a/sources b/sources index 679b610..6811b92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e5d126b7ef252d062a48ab47eb95e65 gearmand-0.13.tar.gz +6e5e1f63c02745da174947bb3a44d8f9 gearmand-0.14.tar.gz