diff options
| author | Remi Collet <remi@remirepo.net> | 2020-12-26 07:05:43 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-12-26 07:05:43 +0100 |
| commit | 927c6cb8626eab41a149b51b8c70e88add2650ec (patch) | |
| tree | 605f140839552f1431851aaa659d3a60ed74a4ed /libmemcached-last.spec | |
| parent | f8dd62650c843d4757a29b13433c0f5635910198 (diff) | |
refresh from upstream with all patches merged
Diffstat (limited to 'libmemcached-last.spec')
| -rw-r--r-- | libmemcached-last.spec | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/libmemcached-last.spec b/libmemcached-last.spec index 7480277..c6f8caa 100644 --- a/libmemcached-last.spec +++ b/libmemcached-last.spec @@ -25,7 +25,7 @@ Name: %{libname}-opt Name: %{libname} %endif -%global gh_commit 2f275201aac9994f7694acb67f5dee62adcb0424 +%global gh_commit fcb03482e2d61dfe66ebac4d198bba1b41dd954b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner m6w6 %global gh_project libmemcached @@ -35,15 +35,11 @@ Name: %{libname} Summary: Client library and command line tools for memcached server Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 3%{?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 -Patch1: https://patch-diff.githubusercontent.com/raw/m6w6/libmemcached/pull/102.patch -Patch2: https://patch-diff.githubusercontent.com/raw/m6w6/libmemcached/pull/104.patch - %if 0%{?rhel} == 7 BuildRequires: cmake3 >= 3.9 %global dtsenable source /opt/rh/devtoolset-7/enable @@ -123,9 +119,6 @@ This package is designed to be installed beside %{libname}. %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .pr101 -%patch1 -p1 -b .pr102 -%patch2 -p1 -b .pr104 # drop test hanging in mock if [ "$(id -un)" != "remi" ]; then @@ -168,9 +161,6 @@ make %{?_smp_mflags} make install DESTDIR=%{buildroot} %endif -# See https://github.com/m6w6/libmemcached/issues/97 -mkdir -p %{buildroot}%{_libdir}/cmake -mv %{buildroot}%{_datadir}/libmemcached/cmake %{buildroot}%{_libdir}/cmake/libmemcached mv %{buildroot}%{_datadir}/libmemcached/example.cnf support rm -r %{buildroot}%{_datadir}/doc/libmemcached/ @@ -249,6 +239,9 @@ make test %changelog +* Sat Dec 26 2020 Remi Collet <remi@remirepo.net> - 1.1.0~beta1-3 +- refresh from upstream with all patches merged + * Wed Dec 23 2020 Remi Collet <remi@remirepo.net> - 1.1.0~beta1-2 - add patches from upstream and from https://github.com/m6w6/libmemcached/pull/101 fix so version |