summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--memcached.spec43
1 files changed, 5 insertions, 38 deletions
diff --git a/memcached.spec b/memcached.spec
index 9f3240d..34885cc 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -16,21 +16,9 @@
%bcond_without sasl_pwdb
%bcond_with seccomp
# Experimental
-%if 0%{?rhel} == 7
-%bcond_with proxy
-%else
%bcond_without proxy
-%endif
-%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
%bcond_without tls
-%else
-%bcond_with tls
-%endif
-%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
%bcond_without selinux
-%else
-%bcond_with selinux
-%endif
%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
%bcond_without sysusers
%else
@@ -47,7 +35,7 @@
Name: memcached
-Version: 1.6.28
+Version: 1.6.29
Release: 1%{?dist}
Epoch: 0
Summary: High Performance, Distributed Memory Object Cache
@@ -70,9 +58,7 @@ Patch2: memcached-build.patch
BuildRequires: gcc
BuildRequires: pkgconfig(libevent) >= 2
BuildRequires: systemd
-%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8
BuildRequires: perl-generators
-%endif
BuildRequires: perl(Test::More), perl(Test::Harness)
%if %{with sasl}
BuildRequires: cyrus-sasl-devel
@@ -108,7 +94,7 @@ Provides: bundled(mcmc)
%if %{with selinux}
%package selinux
Summary: Selinux policy module
-License: GPLv2
+License: GPL-2.0-only
BuildRequires: selinux-policy
%{?selinux_requires}
@@ -199,19 +185,11 @@ install -Dp -m0644 scripts/memcached-tool.1 \
%{buildroot}%{_mandir}/man1/memcached-tool.1
# Unit file
-%if 0%{?fedora} < 25 && 0%{?rhel} < 8
-install -Dp -m0644 %{SOURCE4} %{buildroot}%{_unitdir}/memcached.service
-%else
install -Dp -m0644 scripts/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
-%endif
install -Dp -m0644 scripts/%{name}@.service %{buildroot}%{_unitdir}/%{name}@.service
# Safer config
-%if 0%{?fedora} < 26 && 0%{?rhel} < 8
-sed -e 's/^##safer##/#/g' -i %{buildroot}%{_unitdir}/%{name}*service
-%else
sed -e 's/^##safer##//g' -i %{buildroot}%{_unitdir}/%{name}*service
-%endif
%if %{with selinux}
# install SELinux policy module
@@ -226,21 +204,7 @@ popd
# Default configs
-%if 0%{?fedora} < 25 && 0%{?rhel} < 8
-mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig
-cat <<EOF >%{buildroot}/%{_sysconfdir}/sysconfig/%{name}
-PORT="11211"
-USER="%{username}"
-MAXCONN="1024"
-CACHESIZE="64"
-OPTIONS=""
-EOF
-
-# Constant timestamp on the config file.
-touch -r %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
-%else
install -Dp -m0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
-%endif
%if %{with sysusers}
install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/memcached.conf
@@ -318,6 +282,9 @@ exit 0
%changelog
+* Mon Jul 1 2024 Remi Collet <remi@remirepo.net> - 1.6.29-1
+- update to 1.6.29 (2024-06-28)
+
* Sat Jun 1 2024 Remi Collet <remi@remirepo.net> - 1.6.28-1
- update to 1.6.28 (2024-05-31)