From 58910ad1124b94c2f8f57d89491a32849cf530d1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 17:48:38 -0600 Subject: [PATCH 01/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- gearmand.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index 4184a5e..fd354bb 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand Version: 0.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -130,6 +130,9 @@ fi %{_libdir}/libgearman*.so.* %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Feb 04 2011 BJ Dierkes - 0.14-1 - Latest sources from upstream. Full changelog available from: https://launchpad.net/gearmand/trunk/0.14 From cbfd8356438eb8e0f7e90d144441d2ab5a884ad8 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Thu, 17 Feb 2011 16:20:09 -0600 Subject: [PATCH 02/51] Rebuild against latest libevent in rawhide/f15 --- gearmand.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index fd354bb..4b4b71e 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand Version: 0.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -130,6 +130,9 @@ fi %{_libdir}/libgearman*.so.* %changelog +* Thu Feb 17 2011 BJ Dierkes - 0.14-3 +- Rebuild against latest libevent in rawhide/f15 + * Tue Feb 08 2011 Fedora Release Engineering - 0.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 0a807a000f37f6123095ecc2e5f90163b8c450f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 22 Mar 2011 15:02:13 +0100 Subject: [PATCH 03/51] switch to %ifarch for google-perftools as BR --- gearmand.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index 4b4b71e..060d215 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand Version: 0.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -13,8 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libevent-devel, libuuid-devel, libmemcached-devel, memcached -%ifnarch ppc64 sparc64 -# no google perftools +# google perftools available only on these +%ifarch %{ix86} x86_64 ppc BuildRequires: google-perftools-devel %endif Requires(pre): shadow-utils @@ -130,6 +130,9 @@ fi %{_libdir}/libgearman*.so.* %changelog +* Tue Mar 22 2011 Dan Horák - 0.14-4 +- switch to %%ifarch for google-perftools as BR + * Thu Feb 17 2011 BJ Dierkes - 0.14-3 - Rebuild against latest libevent in rawhide/f15 From efc1484ced932524323d0f176743745275f27fcd Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Fri, 3 Jun 2011 12:48:27 -0500 Subject: [PATCH 04/51] Latest sources from upstream. - Add %%ghost to /var/run/gearmand. Resolves BZ#656592 - BuildRequires: boost-devel >= 1.37.0 - Adding gearadmin files - Converted to Systemd. Resolves BZ#661643 --- .gitignore | 1 + gearmand.service | 12 +++++++++ gearmand.spec | 70 ++++++++++++++++++++++++++++++++++++++---------- sources | 2 +- 4 files changed, 70 insertions(+), 15 deletions(-) create mode 100644 gearmand.service diff --git a/.gitignore b/.gitignore index da50c83..83613fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ gearmand-0.13.tar.gz /gearmand-0.14.tar.gz +/gearmand-0.20.tar.gz diff --git a/gearmand.service b/gearmand.service new file mode 100644 index 0000000..34f97f0 --- /dev/null +++ b/gearmand.service @@ -0,0 +1,12 @@ +[Unit] +Description=Gearmand distributed job system +After=syslog.target network.target + +[Service] +EnvironmentFile=/etc/sysconfig/gearmand +User=gearmand +Type=forking +ExecStart=/usr/sbin/gearmand -d $OPTIONS + +[Install] +WantedBy=multi-user.target diff --git a/gearmand.spec b/gearmand.spec index 4b4b71e..19ca8c5 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,7 @@ + Name: gearmand -Version: 0.14 -Release: 3%{?dist} +Version: 0.20 +Release: 1%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -9,9 +10,12 @@ URL: http://www.gearman.org Source0: http://launchpad.net/gearmand/trunk/%{version}/+download/gearmand-%{version}.tar.gz Source1: gearmand.init Source2: gearmand.sysconfig +Source3: gearmand.service BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libevent-devel, libuuid-devel, libmemcached-devel, memcached +BuildRequires: boost-devel >= 1.37.0 +BuildRequires: systemd-units %ifnarch ppc64 sparc64 # no google perftools @@ -22,6 +26,14 @@ Requires(post): chkconfig Requires(preun): chkconfig, initscripts Requires: procps +# This is actually needed for the %triggerun script but Requires(triggerun) +# is not valid. We can use %post because this particular %triggerun script +# should fire just after this package is installed. +Requires(post): systemd-sysv +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units + %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. @@ -72,8 +84,11 @@ make install DESTDIR=%{buildroot} 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 +mkdir -p %{buildroot}/var/run/gearmand \ + %{buildroot}%{_unitdir} +# For systemd +install -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service %clean rm -rf %{buildroot} @@ -87,16 +102,34 @@ getent passwd gearmand >/dev/null || \ exit 0 %post -if [ $1 -eq 1 ]; then - /sbin/chkconfig --add gearmand +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi %preun -if [ $1 -eq 0 ]; then - /sbin/service gearmand stop >/dev/null 2>&1 || : - /sbin/chkconfig --del gearmand +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable apache-httpd.service > /dev/null 2>&1 || : + /bin/systemctl stop apache-httpd.service > /dev/null 2>&1 || : fi +%postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart apache-httpd.service >/dev/null 2>&1 || : +fi + +%triggerun -- gearmand < 0.20-1 +# Save the current service runlevel info +# User must manually run systemd-sysv-convert --apply gearmand +# to migrate them to systemd targets +/usr/bin/systemd-sysv-convert --save gearmand >/dev/null 2>&1 ||: + +# Run these because the SysV package being removed won't do them +/sbin/chkconfig --del gearmand >/dev/null 2>&1 || : +/bin/systemctl try-restart gearmand.service >/dev/null 2>&1 || : %post -n libgearman -p /sbin/ldconfig @@ -105,14 +138,17 @@ fi %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README -%dir %attr(755,gearmand,gearmand) /var/run/gearmand +%ghost %attr(755,gearmand,gearmand) /var/run/gearmand %config(noreplace) %{_sysconfdir}/sysconfig/gearmand %{_sbindir}/gearmand %{_bindir}/gearman +%{_bindir}/gearadmin %{_initrddir}/gearmand -%{_mandir}/man1/gearman.1.gz -%{_mandir}/man8/gearmand.8.gz - +%{_unitdir}/%{name}.service +%{_mandir}/man1/gearman.1* +%{_mandir}/man8/gearmand.8* +%{_mandir}/man1/gearadmin.1* +%{_mandir}/man3/gearman*.3* %files -n libgearman-devel %defattr(-,root,root,-) @@ -121,15 +157,21 @@ fi %{_includedir}/libgearman/*.h %{_libdir}/pkgconfig/gearmand.pc %{_libdir}/libgearman*.so -%{_mandir}/man3/gearman*.3.gz +%{_mandir}/man3/libgearman*.3* %files -n libgearman %defattr(-,root,root,-) %doc COPYING %{_libdir}/libgearman.so.* -%{_libdir}/libgearman*.so.* %changelog +* Fri Jun 03 2011 BJ Dierkes@rackspace.com> - 0.20-1 +- Latest sources from upstream. +- Add %%ghost to /var/run/gearmand. Resolves BZ#656592 +- BuildRequires: boost-devel >= 1.37.0 +- Adding gearadmin files +- Converted to Systemd. Resolves BZ#661643 + * Thu Feb 17 2011 BJ Dierkes - 0.14-3 - Rebuild against latest libevent in rawhide/f15 diff --git a/sources b/sources index 6811b92..cfa0075 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e5e1f63c02745da174947bb3a44d8f9 gearmand-0.14.tar.gz +976f31a9d8b9fef5a9b635509da6d76f gearmand-0.20.tar.gz From f575ecb7b6386a0577abb342196e4e2ee515dfa9 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Wed, 20 Jul 2011 21:58:38 -0500 Subject: [PATCH 05/51] latest source 0.23 --- .gitignore | 1 + gearmand.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 83613fb..fb7c51b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ gearmand-0.13.tar.gz /gearmand-0.14.tar.gz /gearmand-0.20.tar.gz +/gearmand-0.23.tar.gz diff --git a/gearmand.spec b/gearmand.spec index c8b7912..d8f8ef8 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,13 +1,13 @@ Name: gearmand -Version: 0.20 +Version: 0.23 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 +Source0: http://launchpad.net/gearmand/trunk/%{version}/+download/gearmand-%{version}.tar.gz Source1: gearmand.init Source2: gearmand.sysconfig Source3: gearmand.service @@ -165,7 +165,11 @@ fi %{_libdir}/libgearman.so.* %changelog -* Fri Jun 03 2011 BJ Dierkes@rackspace.com> - 0.20-1 +* Thu Jul 21 2011 BJ Dierkes - 0.23-1 +- Latest source from upstream. Release information available at: + https://launchpad.net/gearmand/+milestone/0.23 + +* Fri Jun 03 2011 BJ Dierkes - 0.20-1 - Latest sources from upstream. - Add %%ghost to /var/run/gearmand. Resolves BZ#656592 - BuildRequires: boost-devel >= 1.37.0 diff --git a/sources b/sources index cfa0075..2a9ad78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -976f31a9d8b9fef5a9b635509da6d76f gearmand-0.20.tar.gz +ee53b8801cb05c6af61669db0edfca96 gearmand-0.23.tar.gz From 4d34252aab9cccf58886c4ce00e979eb31546a80 Mon Sep 17 00:00:00 2001 From: remi Date: Sat, 17 Sep 2011 15:37:17 +0200 Subject: [PATCH 06/51] rebuild against libmemcached.so.8 --- gearmand.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index d8f8ef8..1206204 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,7 +1,7 @@ Name: gearmand Version: 0.23 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -165,6 +165,9 @@ fi %{_libdir}/libgearman.so.* %changelog +* Sat Sep 17 2011 Remi Collet - 0.23-2 +- rebuild against libmemcached.so.8 + * Thu Jul 21 2011 BJ Dierkes - 0.23-1 - Latest source from upstream. Release information available at: https://launchpad.net/gearmand/+milestone/0.23 From e7c9ae76441222da683cd41c841cd99b1cac0144 Mon Sep 17 00:00:00 2001 From: derks Date: Tue, 22 Nov 2011 02:54:00 -0600 Subject: [PATCH 07/51] latest sources 0.25 --- .gitignore | 1 + gearmand.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fb7c51b..0dc7a32 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ gearmand-0.13.tar.gz /gearmand-0.14.tar.gz /gearmand-0.20.tar.gz /gearmand-0.23.tar.gz +/gearmand-0.25.tar.gz diff --git a/gearmand.spec b/gearmand.spec index 1206204..6297293 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,7 +1,7 @@ Name: gearmand -Version: 0.23 -Release: 2%{?dist} +Version: 0.25 +Release: 1%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -165,6 +165,11 @@ fi %{_libdir}/libgearman.so.* %changelog +* Tue Nov 22 2011 BJ Dierkes - 0.25-1 +- Latest sources from upstream. Release notes here: + https://launchpad.net/gearmand/trunk/0.25 +- Also rebuild against libboost_program_options-mt.so.1.47.0 + * Sat Sep 17 2011 Remi Collet - 0.23-2 - rebuild against libmemcached.so.8 diff --git a/sources b/sources index 2a9ad78..21611f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee53b8801cb05c6af61669db0edfca96 gearmand-0.23.tar.gz +f0a8b9f5d71e655653b75a7534f65121 gearmand-0.25.tar.gz From 81a5a4e7fdc8a0e82076e11fa7ddecd69846089c Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 6 Dec 2011 17:16:32 -0600 Subject: [PATCH 08/51] Added libgearman-1.0, libgearman-1.0-devel per upstream --- .gitignore | 1 + gearmand.spec | 33 ++++++++++++++++++++++++++++----- sources | 2 +- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0dc7a32..4599936 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ gearmand-0.13.tar.gz /gearmand-0.20.tar.gz /gearmand-0.23.tar.gz /gearmand-0.25.tar.gz +/gearmand-0.26.tar.gz diff --git a/gearmand.spec b/gearmand.spec index 6297293..11672b2 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand -Version: 0.25 +Version: 0.26 Release: 1%{?dist} Summary: A distributed job system @@ -57,9 +57,24 @@ Development headers for %{name} Summary: Development libraries for gearman Group: Development/Libraries - %description -n libgearman -Development libraries for %{name} +Development libraries for %{name} 1.0 + +%package -n libgearman-1.0-devel +Summary: Development headers for libgearman 1.0 +Requires: pkgconfig, libgearman = %{version}-%{release} +Group: Development/Libraries +Requires: libevent-devel + +%description -n libgearman-1.0-devel +Development headers for %{name} + +%package -n libgearman-1.0 +Summary: Development libraries for gearman 1.0 +Group: Development/Libraries + +%description -n libgearman-1.0 +Development libraries for %{name} 1.0 %prep @@ -160,15 +175,23 @@ fi %{_mandir}/man3/libgearman*.3* %files -n libgearman +defattr(-,root,root,-) +%dodssssc COPYING +#%%{_libdir}/libgearman.so.* + +%files -n libgearman-1.0-devel +%defattr(-,root,root,-) +%{_libdir}/libgearman*.so + +%files -n libgearman-1.0 %defattr(-,root,root,-) -%doc COPYING -%{_libdir}/libgearman.so.* %changelog * Tue Nov 22 2011 BJ Dierkes - 0.25-1 - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.25 - Also rebuild against libboost_program_options-mt.so.1.47.0 +- Added libgearman-1.0, libgearman-1.0-devel per upstream * Sat Sep 17 2011 Remi Collet - 0.23-2 - rebuild against libmemcached.so.8 diff --git a/sources b/sources index 21611f7..d9ddd98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f0a8b9f5d71e655653b75a7534f65121 gearmand-0.25.tar.gz +52a8cc98f649980331cc8011d47af09f gearmand-0.26.tar.gz From 9ce3182bd321be4c4a3eeaafe2d156c53eca25c4 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 6 Dec 2011 17:58:48 -0600 Subject: [PATCH 09/51] revert to 0.25 --- gearmand.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index 11672b2..e406d20 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand -Version: 0.26 +Version: 0.25 Release: 1%{?dist} Summary: A distributed job system diff --git a/sources b/sources index d9ddd98..21611f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -52a8cc98f649980331cc8011d47af09f gearmand-0.26.tar.gz +f0a8b9f5d71e655653b75a7534f65121 gearmand-0.25.tar.gz From f8bdf97750cd0b3e58222efb3764f5d4dfdb1e08 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Thu, 22 Dec 2011 14:55:30 -0600 Subject: [PATCH 10/51] removing typo --- gearmand.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index e406d20..0d5026a 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -176,7 +176,7 @@ fi %files -n libgearman defattr(-,root,root,-) -%dodssssc COPYING +%doc COPYING #%%{_libdir}/libgearman.so.* %files -n libgearman-1.0-devel From 41142257594ab4b55f10e376674f210e108c863b Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Thu, 22 Dec 2011 15:04:19 -0600 Subject: [PATCH 11/51] removing typo --- gearmand.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index 0d5026a..1126ba0 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -175,7 +175,7 @@ fi %{_mandir}/man3/libgearman*.3* %files -n libgearman -defattr(-,root,root,-) +%defattr(-,root,root,-) %doc COPYING #%%{_libdir}/libgearman.so.* From e7a134fa5952091a3e45fae44c814d66eb21d656 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Thu, 22 Dec 2011 15:30:01 -0600 Subject: [PATCH 12/51] adding libgearman.so to libgearman-1.0 --- gearmand.spec | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index 1126ba0..a2bca16 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -44,6 +44,13 @@ In other words, it is the nervous system for how distributed processing communicates. +%package -n libgearman +Summary: Development libraries for gearman +Group: Development/Libraries + +%description -n libgearman +Development libraries for %{name}. + %package -n libgearman-devel Summary: Development headers for libgearman Requires: pkgconfig, libgearman = %{version}-%{release} @@ -51,14 +58,14 @@ Group: Development/Libraries Requires: libevent-devel %description -n libgearman-devel -Development headers for %{name} +Development headers for %{name}. -%package -n libgearman -Summary: Development libraries for gearman +%package -n libgearman-1.0 +Summary: Development libraries for gearman 1.0 Group: Development/Libraries -%description -n libgearman -Development libraries for %{name} 1.0 +%description -n libgearman-1.0 +Development libraries for %{name} 1.0. %package -n libgearman-1.0-devel Summary: Development headers for libgearman 1.0 @@ -67,14 +74,7 @@ Group: Development/Libraries Requires: libevent-devel %description -n libgearman-1.0-devel -Development headers for %{name} - -%package -n libgearman-1.0 -Summary: Development libraries for gearman 1.0 -Group: Development/Libraries - -%description -n libgearman-1.0 -Development libraries for %{name} 1.0 +Development headers for %{name} 1.0. %prep @@ -142,7 +142,7 @@ fi # to migrate them to systemd targets /usr/bin/systemd-sysv-convert --save gearmand >/dev/null 2>&1 ||: -# Run these because the SysV package being removed won't do them +#Run these because the SysV package being removed won't do them /sbin/chkconfig --del gearmand >/dev/null 2>&1 || : /bin/systemctl try-restart gearmand.service >/dev/null 2>&1 || : @@ -165,26 +165,27 @@ fi %{_mandir}/man1/gearadmin.1* %{_mandir}/man3/gearman*.3* +%files -n libgearman +%defattr(-,root,root,-) +%doc COPYING +%{_libdir}/libgearman.so.6 +%{_libdir}/libgearman.so.6.0.0 + %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/libgearman*.3* -%files -n libgearman -%defattr(-,root,root,-) -%doc COPYING -#%%{_libdir}/libgearman.so.* - -%files -n libgearman-1.0-devel -%defattr(-,root,root,-) -%{_libdir}/libgearman*.so - %files -n libgearman-1.0 %defattr(-,root,root,-) +%{_libdir}/libgearman.so + +%files -n libgearman-1.0-devel +%defattr(-,root,root,-) +%{_includedir}/libgearman-1.0/ %changelog * Tue Nov 22 2011 BJ Dierkes - 0.25-1 From e0c965c8c50b476b4ab937541e3cd04b6e5d3bb1 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 10 Jan 2012 15:33:19 -0600 Subject: [PATCH 13/51] latest sources 0.27 --- .gitignore | 1 + gearmand.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4599936..93663da 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ gearmand-0.13.tar.gz /gearmand-0.23.tar.gz /gearmand-0.25.tar.gz /gearmand-0.26.tar.gz +/gearmand-0.27.tar.gz diff --git a/gearmand.spec b/gearmand.spec index a2bca16..29f0b1d 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand -Version: 0.25 +Version: 0.27 Release: 1%{?dist} Summary: A distributed job system @@ -188,6 +188,10 @@ fi %{_includedir}/libgearman-1.0/ %changelog +* Tue Jan 10 2012 BJ Dierkes - 0.27-1 +- Latest sources from upstream. Release notes here: + https://launchpad.net/gearmand/trunk/0.27 + * Tue Nov 22 2011 BJ Dierkes - 0.25-1 - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.25 diff --git a/sources b/sources index 21611f7..665705e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f0a8b9f5d71e655653b75a7534f65121 gearmand-0.25.tar.gz +941724ae3f2fc0b0ff383fde0b9962f3 gearmand-0.27.tar.gz From ee27ea92ca9c069937e019dd2ed1c7cdf4cb6d4c Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Thu, 12 Jan 2012 19:25:39 -0600 Subject: [PATCH 14/51] Adding Patch0: https://bugs.launchpad.net/gearmand/+bug/914495 --- gearmand-0.27-unistd.patch | 13 +++++++++++++ gearmand.spec | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 gearmand-0.27-unistd.patch diff --git a/gearmand-0.27-unistd.patch b/gearmand-0.27-unistd.patch new file mode 100644 index 0000000..975b01b --- /dev/null +++ b/gearmand-0.27-unistd.patch @@ -0,0 +1,13 @@ +https://bugs.launchpad.net/gearmand/+bug/914495 + +--- gearmand-0.27/util/instance.cc.orig 2011-10-28 22:33:38.000000000 -0500 ++++ gearmand-0.27/util/instance.cc 2012-01-12 19:22:53.937445044 -0600 +@@ -48,7 +48,7 @@ + #include + #include + #include +- ++#include + + namespace datadifferential { + namespace util { diff --git a/gearmand.spec b/gearmand.spec index 29f0b1d..15044d7 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -34,6 +34,9 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units +Patch0: gearmand-0.27-unistd.patch + + %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. @@ -79,6 +82,7 @@ Development headers for %{name} 1.0. %prep %setup -q +%patch -p1 -b gearmand-0.27-unistd.patch %build %ifarch ppc64 sparc64 @@ -191,6 +195,7 @@ fi * Tue Jan 10 2012 BJ Dierkes - 0.27-1 - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.27 +- Added Patch0: gearmand-0.27-unistd.patch. Resolves LP#914495 * Tue Nov 22 2011 BJ Dierkes - 0.25-1 - Latest sources from upstream. Release notes here: From 8415219cff7e055f6c81991c7b0a0d8591321505 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Thu, 12 Jan 2012 19:26:55 -0600 Subject: [PATCH 15/51] Adding Patch0: gearmand-0.27-unistd.patch --- gearmand-0.27-unistd.patch | 13 ------------- gearmand.spec | 5 ----- 2 files changed, 18 deletions(-) delete mode 100644 gearmand-0.27-unistd.patch diff --git a/gearmand-0.27-unistd.patch b/gearmand-0.27-unistd.patch deleted file mode 100644 index 975b01b..0000000 --- a/gearmand-0.27-unistd.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.launchpad.net/gearmand/+bug/914495 - ---- gearmand-0.27/util/instance.cc.orig 2011-10-28 22:33:38.000000000 -0500 -+++ gearmand-0.27/util/instance.cc 2012-01-12 19:22:53.937445044 -0600 -@@ -48,7 +48,7 @@ - #include - #include - #include -- -+#include - - namespace datadifferential { - namespace util { diff --git a/gearmand.spec b/gearmand.spec index 15044d7..29f0b1d 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -34,9 +34,6 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -Patch0: gearmand-0.27-unistd.patch - - %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. @@ -82,7 +79,6 @@ Development headers for %{name} 1.0. %prep %setup -q -%patch -p1 -b gearmand-0.27-unistd.patch %build %ifarch ppc64 sparc64 @@ -195,7 +191,6 @@ fi * Tue Jan 10 2012 BJ Dierkes - 0.27-1 - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.27 -- Added Patch0: gearmand-0.27-unistd.patch. Resolves LP#914495 * Tue Nov 22 2011 BJ Dierkes - 0.25-1 - Latest sources from upstream. Release notes here: From a2ede6bbc01665e70a27cb8c4b7b96699a8e3134 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Thu, 12 Jan 2012 20:06:15 -0600 Subject: [PATCH 16/51] really fix lp914495 --- gearmand-0.27-lp914495.patch | 12 ++++++++++++ gearmand.spec | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 gearmand-0.27-lp914495.patch diff --git a/gearmand-0.27-lp914495.patch b/gearmand-0.27-lp914495.patch new file mode 100644 index 0000000..2011df6 --- /dev/null +++ b/gearmand-0.27-lp914495.patch @@ -0,0 +1,12 @@ +https://bugs.launchpad.net/gearmand/+bug/914495 + +--- gearmand-0.27/util/instance.cc.orig 2011-10-28 22:33:38.000000000 -0500 ++++ gearmand-0.27/util/instance.cc 2012-01-12 20:02:51.303519844 -0600 +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + + + namespace datadifferential { diff --git a/gearmand.spec b/gearmand.spec index 29f0b1d..52efb5c 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -34,6 +34,8 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units +Patch0: gearmand-0.27-lp914495.patch + %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. @@ -79,6 +81,7 @@ Development headers for %{name} 1.0. %prep %setup -q +%patch1 -p1 -b .lp914495 %build %ifarch ppc64 sparc64 @@ -188,6 +191,9 @@ fi %{_includedir}/libgearman-1.0/ %changelog +* Thu Jan 12 2012 BJ Dierkes - 0.27-2 +- Adding Patch0: gearmand-0.27-lp914495.patch Resolves LP#914495 + * Tue Jan 10 2012 BJ Dierkes - 0.27-1 - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.27 From bcebef9918863f02b8a9e3644a126328cce2180f Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Thu, 12 Jan 2012 20:43:34 -0600 Subject: [PATCH 17/51] also patch util/pidfile.cc --- gearmand-0.27-lp914495.patch | 10 ++++++++++ gearmand.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gearmand-0.27-lp914495.patch b/gearmand-0.27-lp914495.patch index 2011df6..882c9f2 100644 --- a/gearmand-0.27-lp914495.patch +++ b/gearmand-0.27-lp914495.patch @@ -10,3 +10,13 @@ https://bugs.launchpad.net/gearmand/+bug/914495 namespace datadifferential { +--- gearmand-0.27/util/pidfile.cc.orig 2011-09-26 23:59:09.000000000 -0500 ++++ gearmand-0.27/util/pidfile.cc 2012-01-12 20:42:49.747797880 -0600 +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + + extern "C" { + diff --git a/gearmand.spec b/gearmand.spec index 52efb5c..eb38be0 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -81,7 +81,7 @@ Development headers for %{name} 1.0. %prep %setup -q -%patch1 -p1 -b .lp914495 +%patch0 -p1 -b .lp914495 %build %ifarch ppc64 sparc64 From 883c1a6dfd3c7905b465d65776c5699269bee8d9 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Thu, 12 Jan 2012 20:57:57 -0600 Subject: [PATCH 18/51] also patch logfile.cc --- gearmand-0.27-lp914495.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gearmand-0.27-lp914495.patch b/gearmand-0.27-lp914495.patch index 882c9f2..875d5d3 100644 --- a/gearmand-0.27-lp914495.patch +++ b/gearmand-0.27-lp914495.patch @@ -20,3 +20,13 @@ https://bugs.launchpad.net/gearmand/+bug/914495 extern "C" { +--- gearmand-0.27/util/logfile.cc.orig 2011-09-26 23:59:09.000000000 -0500 ++++ gearmand-0.27/util/logfile.cc 2012-01-12 20:57:25.526030905 -0600 +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + + namespace datadifferential { + namespace util { From b5218dbbb538e0b750725dab05c24ac59284597b Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Fri, 27 Jan 2012 15:39:30 -0600 Subject: [PATCH 19/51] latest sources 0.28 --- .gitignore | 1 + gearmand.spec | 16 +++++++++++----- gearmand.sysconfig | 4 ++-- sources | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 93663da..a0e5363 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ gearmand-0.13.tar.gz /gearmand-0.25.tar.gz /gearmand-0.26.tar.gz /gearmand-0.27.tar.gz +/gearmand-0.28.tar.gz diff --git a/gearmand.spec b/gearmand.spec index eb38be0..59739e2 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand -Version: 0.27 +Version: 0.28 Release: 1%{?dist} Summary: A distributed job system @@ -8,7 +8,7 @@ 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 +#Source1: gearmand.init Source2: gearmand.sysconfig Source3: gearmand.service BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,9 +22,11 @@ BuildRequires: systemd-units BuildRequires: google-perftools-devel %endif Requires(pre): shadow-utils +Requires: procps + +# FIX ME: Should be removed after 0.27-1 Requires(post): chkconfig Requires(preun): chkconfig, initscripts -Requires: procps # This is actually needed for the %triggerun script but Requires(triggerun) # is not valid. We can use %post because this particular %triggerun script @@ -100,7 +102,7 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm -v %{buildroot}%{_libdir}/libgearman*.la -install -p -D -m 0755 %{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 \ %{buildroot}%{_unitdir} @@ -161,7 +163,7 @@ fi %{_sbindir}/gearmand %{_bindir}/gearman %{_bindir}/gearadmin -%{_initrddir}/gearmand +#%%{_initrddir}/gearmand %{_unitdir}/%{name}.service %{_mandir}/man1/gearman.1* %{_mandir}/man8/gearmand.8* @@ -191,6 +193,10 @@ fi %{_includedir}/libgearman-1.0/ %changelog +* Fri Jan 27 2012 BJ Dierkes - 0.28-1 +- Latest sources from upstream. Release notes here: + https://launchpad.net/gearmand/trunk/0.28 + * Thu Jan 12 2012 BJ Dierkes - 0.27-2 - Adding Patch0: gearmand-0.27-lp914495.patch Resolves LP#914495 diff --git a/gearmand.sysconfig b/gearmand.sysconfig index 2548190..bee2500 100644 --- a/gearmand.sysconfig +++ b/gearmand.sysconfig @@ -1,3 +1,3 @@ -## Settings for gearmand -#OPTIONS="" +### Settings for gearmand +# OPTIONS="" diff --git a/sources b/sources index 665705e..274d78c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -941724ae3f2fc0b0ff383fde0b9962f3 gearmand-0.27.tar.gz +43fc281297489a53d4ee081e33c728db gearmand-0.28.tar.gz From 69a5d23eee91827ad0d4c309e03a877002524733 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Fri, 27 Jan 2012 15:55:05 -0600 Subject: [PATCH 20/51] remove patch 0 --- gearmand.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index 59739e2..098fe3c 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -36,7 +36,7 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -Patch0: gearmand-0.27-lp914495.patch +#Patch0: gearmand-0.27-lp914495.patch %description Gearman provides a generic framework to farm out work to other machines @@ -83,7 +83,6 @@ Development headers for %{name} 1.0. %prep %setup -q -%patch0 -p1 -b .lp914495 %build %ifarch ppc64 sparc64 @@ -196,6 +195,7 @@ fi * Fri Jan 27 2012 BJ Dierkes - 0.28-1 - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.28 +- Removing Patch0: gearmand-0.27-lp914495.patch (applied upstream) * Thu Jan 12 2012 BJ Dierkes - 0.27-2 - Adding Patch0: gearmand-0.27-lp914495.patch Resolves LP#914495 From d3206a8ad38fe2bbbb34f6b943fdf31895ef4b30 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Wed, 15 Feb 2012 13:26:47 -0600 Subject: [PATCH 21/51] Removing smp flags (temporarily ?) due to build issues upstream --- gearmand-0.27-lp914495.patch | 32 -------------------------------- gearmand.spec | 4 +++- 2 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 gearmand-0.27-lp914495.patch diff --git a/gearmand-0.27-lp914495.patch b/gearmand-0.27-lp914495.patch deleted file mode 100644 index 875d5d3..0000000 --- a/gearmand-0.27-lp914495.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugs.launchpad.net/gearmand/+bug/914495 - ---- gearmand-0.27/util/instance.cc.orig 2011-10-28 22:33:38.000000000 -0500 -+++ gearmand-0.27/util/instance.cc 2012-01-12 20:02:51.303519844 -0600 -@@ -48,6 +48,7 @@ - #include - #include - #include -+#include - - - namespace datadifferential { ---- gearmand-0.27/util/pidfile.cc.orig 2011-09-26 23:59:09.000000000 -0500 -+++ gearmand-0.27/util/pidfile.cc 2012-01-12 20:42:49.747797880 -0600 -@@ -48,6 +48,7 @@ - #include - #include - #include -+#include - - extern "C" { - ---- gearmand-0.27/util/logfile.cc.orig 2011-09-26 23:59:09.000000000 -0500 -+++ gearmand-0.27/util/logfile.cc 2012-01-12 20:57:25.526030905 -0600 -@@ -49,6 +49,7 @@ - #include - #include - #include -+#include - - namespace datadifferential { - namespace util { diff --git a/gearmand.spec b/gearmand.spec index 098fe3c..4eb0a33 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -94,7 +94,8 @@ Development headers for %{name} 1.0. 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} +#make %{?_smp_mflags} +make %install @@ -196,6 +197,7 @@ fi - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.28 - Removing Patch0: gearmand-0.27-lp914495.patch (applied upstream) +- Removing smp flags (temporarily ?) due to build issues upstream * Thu Jan 12 2012 BJ Dierkes - 0.27-2 - Adding Patch0: gearmand-0.27-lp914495.patch Resolves LP#914495 From 57d63d83658d0942a8d6b6c3f5bf561dca69ecc2 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Mon, 20 Feb 2012 20:30:56 -0600 Subject: [PATCH 22/51] fix service files --- gearmand.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index 4eb0a33..cceec4c 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -94,8 +94,7 @@ Development headers for %{name} 1.0. 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} -make +make %{?_smp_mflags} %install @@ -130,15 +129,15 @@ fi %preun if [ $1 -eq 0 ] ; then # Package removal, not upgrade - /bin/systemctl --no-reload disable apache-httpd.service > /dev/null 2>&1 || : - /bin/systemctl stop apache-httpd.service > /dev/null 2>&1 || : + /bin/systemctl --no-reload disable gearmand.service > /dev/null 2>&1 || : + /bin/systemctl stop gearmand.service > /dev/null 2>&1 || : fi %postun /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall - /bin/systemctl try-restart apache-httpd.service >/dev/null 2>&1 || : + /bin/systemctl try-restart gearmand.service >/dev/null 2>&1 || : fi %triggerun -- gearmand < 0.20-1 @@ -197,7 +196,6 @@ fi - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.28 - Removing Patch0: gearmand-0.27-lp914495.patch (applied upstream) -- Removing smp flags (temporarily ?) due to build issues upstream * Thu Jan 12 2012 BJ Dierkes - 0.27-2 - Adding Patch0: gearmand-0.27-lp914495.patch Resolves LP#914495 From dee63963cd9dbbcd0af3ff4ae323d97d4453fc41 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 28 Feb 2012 12:28:29 -0600 Subject: [PATCH 23/51] - Rebuilt for c++ ABI breakage --- gearmand.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index eb38be0..56eabe8 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,7 +1,7 @@ Name: gearmand Version: 0.27 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -191,6 +191,9 @@ fi %{_includedir}/libgearman-1.0/ %changelog +* Tue Feb 28 2012 Fedora Release Engineering - 0.27-2 +- Rebuilt for c++ ABI breakage + * Thu Jan 12 2012 BJ Dierkes - 0.27-2 - Adding Patch0: gearmand-0.27-lp914495.patch Resolves LP#914495 From b72ecd48b03bd423a76993d0a9f3dc742e0df994 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 6 Mar 2012 18:43:43 -0600 Subject: [PATCH 24/51] Removing _smp_mflags per https://bugs.launchpad.net/bugs/901007 --- gearmand.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index cceec4c..be72743 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -94,7 +94,7 @@ Development headers for %{name} 1.0. 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} +make %install @@ -196,6 +196,7 @@ fi - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.28 - Removing Patch0: gearmand-0.27-lp914495.patch (applied upstream) +- Removing _smp_mflags per https://bugs.launchpad.net/bugs/901007 * Thu Jan 12 2012 BJ Dierkes - 0.27-2 - Adding Patch0: gearmand-0.27-lp914495.patch Resolves LP#914495 From a344169dddb3998135ae80a4f9349379c8fd93d5 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Wed, 7 Mar 2012 11:32:17 -0600 Subject: [PATCH 25/51] adding patch for LP#932994 --- gearmand.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index be72743..66647a6 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,7 +1,7 @@ Name: gearmand Version: 0.28 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -24,10 +24,6 @@ BuildRequires: google-perftools-devel Requires(pre): shadow-utils Requires: procps -# FIX ME: Should be removed after 0.27-1 -Requires(post): chkconfig -Requires(preun): chkconfig, initscripts - # This is actually needed for the %triggerun script but Requires(triggerun) # is not valid. We can use %post because this particular %triggerun script # should fire just after this package is installed. @@ -37,6 +33,7 @@ Requires(preun): systemd-units Requires(postun): systemd-units #Patch0: gearmand-0.27-lp914495.patch +Patch1: gearmand-0.28-lp932994.patch %description Gearman provides a generic framework to farm out work to other machines @@ -83,6 +80,7 @@ Development headers for %{name} 1.0. %prep %setup -q +%patch1 -p1 -b .lp932994 %build %ifarch ppc64 sparc64 @@ -192,6 +190,9 @@ fi %{_includedir}/libgearman-1.0/ %changelog +* Wed Mar 07 2012 BJ Dierkes - 0.28-2 +- Added Patch1: gearmand-0.28-lp932994.patch. Resolves: LP#932994 + * Fri Jan 27 2012 BJ Dierkes - 0.28-1 - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.28 From 3cbe016caf2b658a44cd922c489a3cc7e90d4d69 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Wed, 7 Mar 2012 11:33:35 -0600 Subject: [PATCH 26/51] adding patch --- gearmand-0.28-lp932994.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 gearmand-0.28-lp932994.patch diff --git a/gearmand-0.28-lp932994.patch b/gearmand-0.28-lp932994.patch new file mode 100644 index 0000000..ebbd2f1 --- /dev/null +++ b/gearmand-0.28-lp932994.patch @@ -0,0 +1,11 @@ +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" { + From accf5e6d5fbf5bda7209649bea278d034b81eb92 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Wed, 7 Mar 2012 11:40:27 -0600 Subject: [PATCH 27/51] adding back _smp_mflags --- gearmand.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index 66647a6..a184de6 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,7 +1,7 @@ Name: gearmand Version: 0.28 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -92,7 +92,7 @@ Development headers for %{name} 1.0. 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 +make %{_smp_mflags} %install @@ -190,6 +190,9 @@ fi %{_includedir}/libgearman-1.0/ %changelog +* Wed Mar 07 2012 BJ Dierkes - 0.28-3 +- Adding back _smp_mflags + * Wed Mar 07 2012 BJ Dierkes - 0.28-2 - Added Patch1: gearmand-0.28-lp932994.patch. Resolves: LP#932994 From 26f1b3d182c8e3bd6f2deb8a47599bbddb7bdb36 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Wed, 7 Mar 2012 11:49:52 -0600 Subject: [PATCH 28/51] updating patch --- gearmand-0.28-lp932994.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gearmand-0.28-lp932994.patch b/gearmand-0.28-lp932994.patch index ebbd2f1..a3bfee0 100644 --- a/gearmand-0.28-lp932994.patch +++ b/gearmand-0.28-lp932994.patch @@ -9,3 +9,13 @@ Resolves https://bugs.launchpad.net/gearmand/+bug/932994 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 { From ab5a7fa5d45e9b0edb1da0694e5294cfc6786b7e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 7 Mar 2012 14:52:40 -0500 Subject: [PATCH 29/51] rebuild for gperftools --- gearmand.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index 56eabe8..6242f3e 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,7 +1,7 @@ Name: gearmand Version: 0.27 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: A distributed job system Group: System Environment/Daemons @@ -19,7 +19,7 @@ BuildRequires: systemd-units # google perftools available only on these %ifarch %{ix86} x86_64 ppc -BuildRequires: google-perftools-devel +BuildRequires: gperftools-devel %endif Requires(pre): shadow-utils Requires(post): chkconfig @@ -191,6 +191,9 @@ fi %{_includedir}/libgearman-1.0/ %changelog +* Wed Mar 7 2012 Tom Callaway - 0.27-2.1 +- rebuild against gperftools + * Tue Feb 28 2012 Fedora Release Engineering - 0.27-2 - Rebuilt for c++ ABI breakage From c3e53a4cde99548727a2f766a0c28cae09276483 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 7 Mar 2012 15:07:10 -0500 Subject: [PATCH 30/51] rebuild against gperftools, drop smp_mflags --- gearmand.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index 6242f3e..d59a696 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -93,7 +93,8 @@ Development headers for %{name} 1.0. 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} +# make %{?_smp_mflags} +make %install @@ -193,6 +194,7 @@ fi %changelog * Wed Mar 7 2012 Tom Callaway - 0.27-2.1 - rebuild against gperftools +- drop smp_mflags to get it to build * Tue Feb 28 2012 Fedora Release Engineering - 0.27-2 - Rebuilt for c++ ABI breakage From 276615106bf58f5ce600df698c214c954301527c Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 10 Apr 2012 06:47:18 -0500 Subject: [PATCH 31/51] latest sources 0.31 --- gearmand.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index a184de6..bc4dfec 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,7 +1,7 @@ Name: gearmand -Version: 0.28 -Release: 3%{?dist} +Version: 0.31 +Release: 1%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -190,6 +190,11 @@ fi %{_includedir}/libgearman-1.0/ %changelog +* Tue Apr 10 2012 BJ Dierkes - 0.31-1 +- Latest sources from upstream. Release notes here: + https://launchpad.net/gearmand/trunk/0.31 + https://launchpad.net/gearmand/trunk/0.29 + * Wed Mar 07 2012 BJ Dierkes - 0.28-3 - Adding back _smp_mflags From 95bbd71ca34b38f15a70744b78d24374e46d052b Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 10 Apr 2012 12:27:05 -0500 Subject: [PATCH 32/51] gearmand-0.28-lp932994.patch (applied upstream) --- gearmand.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index bc4dfec..bf668ac 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -33,7 +33,7 @@ Requires(preun): systemd-units Requires(postun): systemd-units #Patch0: gearmand-0.27-lp914495.patch -Patch1: gearmand-0.28-lp932994.patch +#Patch1: gearmand-0.28-lp932994.patch %description Gearman provides a generic framework to farm out work to other machines @@ -80,7 +80,7 @@ Development headers for %{name} 1.0. %prep %setup -q -%patch1 -p1 -b .lp932994 +#%%patch1 -p1 -b .lp932994 %build %ifarch ppc64 sparc64 @@ -194,6 +194,7 @@ fi - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.31 https://launchpad.net/gearmand/trunk/0.29 +- Removed Patch1: gearmand-0.28-lp932994.patch (applied upstream) * Wed Mar 07 2012 BJ Dierkes - 0.28-3 - Adding back _smp_mflags From 0390defcbdf9ba5ff56f1d61ee8ef2292c440d82 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 10 Apr 2012 13:12:01 -0500 Subject: [PATCH 33/51] Added Patch2: gearmand-0.31-lp978235.patch. Resolves LP#978235. --- gearmand-0.28-lp932994.patch | 21 --------------------- gearmand.spec | 3 +++ 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 gearmand-0.28-lp932994.patch 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 From f5a46a849311627d6b3e7c4048cb0db2196c5ff4 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Wed, 18 Apr 2012 16:42:13 -0500 Subject: [PATCH 34/51] Latest 0.32 sources --- gearmand.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index 66a0787..07e60e1 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,6 +1,6 @@ Name: gearmand -Version: 0.31 +Version: 0.32 Release: 1%{?dist} Summary: A distributed job system @@ -34,7 +34,7 @@ Requires(postun): systemd-units #Patch0: gearmand-0.27-lp914495.patch #Patch1: gearmand-0.28-lp932994.patch -Patch2: gearmand-0.31-lp978235.patch +#Patch2: gearmand-0.31-lp978235.patch %description Gearman provides a generic framework to farm out work to other machines @@ -82,7 +82,7 @@ Development headers for %{name} 1.0. %prep %setup -q #%%patch1 -p1 -b .lp932994 -%patch2 -p1 -b .lp978235 +#%%patch2 -p1 -b .lp978235 %build %ifarch ppc64 sparc64 @@ -192,6 +192,11 @@ fi %{_includedir}/libgearman-1.0/ %changelog +* Tue Apr 18 2012 BJ Dierkes - 0.32-1 +- Latest sources from upstream. Release notes here: + https://launchpad.net/gearmand/trunk/0.32 +- Removed Patch2: gearmand-0.31-lp978235.patch (applied upstream) + * Tue Apr 10 2012 BJ Dierkes - 0.31-1 - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.31 From 177cd59799aaf8e92e34e4caeaaf49f4ca26e35a Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Wed, 18 Apr 2012 16:42:56 -0500 Subject: [PATCH 35/51] Merge branches 'f17' and 'master' From 7cde5d09b8ceafce7c91360aa8e28fb9092b4152 Mon Sep 17 00:00:00 2001 From: remi Date: Mon, 23 Apr 2012 11:02:07 +0200 Subject: [PATCH 36/51] rebuild against libmemcached.so.10 --- gearmand.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index 07e60e1..dc629ef 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,7 +1,7 @@ Name: gearmand Version: 0.32 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -192,6 +192,9 @@ fi %{_includedir}/libgearman-1.0/ %changelog +* Mon Apr 23 2012 Remi Collet - 0.32-2 +- rebuild against libmemcached.so.10 + * Tue Apr 18 2012 BJ Dierkes - 0.32-1 - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.32 From 2e7f830c8473c9fd80922c936969707e988e83bc Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Wed, 25 Apr 2012 12:36:10 -0500 Subject: [PATCH 37/51] adding new sources; --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a0e5363..4ca2764 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ gearmand-0.13.tar.gz /gearmand-0.26.tar.gz /gearmand-0.27.tar.gz /gearmand-0.28.tar.gz +/gearmand-0.32.tar.gz diff --git a/sources b/sources index 274d78c..96417d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43fc281297489a53d4ee081e33c728db gearmand-0.28.tar.gz +357484c9796e7226a82383d1beb61c71 gearmand-0.32.tar.gz From 8bf9b8f17263dd77cfac0bc755f4df2c48d56d64 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 3 Jul 2012 00:39:01 -0500 Subject: [PATCH 38/51] latest 0.33 sources --- .gitignore | 1 + gearmand.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4ca2764..6756fb6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ gearmand-0.13.tar.gz /gearmand-0.27.tar.gz /gearmand-0.28.tar.gz /gearmand-0.32.tar.gz +/gearmand-0.33.tar.gz diff --git a/gearmand.spec b/gearmand.spec index dc629ef..df265a7 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,7 +1,7 @@ Name: gearmand -Version: 0.32 -Release: 2%{?dist} +Version: 0.33 +Release: 1%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -192,6 +192,10 @@ fi %{_includedir}/libgearman-1.0/ %changelog +* Tue Jul 03 2012 BJ Dierkes - 0.33-1 +- Latest sources from upstream. Release notes here: + https://launchpad.net/gearmand/trunk/0.33 + * Mon Apr 23 2012 Remi Collet - 0.32-2 - rebuild against libmemcached.so.10 diff --git a/sources b/sources index 96417d1..dc72f36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -357484c9796e7226a82383d1beb61c71 gearmand-0.32.tar.gz +812840b74153704b5d3e7d6e59a803b5 gearmand-0.33.tar.gz From 43f87c97fd704ac996c85599e6d7c5f829a0d4ab Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 3 Jul 2012 01:03:59 -0500 Subject: [PATCH 39/51] Adding patch to fix LP1020778 --- gearmand-0.33-lp1020778.patch | 12 ++++++++++++ gearmand.spec | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 gearmand-0.33-lp1020778.patch diff --git a/gearmand-0.33-lp1020778.patch b/gearmand-0.33-lp1020778.patch new file mode 100644 index 0000000..b030976 --- /dev/null +++ b/gearmand-0.33-lp1020778.patch @@ -0,0 +1,12 @@ +https://bugs.launchpad.net/gearmand/+bug/1020778 + +--- gearmand-0.33/util/logfile.cc.orig 2012-05-03 22:51:48.000000000 -0500 ++++ gearmand-0.33/util/logfile.cc 2012-07-03 00:53:10.153381199 -0500 +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + + namespace datadifferential { + namespace util { diff --git a/gearmand.spec b/gearmand.spec index df265a7..03da0d5 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -35,6 +35,7 @@ Requires(postun): systemd-units #Patch0: gearmand-0.27-lp914495.patch #Patch1: gearmand-0.28-lp932994.patch #Patch2: gearmand-0.31-lp978235.patch +Patch3: gearmand-0.33-lp1020778.patch %description Gearman provides a generic framework to farm out work to other machines @@ -83,6 +84,7 @@ Development headers for %{name} 1.0. %setup -q #%%patch1 -p1 -b .lp932994 #%%patch2 -p1 -b .lp978235 +%patch3 -p1 -b .lp1020778 %build %ifarch ppc64 sparc64 @@ -195,6 +197,7 @@ fi * Tue Jul 03 2012 BJ Dierkes - 0.33-1 - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.33 +- Adding Patch3: gearmand-0.33-lp1020778.patch * Mon Apr 23 2012 Remi Collet - 0.32-2 - rebuild against libmemcached.so.10 From 34e7295a16c16413ff3c7080ab553a0bc6db8d4b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 23:23:30 -0500 Subject: [PATCH 40/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- gearmand.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index 03da0d5..11e738d 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,7 +1,7 @@ Name: gearmand Version: 0.33 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -194,6 +194,9 @@ fi %{_includedir}/libgearman-1.0/ %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 0.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Jul 03 2012 BJ Dierkes - 0.33-1 - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.33 From 5d03cfbf06a7dd090baf2a4172f9107541408e1d Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 14 Aug 2012 15:04:14 -0500 Subject: [PATCH 41/51] Latest sources --- gearmand.spec | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index 11e738d..7ea9a89 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,7 +1,7 @@ Name: gearmand -Version: 0.33 -Release: 2%{?dist} +Version: 0.35 +Release: 1%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -17,6 +17,12 @@ BuildRequires: libevent-devel, libuuid-devel, libmemcached-devel, memcached BuildRequires: boost-devel >= 1.37.0 BuildRequires: systemd-units +# Additional support +BuildRequires: mysql-devel, mysql-libs +BuildRequires: zlib-devel +Requires: mysql +Requires: zlib + # google perftools available only on these %ifarch %{ix86} x86_64 ppc BuildRequires: gperftools-devel @@ -35,7 +41,7 @@ Requires(postun): systemd-units #Patch0: gearmand-0.27-lp914495.patch #Patch1: gearmand-0.28-lp932994.patch #Patch2: gearmand-0.31-lp978235.patch -Patch3: gearmand-0.33-lp1020778.patch +#Patch3: gearmand-0.33-lp1020778.patch %description Gearman provides a generic framework to farm out work to other machines @@ -84,7 +90,7 @@ Development headers for %{name} 1.0. %setup -q #%%patch1 -p1 -b .lp932994 #%%patch2 -p1 -b .lp978235 -%patch3 -p1 -b .lp1020778 +#%%patch3 -p1 -b .lp1020778 %build %ifarch ppc64 sparc64 @@ -194,6 +200,13 @@ fi %{_includedir}/libgearman-1.0/ %changelog +* Mon Aug 13 2012 BJ Dierkes - 0.35-1 +- Latest sources from upstream. Release notes here: + https://launchpad.net/gearmand/trunk/0.35 +- Removed Patch3: gearmand-0.33-lp1020778.patch (applied upstream) +- Added zlib support +- Added libmysql support + * Thu Jul 19 2012 Fedora Release Engineering - 0.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From d9c52b96c57872fd8f63000d70267c2905b7d90b Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 14 Aug 2012 15:06:11 -0500 Subject: [PATCH 42/51] Rebuilt for latest boost --- gearmand.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index 11e738d..8af39a6 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,7 +1,7 @@ Name: gearmand Version: 0.33 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -194,6 +194,9 @@ fi %{_includedir}/libgearman-1.0/ %changelog +* Wed Aug 15 2012 BJ Dierkes - 0.33-3 +- Rebuilt for latest boost. + * Thu Jul 19 2012 Fedora Release Engineering - 0.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 8443d36c52545c2d9bfde4af30c402146109c5fc Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 14 Aug 2012 16:39:17 -0500 Subject: [PATCH 43/51] BuildRequires: boost-thread --- gearmand.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index 8af39a6..1f90403 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -14,7 +14,7 @@ Source3: gearmand.service BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libevent-devel, libuuid-devel, libmemcached-devel, memcached -BuildRequires: boost-devel >= 1.37.0 +BuildRequires: boost-devel >= 1.37.0, boost-thread BuildRequires: systemd-units # google perftools available only on these @@ -196,6 +196,7 @@ fi %changelog * Wed Aug 15 2012 BJ Dierkes - 0.33-3 - Rebuilt for latest boost. +- BuildRequires: boost-thread * Thu Jul 19 2012 Fedora Release Engineering - 0.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 3dd8ed5239860f3ac9e45d2c2281d5a2bd9f4c0e Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 14 Aug 2012 23:11:09 -0500 Subject: [PATCH 44/51] Work around for boost build issue --- gearmand.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gearmand.spec b/gearmand.spec index 1f90403..5f820c5 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -87,6 +87,9 @@ Development headers for %{name} 1.0. %patch3 -p1 -b .lp1020778 %build +# HACK to work around boost issues. +export LDFLAGS="$LDFLAGS -lboost_system" + %ifarch ppc64 sparc64 # no tcmalloc %configure --disable-static --disable-rpath @@ -197,6 +200,8 @@ fi * Wed Aug 15 2012 BJ Dierkes - 0.33-3 - Rebuilt for latest boost. - BuildRequires: boost-thread +- Added -lboost_system to LDFLAGS to work around boost issue + related to boost-thread. * Thu Jul 19 2012 Fedora Release Engineering - 0.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From ac45fff5009b0701de214c025045a6f0bae32a9c Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Mon, 24 Sep 2012 00:18:54 -0500 Subject: [PATCH 45/51] Updated to latest 0.39 sources --- .gitignore | 1 + gearmand.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8cab91b..1ce6b36 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ gearmand-0.13.tar.gz /gearmand-0.32.tar.gz /gearmand-0.33.tar.gz /gearmand-0.35.tar.gz +/gearmand-0.39.tar.gz diff --git a/gearmand.spec b/gearmand.spec index fddc60e..8fea3b9 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,13 +1,13 @@ Name: gearmand -Version: 0.35 +Version: 0.39 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 +Source0: https://launchpad.net/gearmand/1.0/%{version}/+download/gearmand-%{version}.tar.gz #Source1: gearmand.init Source2: gearmand.sysconfig Source3: gearmand.service @@ -203,6 +203,10 @@ fi %{_includedir}/libgearman-1.0/ %changelog +* Mon Sep 24 2012 BJ Dierkes - 0.39-1 +- Latest sources from upstream. Release notes here: + https://launchpad.net/gearmand/trunk/0.39 + * Wed Aug 15 2012 BJ Dierkes - 0.35-1 - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.35 diff --git a/sources b/sources index 19616a2..8253ffc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09045eea70a6111337feb9ca4dce4a5c gearmand-0.35.tar.gz +03d6ae0b1acf82783d1983c75e4b395f gearmand-0.39.tar.gz From f6ddad022af913cb1913d6ad9b3f5debcb601fcb Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Mon, 24 Sep 2012 01:15:08 -0500 Subject: [PATCH 46/51] Added Postgres, SQLite support --- gearmand.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index 8fea3b9..fec28a6 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -18,10 +18,9 @@ BuildRequires: boost-devel >= 1.37.0, boost-thread BuildRequires: systemd-units # Additional support -BuildRequires: mysql-devel, mysql-libs -BuildRequires: zlib-devel -Requires: mysql -Requires: zlib +BuildRequires: mysql-devel, mysql-libs, sqlite-devel, postgresql-devel, postgresql-libs +BuildRequires: zlib-devel +#Requires: mysql-libs, postgresql-libs, zlib # google perftools available only on these %ifarch %{ix86} x86_64 ppc @@ -183,8 +182,8 @@ fi %files -n libgearman %defattr(-,root,root,-) %doc COPYING -%{_libdir}/libgearman.so.6 -%{_libdir}/libgearman.so.6.0.0 +%{_libdir}/libgearman.so.7 +%{_libdir}/libgearman.so.7.0.0 %files -n libgearman-devel %defattr(-,root,root,-) @@ -206,13 +205,15 @@ fi * Mon Sep 24 2012 BJ Dierkes - 0.39-1 - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.39 +- Added Postgres support +- Added Sqlite support * Wed Aug 15 2012 BJ Dierkes - 0.35-1 - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.35 - Removed Patch3: gearmand-0.33-lp1020778.patch (applied upstream) - Added zlib support -- Added libmysql support +- Added MySQL support * Wed Aug 15 2012 BJ Dierkes - 0.33-3 - Rebuilt for latest boost. From d810365bdb593ca01800bd66a73d6bd091bce79c Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Fri, 19 Oct 2012 04:18:45 -0500 Subject: [PATCH 47/51] Bumped to 1.1.2, repackaged -1.0 sources --- .gitignore | 1 + gearmand.spec | 38 +++++++++++++------------------------- sources | 2 +- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 1ce6b36..0dc548c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ gearmand-0.13.tar.gz /gearmand-0.33.tar.gz /gearmand-0.35.tar.gz /gearmand-0.39.tar.gz +/gearmand-1.1.2.tar.gz diff --git a/gearmand.spec b/gearmand.spec index fec28a6..e86625d 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,13 +1,13 @@ Name: gearmand -Version: 0.39 +Version: 1.1.2 Release: 1%{?dist} Summary: A distributed job system Group: System Environment/Daemons License: BSD URL: http://www.gearman.org -Source0: https://launchpad.net/gearmand/1.0/%{version}/+download/gearmand-%{version}.tar.gz +Source0: https://launchpad.net/gearmand/1.2/%{version}/+download/gearmand-%{version}.tar.gz #Source1: gearmand.init Source2: gearmand.sysconfig Source3: gearmand.service @@ -55,6 +55,8 @@ communicates. %package -n libgearman Summary: Development libraries for gearman Group: Development/Libraries +Provides: libgearman-1.0 = %{version}-%{release} +Obsoletes: libgearman-1.0 < %{version}-%{release} %description -n libgearman Development libraries for %{name}. @@ -64,27 +66,12 @@ Summary: Development headers for libgearman Requires: pkgconfig, libgearman = %{version}-%{release} Group: Development/Libraries Requires: libevent-devel +Provides: libgearman-1.0-devel = %{version}-%{release} +Obsoletes: libgearman-1.0-devel < %{version}-%{release} %description -n libgearman-devel Development headers for %{name}. -%package -n libgearman-1.0 -Summary: Development libraries for gearman 1.0 -Group: Development/Libraries - -%description -n libgearman-1.0 -Development libraries for %{name} 1.0. - -%package -n libgearman-1.0-devel -Summary: Development headers for libgearman 1.0 -Requires: pkgconfig, libgearman = %{version}-%{release} -Group: Development/Libraries -Requires: libevent-devel - -%description -n libgearman-1.0-devel -Development headers for %{name} 1.0. - - %prep %setup -q #%%patch1 -p1 -b .lp932994 @@ -192,16 +179,17 @@ fi %{_includedir}/libgearman/*.h %{_libdir}/pkgconfig/gearmand.pc %{_mandir}/man3/libgearman*.3* - -%files -n libgearman-1.0 -%defattr(-,root,root,-) %{_libdir}/libgearman.so - -%files -n libgearman-1.0-devel -%defattr(-,root,root,-) %{_includedir}/libgearman-1.0/ %changelog +* Thu Oct 18 2012 BJ Dierkes - 1.1.2-1 +- Bumping to 1.2 branch (1.1.2 current development version). + Release notes are available here: + https://launchpad.net/gearmand/1.2/1.1.2 +- Repackaged libgearman-1.0, and libgearman-1.0-devel under the + devel sub-package. + * Mon Sep 24 2012 BJ Dierkes - 0.39-1 - Latest sources from upstream. Release notes here: https://launchpad.net/gearmand/trunk/0.39 diff --git a/sources b/sources index 8253ffc..07f348e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03d6ae0b1acf82783d1983c75e4b395f gearmand-0.39.tar.gz +b611bb36da36efea2d68428ba9e871ad gearmand-1.1.2.tar.gz From e8b74d7dcc0287a221312f49585e61794ad38f4b Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Thu, 18 Oct 2012 15:03:22 -0500 Subject: [PATCH 48/51] Fixed files list --- gearmand.spec | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index e86625d..d1029d6 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -159,18 +159,13 @@ fi %{_sbindir}/gearmand %{_bindir}/gearman %{_bindir}/gearadmin -#%%{_initrddir}/gearmand %{_unitdir}/%{name}.service -%{_mandir}/man1/gearman.1* -%{_mandir}/man8/gearmand.8* -%{_mandir}/man1/gearadmin.1* -%{_mandir}/man3/gearman*.3* %files -n libgearman %defattr(-,root,root,-) %doc COPYING -%{_libdir}/libgearman.so.7 -%{_libdir}/libgearman.so.7.0.0 +%{_libdir}/libgearman.so.8 +%{_libdir}/libgearman.so.8.0.0 %files -n libgearman-devel %defattr(-,root,root,-) @@ -178,7 +173,6 @@ fi %dir %{_includedir}/libgearman %{_includedir}/libgearman/*.h %{_libdir}/pkgconfig/gearmand.pc -%{_mandir}/man3/libgearman*.3* %{_libdir}/libgearman.so %{_includedir}/libgearman-1.0/ From 726ec123f0502cf65d6a5fe97278c04e3835bb10 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Thu, 18 Oct 2012 15:11:05 -0500 Subject: [PATCH 49/51] Updated scriptlets per BZ#850127 --- gearmand.spec | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/gearmand.spec b/gearmand.spec index d1029d6..b575ad6 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -118,34 +118,13 @@ getent passwd gearmand >/dev/null || \ exit 0 %post -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post gearmand.service %preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable gearmand.service > /dev/null 2>&1 || : - /bin/systemctl stop gearmand.service > /dev/null 2>&1 || : -fi +%systemd_preun gearmand.service %postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart gearmand.service >/dev/null 2>&1 || : -fi - -%triggerun -- gearmand < 0.20-1 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply gearmand -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save gearmand >/dev/null 2>&1 ||: - -#Run these because the SysV package being removed won't do them -/sbin/chkconfig --del gearmand >/dev/null 2>&1 || : -/bin/systemctl try-restart gearmand.service >/dev/null 2>&1 || : +%systemd_postun_with_restart gearmand.service %post -n libgearman -p /sbin/ldconfig @@ -183,6 +162,7 @@ fi https://launchpad.net/gearmand/1.2/1.1.2 - Repackaged libgearman-1.0, and libgearman-1.0-devel under the devel sub-package. +- Updated scriptlets per BZ#850127 * Mon Sep 24 2012 BJ Dierkes - 0.39-1 - Latest sources from upstream. Release notes here: From 1520ffbb49ecad9e20e02672e50cbef1fe719e46 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sat, 9 Feb 2013 22:56:51 +0100 Subject: [PATCH 50/51] Rebuild for Boost-1.53.0 --- gearmand.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index b575ad6..632bf64 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,7 +1,7 @@ Name: gearmand Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -156,6 +156,9 @@ exit 0 %{_includedir}/libgearman-1.0/ %changelog +* Sat Feb 09 2013 Denis Arnaud - 1.1.2-2 +- Rebuild for Boost-1.53.0 + * Thu Oct 18 2012 BJ Dierkes - 1.1.2-1 - Bumping to 1.2 branch (1.1.2 current development version). Release notes are available here: From c5c9d037dfbaabaef6eca1c0c76b84d9e286f999 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sun, 10 Feb 2013 02:34:44 +0100 Subject: [PATCH 51/51] Rebuild for Boost-1.53.0 --- gearmand.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gearmand.spec b/gearmand.spec index 632bf64..c1aeac6 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -1,7 +1,7 @@ Name: gearmand Version: 1.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A distributed job system Group: System Environment/Daemons @@ -156,6 +156,9 @@ exit 0 %{_includedir}/libgearman-1.0/ %changelog +* Sun Feb 10 2013 Denis Arnaud - 1.1.2-3 +- Rebuild for Boost-1.53.0 + * Sat Feb 09 2013 Denis Arnaud - 1.1.2-2 - Rebuild for Boost-1.53.0