diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | memcached.spec | 26 |
2 files changed, 14 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ab5c4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/memcached.spec b/memcached.spec index 8d7e7b6..ecb4607 100644 --- a/memcached.spec +++ b/memcached.spec @@ -23,7 +23,7 @@ %{!?runselftest: %global runselftest 1} Name: memcached -Version: 1.4.36 +Version: 1.4.37 Release: 1%{?dist} Epoch: 0 Summary: High Performance, Distributed Memory Object Cache @@ -41,12 +41,7 @@ Source3: memcached.service Patch1: memcached-unit.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if "%{?vendor}" == "Remi Collet" -BuildRequires: libevent-devel > 2 -%else -BuildRequires: libevent-devel -%endif +BuildRequires: pkgconfig(libevent) >= 2 %if 0%{?fedora} > 22 BuildRequires: perl-generators %endif @@ -108,18 +103,13 @@ sed -i 's/-Werror / /' Makefile make %{?_smp_mflags} -%check %if %runselftest -%if 0%{?rhel} == 5 -rm t/chunked-items.t -%endif - +%check make test %endif %install -rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" # remove memcached-debug rm -f %{buildroot}/%{_bindir}/memcached-debug @@ -164,10 +154,6 @@ install -Dp -m0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name} %endif -%clean -rm -rf %{buildroot} - - %pre getent group %{groupname} >/dev/null || groupadd -r %{groupname} getent passwd %{username} >/dev/null || \ @@ -230,7 +216,6 @@ fi %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license COPYING %doc AUTHORS ChangeLog NEWS README.md doc/CONTRIBUTORS doc/*.txt @@ -248,11 +233,14 @@ fi %files devel -%defattr(-,root,root,-) %{_includedir}/memcached/* %changelog +* Tue Jun 6 2017 Remi Collet <remi@remirepo.net> - 0:1.4.37-1 +- Update to 1.4.37 +- ensure we use libevent2 on EL-6 + * Wed Mar 22 2017 Remi Collet <remi@remirepo.net> - 0:1.4.36-1 - Update to 1.4.36 |