diff options
| author | Remi Collet <remi@remirepo.net> | 2020-12-23 12:11:07 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-12-23 12:11:07 +0100 |
| commit | c503863ef5cc1e34c181615cd0eb7518a18a9ea9 (patch) | |
| tree | f6e974269a8d61425946b42d9410e4502b8c760f | |
| parent | 3dfa96cdf970cb4afb614d71b595ebbc738ed5bb (diff) | |
add upstream patches and from
https://github.com/m6w6/libmemcached/pull/101
| -rw-r--r-- | libmemcached-last.spec | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/libmemcached-last.spec b/libmemcached-last.spec index 7b5caa4..2b660c7 100644 --- a/libmemcached-last.spec +++ b/libmemcached-last.spec @@ -25,7 +25,7 @@ Name: %{libname}-opt Name: %{libname} %endif -%global gh_commit e95ca0e7956f0d54b318284167a39aa3fd74c89c +%global gh_commit 2f275201aac9994f7694acb67f5dee62adcb0424 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner m6w6 %global gh_project libmemcached @@ -35,11 +35,13 @@ Name: %{libname} Summary: Client library and command line tools for memcached server Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz +Patch0: https://patch-diff.githubusercontent.com/raw/m6w6/libmemcached/pull/101.patch + BuildRequires: gcc BuildRequires: gcc-c++ %if 0%{?rhel} == 7 @@ -114,7 +116,7 @@ This package is designed to be installed beside %{libname}. %prep %setup -q -n %{gh_project}-%{gh_commit} - +%patch0 -p1 -b .pr101 %build %if 0%{?rhel} == 7 @@ -204,11 +206,11 @@ make test %dir %{_libdir}/cmake %endif %{_includedir}/libmemcached -%{_includedir}/libmemcached-1* +%{_includedir}/libmemcached-1.0 %{_includedir}/libhashkit -%{_includedir}/libhashkit-1* -%{_includedir}/libmemcachedprotocol-0* -%{_includedir}/libmemcachedutil-1* +%{_includedir}/libhashkit-1.0 +%{_includedir}/libmemcachedprotocol-0.0 +%{_includedir}/libmemcachedutil-1.0 %{_libdir}/libhashkit.so %{_libdir}/libmemcached.so %{_libdir}/libmemcachedprotocol.so @@ -222,6 +224,10 @@ make test %{_mandir}/man3/hashkit* %changelog +* Wed Dec 23 2020 Remi Collet <remi@remirepo.net> - 1.1.0~beta1-2 +- add upstream patches and from + https://github.com/m6w6/libmemcached/pull/101 + * Tue Dec 22 2020 Remi Collet <remi@remirepo.net> - 1.1.0~beta1-1 - update to 1.1.0-beta1 - sources from https://github.com/m6w6/libmemcached |