From aedbfa12f7751070cc58a0a2e517c45829d91a59 Mon Sep 17 00:00:00 2001
From: Robin Lee <cheeselee@fedoraproject.org>
Date: Sat, 18 Nov 2023 18:20:59 +0800
Subject: [PATCH] Update to 1.1.21 (RHBZ#2248643)

---
 .gitignore                                        |  1 +
 gearmand-1.1.20-riscv64.patch                     | 11 -----------
 ...ppc64le.patch => gearmand-1.1.21-ppc64le.patch | 15 ++++++++-------
 gearmand.spec                                     | 12 ++++--------
 sources                                           |  2 +-
 5 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 gearmand-1.1.20-riscv64.patch
 rename gearmand-1.1.12-ppc64le.patch => gearmand-1.1.21-ppc64le.patch (50%)

diff --git a/.gitignore b/.gitignore
index 0886daf..09ca35d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ gearmand-0.14.tar.gz
 /gearmand-1.1.18.tar.gz
 /gearmand-1.1.19.1.tar.gz
 /gearmand-1.1.20.tar.gz
+/gearmand-1.1.21.tar.gz
diff --git a/gearmand-1.1.20-riscv64.patch b/gearmand-1.1.20-riscv64.patch
deleted file mode 100644
index aeed1ab..0000000
--- a/gearmand-1.1.20-riscv64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gearmand-1.1.20/configure	2023-08-09 20:09:29.584904366 +0800
-+++ gearmand-1.1.20/configure	2023-08-09 20:09:40.580105774 +0800
-@@ -17678,7 +17678,7 @@
-                         libsubdirs="lib"
-     ax_arch=`uname -m`
-     case $ax_arch in
--      x86_64|ppc64*|s390x|sparc64|aarch64)
-+      x86_64|ppc64*|s390x|sparc64|aarch64|riscv64)
-         libsubdirs="lib64 lib lib64"
-         ;;
-     esac
diff --git a/gearmand-1.1.12-ppc64le.patch b/gearmand-1.1.21-ppc64le.patch
similarity index 50%
rename from gearmand-1.1.12-ppc64le.patch
rename to gearmand-1.1.21-ppc64le.patch
index 4a6780b..268c481 100644
--- a/gearmand-1.1.12-ppc64le.patch
+++ b/gearmand-1.1.21-ppc64le.patch
@@ -1,16 +1,17 @@
-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
+diff --git a/configure b/configure
+index 13cd889..2d35642 100755
+--- a/configure
++++ b/configure
+@@ -17678,7 +17678,7 @@ printf %s "checking for boostlib >= $boost_lib_version_req... " >&6; }
                          libsubdirs="lib"
      ax_arch=`uname -m`
      case $ax_arch in
--      x86_64|ppc64|s390x|sparc64|aarch64)
-+      x86_64|ppc64*|s390x|sparc64|aarch64)
+-      x86_64|ppc64|s390x|sparc64|aarch64|loongarch64|riscv64)
++      x86_64|ppc64*|s390x|sparc64|aarch64|loongarch64|riscv64)
          libsubdirs="lib64 lib lib64"
          ;;
      esac
-@@ -26051,7 +26051,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
+@@ -28164,7 +28164,7 @@ then :
  	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
  	 if test -n "$ac_prev"; then
  	   case $ac_word in
diff --git a/gearmand.spec b/gearmand.spec
index 241380a..b4df16c 100644
--- a/gearmand.spec
+++ b/gearmand.spec
@@ -1,16 +1,15 @@
 Name:           gearmand
-Version:        1.1.20
+Version:        1.1.21
 Release:        %autorelease
 Summary:        A distributed job system
-
-License:        BSD
+# migrated to SPDX
+License:        BSD-3-Clause
 URL:            http://www.gearman.org
 Source0:        https://github.com/gearman/%{name}/releases/download/%{version}/gearmand-%{version}.tar.gz
 Source1:        gearmand.init
 Source2:        gearmand.sysconfig
 Source3:        gearmand.service
-Patch0:         gearmand-1.1.12-ppc64le.patch
-Patch1:         gearmand-1.1.20-riscv64.patch
+Patch0:         gearmand-1.1.21-ppc64le.patch
 # Fails to build on PPC.
 # See https://bugzilla.redhat.com/987104 and https://bugzilla.redhat.com/987109
 ExcludeArch:    ppc
@@ -23,9 +22,6 @@ BuildRequires:  sqlite-devel
 BuildRequires:  tokyocabinet-devel
 BuildRequires:  libevent-devel
 BuildRequires:  libmemcached-devel, memcached
-# https://src.fedoraproject.org/rpms/libmemcached-awesome/pull-request/1
-# libmemcached-awesome-devel needs cyrus-sasl-devel
-BuildRequires:  cyrus-sasl-devel
 BuildRequires:  hiredis-devel
 BuildRequires:  gperf
 BuildRequires:  mariadb-connector-c-devel openssl-devel
diff --git a/sources b/sources
index 79fdef1..b874029 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gearmand-1.1.20.tar.gz) = 461d1c439b3978edb40a60c6ce7c247bb96fde72ef7446d0904eace3b9ff83c80a58276e05ba79414d23b1eebe491af7dee1bebf3655253241baeee4bdc030c3
+SHA512 (gearmand-1.1.21.tar.gz) = d8c6561ddcf7aaf3a861c2a05b014473ff9572fefa9e181ae25b0e88bac8ba09ab4852d98fb0c405b186ae78f6fac22c4248977395162dc41a0e35f53904db49