The package rpms/gearmand.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gearmand.git/commit/?id=d4160e0f8....
Change:
-%ifarch ppc64 sparc64
Thanks.
Full change:
============
commit 126d9ed86af95fd0ad54be5caa6269fa36f1322c
Author: Robin Lee <cheeselee(a)fedoraproject.org>
Date: Thu Feb 20 18:50:51 2020 +0800
Disable tests again
diff --git a/gearmand.spec b/gearmand.spec
index f8ccf6c..b251a61 100644
--- a/gearmand.spec
+++ b/gearmand.spec
@@ -132,7 +132,9 @@ install -p -D -m 0644 %{SOURCE2}
%{buildroot}%{_sysconfdir}/sysconfig/gearmand
%check
-make test
+#
https://github.com/gearman/gearmand/issues/279
+#
https://github.com/gearman/gearmand/issues/277
+#make test
%pre
@@ -208,7 +210,6 @@ exit 0
* Tue Feb 18 2020 Robin Lee <cheeselee(a)fedoraproject.org> - 1.1.19.1-1
- Update to 1.1.19.1 (RHBZ#1801575)
- Enable SSL support
-- Enable tests
- Change to use chrpath to remove rpath, since patching libtool will fail to run tests
- Add patch to fix crashing of tests
commit d4160e0f83888659847fef2e66eeec53c4ab5260
Author: Robin Lee <cheeselee(a)fedoraproject.org>
Date: Tue Feb 18 19:49:14 2020 +0800
Update to 1.1.19.1 (RHBZ#1801575)
Enable SSL support
Enable tests
Change to use chrpath to remove rpath, since patching libtool will fail to run tests
Add patch to fix crashing of tests
diff --git a/.gitignore b/.gitignore
index aeff3c5..a9f4efa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ gearmand-0.14.tar.gz
/gearmand-1.1.16.tar.gz
/gearmand-1.1.17.tar.gz
/gearmand-1.1.18.tar.gz
+/gearmand-1.1.19.1.tar.gz
diff --git a/273.patch b/273.patch
new file mode 100644
index 0000000..6c65149
--- /dev/null
+++ b/273.patch
@@ -0,0 +1,50 @@
+From d6507e52adcf851d8888b93f9905f0fad1052af2 Mon Sep 17 00:00:00 2001
+From: Robin Lee <cheeselee(a)fedoraproject.org>
+Date: Sun, 16 Feb 2020 02:37:42 +0800
+Subject: [PATCH] Fix crashing of tests when '-Wp,-D_GLIBCXX_ASSERTIONS' is
+ given
+
+If 'vec' is a vector, calling 'vec[0]' will crash the program if
+'vec' is empty and '-Wp,-D_GLIBCXX_ASSERTIONS' given in CXXFLAGS.
+
+Fixes
https://github.com/gearman/gearmand/issues/272
+---
+ libtest/cmdline.h | 4 ++--
+ tests/hostile.cc | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libtest/cmdline.h b/libtest/cmdline.h
+index 692363f6..3503bada 100644
+--- a/libtest/cmdline.h
++++ b/libtest/cmdline.h
+@@ -153,7 +153,7 @@ class Application {
+
+ const char* stdout_c_str() const
+ {
+- return &_stdout_buffer[0];
++ return _stdout_buffer.size() ? &_stdout_buffer[0] : NULL;
+ }
+
+ libtest::vchar_t stderr_result() const
+@@ -163,7 +163,7 @@ class Application {
+
+ const char* stderr_c_str() const
+ {
+- return &_stderr_buffer[0];
++ return _stderr_buffer.size() ? &_stderr_buffer[0] : NULL;
+ }
+
+ size_t stderr_result_length() const
+diff --git a/tests/hostile.cc b/tests/hostile.cc
+index c4c0487d..c7686206 100644
+--- a/tests/hostile.cc
++++ b/tests/hostile.cc
+@@ -136,7 +136,7 @@ extern "C" {
+ gearman_return_t rc;
+ void *value= gearman_client_do(&client, WORKER_FUNCTION_NAME,
+ NULL,
+- &payload[0],
++ payload.size() ? &payload[0] : NULL,
+ payload.size() ? random() % payload.size() : 0,
+ NULL, &rc);
+
diff --git a/gearmand.spec b/gearmand.spec
index d776905..f8ccf6c 100644
--- a/gearmand.spec
+++ b/gearmand.spec
@@ -15,8 +15,8 @@
%global _with_sqlite 1
Name: gearmand
-Version: 1.1.18
-Release: 11%{?dist}
+Version: 1.1.19.1
+Release: 1%{?dist}
Summary: A distributed job system
License: BSD
@@ -26,11 +26,13 @@ Source1: gearmand.init
Source2: gearmand.sysconfig
Source3: gearmand.service
Patch0: gearmand-1.1.12-ppc64le.patch
+Patch1:
https://github.com/gearman/gearmand/pull/273.patch
# Fails to build on PPC.
# See
https://bugzilla.redhat.com/987104 and
https://bugzilla.redhat.com/987109
ExcludeArch: ppc
BuildRequires: gcc-c++
+BuildRequires: chrpath
BuildRequires: libuuid-devel
BuildRequires: boost-devel >= 1.37.0, boost-thread
%if %{_with_sqlite}
@@ -54,12 +56,8 @@ BuildRequires: systemd
%endif
# For %%check
+#
https://github.com/gearman/gearmand/issues/278
#BuildRequires: curl-devel
-#%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
-#BuildRequires: mariadb-server
-#%else
-#BuildRequires: mysql-server
-#%endif
# google perftools available only on these
%ifarch %{ix86} x86_64 ppc64 ppc64le aarch64 %{arm}
@@ -108,27 +106,18 @@ Development headers for %{name}.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
-# HACK to work around boost issues.
-export LDFLAGS="$LDFLAGS -lboost_system"
+%configure --disable-static --disable-silent-rules --enable-ssl
-%ifarch ppc64 sparc64
-# no tcmalloc
-%configure --disable-static --disable-rpath --disable-silent-rules
-%else
-%configure --disable-static --disable-rpath --enable-tcmalloc --disable-silent-rules
-%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
+chrpath --delete %{buildroot}%{_bindir}/gearman
install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/gearmand
%if 0%{?_with_systemd}
@@ -141,10 +130,9 @@ install -p -D -m 0644 %{SOURCE2}
%{buildroot}%{_sysconfdir}/sysconfig/gearmand
mkdir -p %{buildroot}/var/run/gearmand
%endif
-mkdir -p %{buildroot}/var/log
%check
-#make check
+make test
%pre
@@ -217,6 +205,13 @@ exit 0
%changelog
+* Tue Feb 18 2020 Robin Lee <cheeselee(a)fedoraproject.org> - 1.1.19.1-1
+- Update to 1.1.19.1 (RHBZ#1801575)
+- Enable SSL support
+- Enable tests
+- Change to use chrpath to remove rpath, since patching libtool will fail to run tests
+- Add patch to fix crashing of tests
+
* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.1.18-11
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index 47f45a2..996d13a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gearmand-1.1.18.tar.gz) =
fd2c978775bde19a8f1ffaf720b4c8adfda9859e5f554b247e7edca15fcc684168fb279af6c63e29c0524c8c863a9f3d07ea802e67eec42be793c0487b9beb9a
+SHA512 (gearmand-1.1.19.1.tar.gz) =
cbcf85dfd7268aa9acc039eac9505385af3be89eeba48270ddb45739e0ccdcf0d2963d821ccbb6a471396fc9ab2521d096f5d6c2fc3d41b3fb050bd82a795f1f
commit a841a64c09b87d1c3330704f8f05a5322abd369c
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 28 19:49:34 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/gearmand.spec b/gearmand.spec
index bf088cc..d776905 100644
--- a/gearmand.spec
+++ b/gearmand.spec
@@ -16,7 +16,7 @@
Name: gearmand
Version: 1.1.18
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: A distributed job system
License: BSD
@@ -217,6 +217,9 @@ exit 0
%changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.1.18-11
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Tue Oct 1 2019 Robin Lee <cheeselee(a)fedoraproject.org> - 1.1.18-10
- Support building for EL8 (BZ#1756966)
- Remove EL5 support
commit f0fd3cdcd8b942bbfb88ff5367f839e25b66614e
Author: Robin Lee <cheeselee(a)fedoraproject.org>
Date: Tue Oct 1 15:21:05 2019 +0800
Support building for EL8 (BZ#1756966)
Remove EL5 support
diff --git a/gearmand.spec b/gearmand.spec
index 0402d77..bf088cc 100644
--- a/gearmand.spec
+++ b/gearmand.spec
@@ -3,20 +3,20 @@
%global _with_systemd 1
%endif
-# Skip deps that are too old on EL5.
-%if 0%{?el5}
+# Skip deps that are not met on EL8.
+%if 0%{?el8}
%global _with_gperftools 0
- %global _with_sqlite 0
- %global _with_tokyocabinet 0
+ %global _with_hiredis 0
%else
%global _with_gperftools 1
- %global _with_sqlite 1
- %global _with_tokyocabinet 1
+ %global _with_hiredis 1
%endif
+%global _with_tokyocabinet 1
+%global _with_sqlite 1
Name: gearmand
Version: 1.1.18
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: A distributed job system
License: BSD
@@ -31,14 +31,8 @@ Patch0: gearmand-1.1.12-ppc64le.patch
ExcludeArch: ppc
BuildRequires: gcc-c++
-%if 0%{?el5}
-BuildRequires: e2fsprogs-devel
-BuildRequires: boost141-devel, boost141-thread
-#BuildRequires: gcc44 gcc44-c++ libstdc++44-devel
-%else
BuildRequires: libuuid-devel
BuildRequires: boost-devel >= 1.37.0, boost-thread
-%endif
%if %{_with_sqlite}
BuildRequires: sqlite-devel
%endif
@@ -47,7 +41,9 @@ BuildRequires: tokyocabinet-devel
%endif
BuildRequires: libevent-devel
BuildRequires: libmemcached-devel, memcached
+%if %{_with_hiredis}
BuildRequires: hiredis-devel
+%endif
BuildRequires: gperf
BuildRequires: mariadb-connector-c-devel openssl-devel
BuildRequires: libpq-devel
@@ -95,11 +91,6 @@ communicates.
Summary: Development libraries for gearman
Provides: libgearman-1.0 = %{version}-%{release}
Obsoletes: libgearman-1.0 < %{version}-%{release}
-%if 0%{?el5}
-# gearman requires uuid_generate_time_safe, which only exists in newer
-# e2fsprogs-libs
-Requires: e2fsprogs-libs >= 1.39-32
-%endif
%description -n libgearman
Development libraries for %{name}.
@@ -118,24 +109,9 @@ Development headers for %{name}.
%setup -q
%patch0 -p1
-%if 0%{?el5}
- # libgearman-1.0 requires a header that's newer than what we have on EL5.
- # It looks like it's optional. (If not, we will have to build with gcc44.)
- sed -i '/include <tr1\/cinttypes>/d' libgearman-1.0/gearman.h
-%endif
-
%build
-%if 0%{?el5}
- # We have to use the parallel version of Boost
- #export CC='gcc44'
- #export CXX='gcc44-c++'
- #export CPPFLAGS="-I%{_includedir}/boost141 -I%{_includedir}/c++/4.4.7"
- export CPPFLAGS="-I%{_includedir}/boost141"
- export LDFLAGS="-L%{_libdir}/boost141"
-%else
- # HACK to work around boost issues.
- export LDFLAGS="$LDFLAGS -lboost_system"
-%endif
+# HACK to work around boost issues.
+export LDFLAGS="$LDFLAGS -lboost_system"
%ifarch ppc64 sparc64
# no tcmalloc
@@ -144,12 +120,8 @@ Development headers for %{name}.
%configure --disable-static --disable-rpath --enable-tcmalloc --disable-silent-rules
%endif
-%if 0%{?el5}
-# the sed operations may be causing this to fail on EL5
-%else
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
-%endif
make %{_smp_mflags}
@@ -213,7 +185,7 @@ exit 0
%files
%license COPYING
%doc AUTHORS ChangeLog HACKING THANKS
-%if 0%{?el5} || 0%{?el6}
+%if 0%{?el6}
%attr(755,gearmand,gearmand) /var/run/gearmand
%endif
%config(noreplace) %{_sysconfdir}/sysconfig/gearmand
@@ -245,6 +217,10 @@ exit 0
%changelog
+* Tue Oct 1 2019 Robin Lee <cheeselee(a)fedoraproject.org> - 1.1.18-10
+- Support building for EL8 (BZ#1756966)
+- Remove EL5 support
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1.18-9
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit 5ae44e081aef7813c9c211873899531b46e7d081
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 25 01:41:44 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/gearmand.spec b/gearmand.spec
index f9640ca..0402d77 100644
--- a/gearmand.spec
+++ b/gearmand.spec
@@ -16,7 +16,7 @@
Name: gearmand
Version: 1.1.18
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A distributed job system
License: BSD
@@ -245,6 +245,9 @@ exit 0
%changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1.18-9
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1.18-8
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild