diff --git a/.gitignore b/.gitignore index 912fb53..7c38ff2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gearmand-0.5.tar.gz +gearmand-0.14.tar.gz 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 471cd25..b6b4b1c 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.5 -Release: 1%{?dist} +Version: 0.14 +Release: 2%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -8,17 +19,28 @@ 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 +BuildRequires: libevent-devel -%ifnarch ppc64 -# no google perftools on ppc64 +%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): %{_sbindir}/useradd -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/service, /sbin/chkconfig + +Requires(pre): shadow-utils +Requires(post): chkconfig +Requires(preun): chkconfig, initscripts Requires: procps %description @@ -35,6 +57,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,13 +76,25 @@ Development libraries for %{name} %build -%ifarch ppc64 -# no tcmalloc on ppc64 -%configure --disable-static +# optional configure options +%if %{with tcmalloc} + %global configure_tcmalloc --enable-tcmalloc %else -%configure --disable-static --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} @@ -68,13 +103,16 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -rm -v %{buildroot}%{_libdir}/libgearman.la -install -D %{SOURCE1} %{buildroot}%{_initrddir}/gearmand +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 %clean rm -rf %{buildroot} + %pre getent group gearmand >/dev/null || groupadd -r gearmand getent passwd gearmand >/dev/null || \ @@ -101,10 +139,13 @@ 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 %{_mandir}/man1/gearman.1.gz +%{_mandir}/man8/gearmand.8.gz %files -n libgearman-devel @@ -113,16 +154,74 @@ fi %dir %{_includedir}/libgearman %{_includedir}/libgearman/*.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 +* 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 + +* 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 + +* 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 + +* 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) +- Remove libmemcache patch - should be fixed in 0.11 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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/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="" + diff --git a/sources b/sources index a2b3790..6811b92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -41946441094bc260c46b1391ae6ef3a4 gearmand-0.5.tar.gz +6e5e1f63c02745da174947bb3a44d8f9 gearmand-0.14.tar.gz