- up to 1.1.18

diff --git a/gearmand-1.1.12-ppc64le.patch b/gearmand-1.1.12-ppc64le.patch
deleted file mode 100644 (file)
index 4a6780b..0000000
--- a/gearmand-1.1.12-ppc64le.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up gearmand-1.1.12/configure.ppc64le gearmand-1.1.12/configure
---- gearmand-1.1.12/configure.ppc64le  2014-09-09 17:12:22.368039057 +0200
-+++ gearmand-1.1.12/configure  2014-09-09 17:11:49.584039857 +0200
-@@ -16219,7 +16219,7 @@ $as_echo_n "checking for boostlib >= $bo
-                         libsubdirs="lib"
-     ax_arch=`uname -m`
-     case $ax_arch in
--      x86_64|ppc64|s390x|sparc64|aarch64)
-+      x86_64|ppc64*|s390x|sparc64|aarch64)
-         libsubdirs="lib64 lib lib64"
-         ;;
-     esac
-@@ -26051,7 +26051,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
-       for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-        if test -n "$ac_prev"; then
-          case $ac_word in
--           i?86 | x86_64 | ppc | ppc64)
-+           i?86 | x86_64 | ppc | ppc64*)
-              if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-                ac_arch=$ac_word
-              else

diff --git a/gearmand.spec b/gearmand.spec
index fb746f3ef51ee004ac77d3fa8469019a7b76d8c6..a12bfda3da713ce9d5e88e95eeac8f418c24aab8 100644 (file)
--- a/gearmand.spec
+++ b/gearmand.spec
@@ -24,16 +24,16 @@
 
 Summary:       A distributed job system
 Name:          gearmand
-Version:       1.1.12
-Release:       5
+Version:       1.1.18
+Release:       1
 License:       BSD
 Group:         Daemons
-Source0:       https://launchpad.net/gearmand/1.2/%{version}/+download/%{name}-%{version}.tar.gz
-# Source0-md5: 99dd0be85b181eccf7fb1ca3c2a28a9f
+Source0:       https://github.com/gearman/gearmand/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: e947647db2a23239cead1c0960f2b5a0
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.service
-Patch0:                %{name}-1.1.12-ppc64le.patch
+Patch0:                no-git.patch
 URL:           http://www.gearman.org
 BuildRequires: autoconf
 BuildRequires: autoconf-archive
@@ -111,17 +111,14 @@ Development headers for %{name}.
 %setup -q
 %patch0 -p1
 
-cp -p %{_aclocaldir}/ax_boost_base.m4 m4
-cp -p %{_aclocaldir}/ax_boost_program_options.m4 m4
-
-# somewhy it does not look into build-aux
-ln -s build-aux/install-sh .
+echo "m4_define([VERSION_NUMBER], %{version})" > version.m4
 
 %build
 %{__libtoolize}
-%{__aclocal} -I m4
-%{__automake}
+%{__aclocal}
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        --disable-silent-rules \
        --disable-static \
@@ -136,7 +133,8 @@ ln -s build-aux/install-sh .
        --enable-ssl \
        --disable-dtrace
 
-%{__make}
+%{__make} -C docs  -j1
+%{__make} -j1
 
 %if %{with tests}
 %{__make} check
@@ -190,7 +188,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README
+%doc README.md
 %attr(754,root,root) /etc/rc.d/init.d/gearmand
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/gearmand
 %attr(755,root,root) %{_sbindir}/gearmand

diff --git a/no-git.patch b/no-git.patch
new file mode 100644 (file)
index 0000000..5bcf6aa
--- /dev/null
+++ b/no-git.patch
@@ -0,0 +1,11 @@
+--- gearmand-1.1.18/configure.ac~      2017-12-11 15:00:27.000000000 +0100
++++ gearmand-1.1.18/configure.ac       2018-03-18 23:42:15.334301949 +0100
+@@ -9,7 +9,7 @@
+ # the COPYING file in this directory for full text.
+ 
+ m4_include([version.m4])
+-AC_REVISION([m4_esyscmd_s([git describe --always])])
++AC_REVISION([VERSION_NUMBER])
+ AC_PREREQ([2.63])
+ AC_INIT([gearmand],VERSION_NUMBER,[https://github.com/gearman/gearmand/issues],[gearmand],[http://gearman.info/])
+