From a171f7dd7d5cf07ee7baa4ebd30bf5eb06100667 Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Tue, 5 May 2009 10:48:07 +0000 Subject: [PATCH 01/25] Initial import --- .cvsignore | 1 + gearmand.init | 81 ++++++++++++++++++++++++++++++ gearmand.spec | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 5 files changed, 219 insertions(+) create mode 100644 gearmand.init create mode 100644 gearmand.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..912fb53 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +gearmand-0.5.tar.gz diff --git a/gearmand.init b/gearmand.init new file mode 100644 index 0000000..fbe58bc --- /dev/null +++ b/gearmand.init @@ -0,0 +1,81 @@ +#!/bin/bash +# +# gearmand Startup script for the Gearman server +# +# chkconfig: - 85 15 +# description: Gearman is a distributed job system. +# processname: gearmand +# config: /etc/sysconfig/gearmand +# pidfile: /var/run/gearmand/gearmand.pid +# +### BEGIN INIT INFO +# Provides: gearmand +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: +# Default-Stop: +# Short-Description: start and stop the Gearman server +# Description: Gearman is a distributed job system. +### END INIT INFO + +# Source function library. +. /etc/rc.d/init.d/functions + +if [ -f /etc/sysconfig/gearmand ]; then + . /etc/sysconfig/gearmand +fi + +[ -z "${PIDFILE}" ] && pidfile = "/var/run/gearmand/gearmand.pid" +[ -z "${LOCKFILE}" ] && lockfile="/var/lock/subsys/gearmand" + +gearmand=/usr/bin/gearmand +prog=gearmand + +RETVAL=0 + +start() { + echo -n $"Starting $prog: " + daemon --pidfile=$pidfile --user=gearmand $gearmand -d $OPTIONS + RETVAL=$? + echo + [ $RETVAL = 0 ] && (touch $lockfile; pgrep -f $gearmand > $pidfile) + return $RETVAL +} + +stop() { + echo -n $"Stopping $prog: " + killproc -p $pidfile $gearmand + RETVAL=$? + echo + [ $RETVAL = 0 ] && rm -f $lockfile $pidfile +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status -p $pidfile $gearmand + RETVAL=$? + ;; + restart|reload) + stop + start + ;; + condrestart|try-restart) + if status -p $pidfile $gearmand >&/dev/null; then + stop + start + fi + ;; + *) + echo $"Usage: $prog {start|stop|restart|reload|condrestart|status|help}" + RETVAL=3 +esac + +exit $RETVAL + diff --git a/gearmand.spec b/gearmand.spec new file mode 100644 index 0000000..471cd25 --- /dev/null +++ b/gearmand.spec @@ -0,0 +1,135 @@ +Name: gearmand +Version: 0.5 +Release: 1%{?dist} +Summary: A distributed job system + +Group: System Environment/Daemons +License: BSD +URL: http://www.gearman.org +Source0: http://launchpad.net/gearmand/trunk/%{version}/+download/gearmand-%{version}.tar.gz +Source1: gearmand.init +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: libevent-devel, e2fsprogs-devel + +%ifnarch ppc64 +# no google perftools on ppc64 +BuildRequires: google-perftools-devel +%endif +Requires(pre): %{_sbindir}/useradd +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/service, /sbin/chkconfig +Requires: procps + +%description +Gearman provides a generic framework to farm out work to other machines +or dispatch function calls to machines that are better suited to do the work. +It allows you to do work in parallel, to load balance processing, and to +call functions between languages. It can be used in a variety of applications, +from high-availability web sites to the transport for database replication. +In other words, it is the nervous system for how distributed processing +communicates. + + +%package -n libgearman-devel +Summary: Development headers for libgearman +Requires: pkgconfig, libgearman = %{version}-%{release} +Group: Development/Libraries + +%description -n libgearman-devel +Development headers for %{name} + +%package -n libgearman +Summary: Development libraries for gearman +Group: Development/Libraries + + +%description -n libgearman +Development libraries for %{name} + + +%prep +%setup -q + + +%build +%ifarch ppc64 +# no tcmalloc on ppc64 +%configure --disable-static +%else +%configure --disable-static --enable-tcmalloc +%endif + +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} + + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} +rm -v %{buildroot}%{_libdir}/libgearman.la +install -D %{SOURCE1} %{buildroot}%{_initrddir}/gearmand + + +%clean +rm -rf %{buildroot} + +%pre +getent group gearmand >/dev/null || groupadd -r gearmand +getent passwd gearmand >/dev/null || \ + useradd -r -g gearmand -d / -s /sbin/nologin \ + -c "Gearmand job server" gearmand +exit 0 + +%post +if [ $1 -eq 1 ]; then + /sbin/chkconfig --add gearmand +fi + +%preun +if [ $1 -eq 0 ]; then + /sbin/service gearmand stop >/dev/null 2>&1 || : + /sbin/chkconfig --del gearmand +fi + + +%post -n libgearman -p /sbin/ldconfig + +%postun -n libgearman -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README +%{_sbindir}/gearmand +%{_bindir}/gearman +%{_initrddir}/gearmand +%{_mandir}/man1/gearman.1.gz + + +%files -n libgearman-devel +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README +%dir %{_includedir}/libgearman +%{_includedir}/libgearman/*.h +%{_libdir}/pkgconfig/gearmand.pc +%{_libdir}/libgearman.so +%{_mandir}/man3/gearman*.3.gz + +%files -n libgearman +%defattr(-,root,root,-) +%doc COPYING +%{_libdir}/libgearman.so.* + + +%changelog +* Mon Apr 27 2009 Ruben Kerkhof 0.5-1 +- Upstream released new version +- Cleanups for review (bz #487148) + +* Wed Feb 25 2009 Ruben Kerkhof 0.3-2 +- Add init script + +* Sat Feb 07 2009 Ruben Kerkhof 0.3-1 +- Initial import + diff --git a/import.log b/import.log new file mode 100644 index 0000000..4b3ff8b --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +gearmand-0_5-1_fc11:HEAD:gearmand-0.5-1.fc11.src.rpm:1241520465 diff --git a/sources b/sources index e69de29..a2b3790 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +41946441094bc260c46b1391ae6ef3a4 gearmand-0.5.tar.gz From 68609dcd90582ce525acd5f273f8a4d136c3e82d Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Wed, 20 May 2009 11:40:48 +0000 Subject: [PATCH 02/25] - 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 912fb53..9725762 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gearmand-0.5.tar.gz +gearmand-0.6.tar.gz diff --git a/gearmand.spec b/gearmand.spec index 471cd25..7beeb03 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,5 +1,5 @@ Name: gearmand -Version: 0.5 +Version: 0.6 Release: 1%{?dist} Summary: A distributed job system @@ -123,6 +123,9 @@ fi %changelog +* Wed May 20 2009 Ruben Kerkhof 0.6-1 +- Upstream released new version + * Mon Apr 27 2009 Ruben Kerkhof 0.5-1 - Upstream released new version - Cleanups for review (bz #487148) diff --git a/sources b/sources index a2b3790..3ec5932 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -41946441094bc260c46b1391ae6ef3a4 gearmand-0.5.tar.gz +1dd233cc4c64cbc73702131c593cad7f gearmand-0.6.tar.gz From 939d6047cf138f26912470f5d7ba13c20df28151 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 24 May 2009 09:20:04 +0000 Subject: [PATCH 03/25] post-review fixes - see https://bugzilla.redhat.com/show_bug.cgi?id=487148 --- gearmand.init | 4 ++-- gearmand.spec | 7 ++++++- gearmand.sysconfig | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 gearmand.sysconfig diff --git a/gearmand.init b/gearmand.init index fbe58bc..e2502aa 100644 --- a/gearmand.init +++ b/gearmand.init @@ -25,10 +25,10 @@ if [ -f /etc/sysconfig/gearmand ]; then . /etc/sysconfig/gearmand fi -[ -z "${PIDFILE}" ] && pidfile = "/var/run/gearmand/gearmand.pid" +[ -z "${PIDFILE}" ] && pidfile="/var/run/gearmand/gearmand.pid" [ -z "${LOCKFILE}" ] && lockfile="/var/lock/subsys/gearmand" -gearmand=/usr/bin/gearmand +gearmand=/usr/sbin/gearmand prog=gearmand RETVAL=0 diff --git a/gearmand.spec b/gearmand.spec index 7beeb03..e5e0ea0 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -8,6 +8,7 @@ License: BSD 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) BuildRequires: libevent-devel, e2fsprogs-devel @@ -69,7 +70,9 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm -v %{buildroot}%{_libdir}/libgearman.la -install -D %{SOURCE1} %{buildroot}%{_initrddir}/gearmand +install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_initrddir}/gearmand +install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/gearmand +mkdir -p %{buildroot}/var/run/gearmand %clean @@ -101,6 +104,8 @@ fi %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README +%dir %attr(755,gearmand,gearmand) /var/run/gearmand +%config(noreplace) %{_sysconfdir}/sysconfig/gearmand %{_sbindir}/gearmand %{_bindir}/gearman %{_initrddir}/gearmand diff --git a/gearmand.sysconfig b/gearmand.sysconfig new file mode 100644 index 0000000..2548190 --- /dev/null +++ b/gearmand.sysconfig @@ -0,0 +1,3 @@ +## Settings for gearmand +#OPTIONS="" + From 147e649ffdbc308b10260b2ff1d47389f75bd9f2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 24 May 2009 09:28:25 +0000 Subject: [PATCH 04/25] oops! forgot to bump releasenum and to add changelog entry --- gearmand.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index e5e0ea0..73cb284 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -128,6 +128,9 @@ fi %changelog +* Sun May 24 2009 Peter Lemenkov 0.6-2 +- Fixed issues, reported in https://bugzilla.redhat.com/show_bug.cgi?id=487148#c9 + * Wed May 20 2009 Ruben Kerkhof 0.6-1 - Upstream released new version From b86710a21d3754ddeb0722c9334013c148bbf519 Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Mon, 22 Jun 2009 11:25:12 +0000 Subject: [PATCH 05/25] - Don't build with tcmalloc on sparc64 --- gearmand.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index 73cb284..c789934 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand Version: 0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -8,13 +8,13 @@ License: BSD URL: http://www.gearman.org Source0: http://launchpad.net/gearmand/trunk/%{version}/+download/gearmand-%{version}.tar.gz Source1: gearmand.init -Source2: gearmand.sysconfig +Source2: gearmand.sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libevent-devel, e2fsprogs-devel -%ifnarch ppc64 -# no google perftools on ppc64 +%ifnarch ppc64 sparc64 +# no google perftools BuildRequires: google-perftools-devel %endif Requires(pre): %{_sbindir}/useradd @@ -128,6 +128,9 @@ fi %changelog +* Mon Jun 22 2009 Ruben Kerkhof 0.6-3 +- Don't build with tcmalloc on sparc64 + * Sun May 24 2009 Peter Lemenkov 0.6-2 - Fixed issues, reported in https://bugzilla.redhat.com/show_bug.cgi?id=487148#c9 From ae25d171213129340b1590858ebb76fceb9f1c79 Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Mon, 22 Jun 2009 11:36:56 +0000 Subject: [PATCH 06/25] - Upstream released new version --- .cvsignore | 2 +- gearmand.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9725762..41df0d4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gearmand-0.6.tar.gz +gearmand-0.7.tar.gz diff --git a/gearmand.spec b/gearmand.spec index c789934..319910d 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand -Version: 0.6 -Release: 3%{?dist} +Version: 0.7 +Release: 1%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -18,8 +18,8 @@ BuildRequires: libevent-devel, e2fsprogs-devel BuildRequires: google-perftools-devel %endif Requires(pre): %{_sbindir}/useradd -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/service, /sbin/chkconfig +Requires(post): chkconfig +Requires(preun): chkconfig, initscripts Requires: procps %description @@ -54,8 +54,8 @@ Development libraries for %{name} %build -%ifarch ppc64 -# no tcmalloc on ppc64 +%ifarch ppc64 sparc64 +# no tcmalloc %configure --disable-static %else %configure --disable-static --enable-tcmalloc @@ -70,7 +70,7 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm -v %{buildroot}%{_libdir}/libgearman.la -install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_initrddir}/gearmand +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 @@ -110,6 +110,7 @@ fi %{_bindir}/gearman %{_initrddir}/gearmand %{_mandir}/man1/gearman.1.gz +%{_mandir}/man8/gearmand.8.gz %files -n libgearman-devel @@ -128,6 +129,9 @@ fi %changelog +* Mon Jun 22 2009 Ruben Kerkhof 0.7-1 +- Upstream released new version + * Mon Jun 22 2009 Ruben Kerkhof 0.6-3 - Don't build with tcmalloc on sparc64 diff --git a/sources b/sources index 3ec5932..62a9f4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1dd233cc4c64cbc73702131c593cad7f gearmand-0.6.tar.gz +6c799135cf00f3a7cfe9a39d51856b89 gearmand-0.7.tar.gz From 742659cb419d1e7d5159cc0514220f476b5833cc Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Tue, 14 Jul 2009 14:54:57 +0000 Subject: [PATCH 07/25] - Upstream released new version - Enable libmemcached backend --- .cvsignore | 2 +- gearmand.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 41df0d4..9506b9b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gearmand-0.7.tar.gz +gearmand-0.8.tar.gz diff --git a/gearmand.spec b/gearmand.spec index 319910d..e0a62e8 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,5 +1,5 @@ Name: gearmand -Version: 0.7 +Version: 0.8 Release: 1%{?dist} Summary: A distributed job system @@ -11,13 +11,13 @@ Source1: gearmand.init Source2: gearmand.sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libevent-devel, e2fsprogs-devel +BuildRequires: libevent-devel, libuuid-devel, libmemcached-devel, memcached %ifnarch ppc64 sparc64 # no google perftools BuildRequires: google-perftools-devel %endif -Requires(pre): %{_sbindir}/useradd +Requires(pre): shadow-utils Requires(post): chkconfig Requires(preun): chkconfig, initscripts Requires: procps @@ -78,6 +78,7 @@ mkdir -p %{buildroot}/var/run/gearmand %clean rm -rf %{buildroot} + %pre getent group gearmand >/dev/null || groupadd -r gearmand getent passwd gearmand >/dev/null || \ @@ -129,6 +130,10 @@ fi %changelog +* Tue Jul 14 2009 Ruben Kerkhof 0.8-1 +- Upstream released new version +- Enable libmemcached backend + * Mon Jun 22 2009 Ruben Kerkhof 0.7-1 - Upstream released new version diff --git a/sources b/sources index 62a9f4d..91387a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c799135cf00f3a7cfe9a39d51856b89 gearmand-0.7.tar.gz +2118ad03aa055d22374d3a095554e54a gearmand-0.8.tar.gz From edda2090d17f6ce299c0555b0be41ccc945eb308 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 23:45:06 +0000 Subject: [PATCH 08/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- gearmand.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index e0a62e8..5e00a6f 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand Version: 0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -130,6 +130,9 @@ fi %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Jul 14 2009 Ruben Kerkhof 0.8-1 - Upstream released new version - Enable libmemcached backend From ff1f80f9cf19b7ca6e0e2044bc76443de7e07a06 Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Fri, 31 Jul 2009 12:26:58 +0000 Subject: [PATCH 09/25] - Upstream released new version --- .cvsignore | 2 +- gearmand.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9506b9b..408989f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gearmand-0.8.tar.gz +gearmand-0.9.tar.gz diff --git a/gearmand.spec b/gearmand.spec index 5e00a6f..f9b0f70 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand -Version: 0.8 -Release: 2%{?dist} +Version: 0.9 +Release: 1%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -130,6 +130,9 @@ fi %changelog +* Fri Jul 31 2009 Ruben Kerkhof 0.9-1 +- Upstream released new version + * Fri Jul 24 2009 Fedora Release Engineering - 0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 91387a0..abe718a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2118ad03aa055d22374d3a095554e54a gearmand-0.8.tar.gz +8bdedc7809180f5f33ec123e2c47389e gearmand-0.9.tar.gz From 6504c0eae2f3174d10c58eaadce32b4dc121df41 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:19:21 +0000 Subject: [PATCH 10/25] 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 cb11b2a90f13b2a2e998d33208045935a7a52feb Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:54:31 +0000 Subject: [PATCH 11/25] 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 12/25] 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 13/25] 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 14/25] - 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 15/25] 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 16/25] - 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 17/25] - 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 18/25] - 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 19/25] 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 58e5e2bec62f277d60c7cf27163ad033eafed45f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:50:15 +0000 Subject: [PATCH 20/25] Initialize branch EL-6 for gearmand --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From fc77d0d5dad9b5192602b6d386e0f066bfabd41c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:22:57 +0000 Subject: [PATCH 21/25] 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 0c923c5dce95140938464c0b5dc1ad6ac957652e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:22:58 +0000 Subject: [PATCH 22/25] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 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 23/25] 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 24/25] 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 From db8745f47cd774c6d10717977228c05f2096aac2 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Fri, 4 Feb 2011 18:38:07 -0600 Subject: [PATCH 25/25] adding epel 5/6 support --- .gitignore | 1 + gearmand.spec | 55 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 7c38ff2..6da1bbd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ gearmand-0.14.tar.gz +/gearmand-0.14.tar.gz diff --git a/gearmand.spec b/gearmand.spec index 4184a5e..8e6dabb 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,17 @@ + +# libmemcached is currently too old in RHEL +%bcond_with libmemcached + +# google-perftools not available in ppc64/sparc64 +%ifnarch ppc64 sparc64 +%bcond_without tcmalloc +%else +%bcond_with tcmalloc +%endif + Name: gearmand Version: 0.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -11,12 +22,22 @@ 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 -%ifnarch ppc64 sparc64 -# no google perftools +%if 0%{?el5} +BuildRequires: e2fsprogs-devel +%else +BuildRequires: libuuid-devel +%endif + +%if %{with libmemcached} +BuildRequires: libmemcached-devel +%endif + +%if %{with tcmalloc} BuildRequires: google-perftools-devel %endif + Requires(pre): shadow-utils Requires(post): chkconfig Requires(preun): chkconfig, initscripts @@ -54,13 +75,25 @@ Development libraries for %{name} %setup -q %build -%ifarch ppc64 sparc64 -# no tcmalloc -%configure --disable-static --disable-rpath +# optional configure options +%if %{with tcmalloc} + %global configure_tcmalloc --enable-tcmalloc %else -%configure --disable-static --disable-rpath --enable-tcmalloc + %global configure_tcmalloc --disable-tcmalloc %endif +%if %{with libmemcached} + %global configure_libmemcached --enable-libmemcached +%else + %global configure_libmemcached --disable-libmemcached +%endif + +%configure \ + --disable-static \ + %{configure_tcmalloc} \ + %{configure_libmemcached} \ + --disable-rpath + 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} @@ -99,7 +132,6 @@ fi %post -n libgearman -p /sbin/ldconfig - %postun -n libgearman -p /sbin/ldconfig %files @@ -130,6 +162,11 @@ fi %{_libdir}/libgearman*.so.* %changelog +* Fri Feb 04 2011 BJ Dierkes - 0.14-2 +- Adding support for EPEL 5/6 +- Added optional support for libmemcached +- Added optional support for tcmalloc (google-perftools) + * Fri Feb 04 2011 BJ Dierkes - 0.14-1 - Latest sources from upstream. Full changelog available from: https://launchpad.net/gearmand/trunk/0.14