rpms/memcached
6
0
Fork 0
Code Issues Pull Requests Releases Activity

update to 1.4.15 (#782395)

Browse Source 
- switch to simple systemd service (#878198)
- use systemd scriptlet macros (Václav Pavlín, #850204)
Resolves: rhbz#850204
Resolves: rhbz#878198
Resolves: rhbz#782395
This commit is contained in:
Joe Orton 2012-11-20 16:53:39 +00:00
parent b2b1ac2a92
commit 41935efcc5
5 changed files with 19 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/memcached-1.4.13.tar.gz /memcached-1.4.13.tar.gz
/memcached-1.4.15.tar.gz

1
memcached-tmpfiles.conf
View File

@ -1 +0,0 @@
D /var/run/memcached/memcached 0710 memcached memcached -

5
memcached.service
View File

@ -4,10 +4,9 @@ Before=httpd.service
After=network.target After=network.target
[Service] [Service]
Type=forking Type=simple
EnvironmentFile=-/etc/sysconfig/memcached EnvironmentFile=-/etc/sysconfig/memcached
PIDFile=/var/run/memcached/memcached.pid ExecStart=/usr/bin/memcached -u $USER -p $PORT -m $CACHESIZE -c $MAXCONN $OPTIONS
ExecStart=/usr/bin/memcached -d -u $USER -P /var/run/memcached/memcached.pid -p $PORT -m $CACHESIZE -c $MAXCONN $OPTIONS
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

46
memcached.spec
View File

@ -2,8 +2,8 @@
%define groupname memcached %define groupname memcached
Name: memcached Name: memcached
Version: 1.4.13 Version: 1.4.15
Release: 3%{?dist} Release: 1%{?dist}
Epoch: 0 Epoch: 0
Summary: High Performance, Distributed Memory Object Cache Summary: High Performance, Distributed Memory Object Cache
@ -14,7 +14,6 @@ Source0: http://memcached.googlecode.com/files/%{name}-%{version}.tar.gz
# custom unit file # custom unit file
Source1: memcached.service Source1: memcached.service
Source2: %{name}-tmpfiles.conf
# Patches # Patches
@ -25,9 +24,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libevent-devel BuildRequires: libevent-devel
BuildRequires: perl(Test::More) BuildRequires: perl(Test::More)
Requires(post): systemd-units Requires(post): systemd
Requires(preun): systemd-units Requires(preun): systemd
Requires(postun): systemd-units Requires(postun): systemd
# For triggerun # For triggerun
Requires(post): systemd-sysv Requires(post): systemd-sysv
Requires(pre): shadow-utils Requires(pre): shadow-utils
@ -95,12 +94,6 @@ EOF
# Constant timestamp on the config file. # Constant timestamp on the config file.
touch -r %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name} touch -r %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
# pid directory
mkdir -p %{buildroot}%{_localstatedir}/run/memcached
mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@ -108,32 +101,21 @@ rm -rf %{buildroot}
%pre %pre
getent group %{groupname} >/dev/null || groupadd -r %{groupname} getent group %{groupname} >/dev/null || groupadd -r %{groupname}
getent passwd %{username} >/dev/null || \ getent passwd %{username} >/dev/null || \
useradd -r -g %{groupname} -d %{_localstatedir}/run/memcached \ useradd -r -g %{groupname} -d /run/memcached \
-s /sbin/nologin -c "Memcached daemon" %{username} -s /sbin/nologin -c "Memcached daemon" %{username}
exit 0 exit 0
%post %post
if [ $1 -eq 1 ] ; then %systemd_post memcached.service
# Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
%preun %preun
if [ $1 -eq 0 ] ; then %systemd_preun memcached.service
# Package removal, not upgrade
/bin/systemctl --no-reload disable memcached.service > /dev/null 2>&1 || :
/bin/systemctl stop memcached.service > /dev/null 2>&1 || :
fi
%postun %postun
/bin/systemctl daemon-reload >/dev/null 2>&1 || : %systemd_postun_with_restart memcached.service
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/bin/systemctl try-restart memcached.service >/dev/null 2>&1 || :
fi
%triggerun -- memcached < 0:1.4.13-2 %triggerun -- memcached < 0:1.4.13-2
# Save the current service runlevel info # Save the current service runlevel info
@ -148,15 +130,12 @@ fi
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README doc/CONTRIBUTORS doc/*.txt %doc AUTHORS ChangeLog COPYING NEWS README.md doc/CONTRIBUTORS doc/*.txt
%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%dir %attr(755,%{username},%{groupname}) %{_localstatedir}/run/memcached
%{_bindir}/memcached-tool %{_bindir}/memcached-tool
%{_bindir}/memcached %{_bindir}/memcached
%{_mandir}/man1/memcached.1* %{_mandir}/man1/memcached.1*
%{_unitdir}/memcached.service %{_unitdir}/memcached.service
%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
%files devel %files devel
@ -164,6 +143,11 @@ fi
%{_includedir}/memcached/* %{_includedir}/memcached/*
%changelog %changelog
* Tue Nov 20 2012 Joe Orton <jorton@redhat.com> - 0:1.4.15-1
- update to 1.4.15 (#782395)
- switch to simple systemd service (#878198)
- use systemd scriptlet macros (Václav Pavlín, #850204)
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4.13-3 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4.13-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

3
sources
View File

@ -1,2 +1 @@
8e18054ec5edfd96f7de87f02622052a memcached-1.4.10.tar.gz 36ea966f5a29655be1746bf4949f7f69 memcached-1.4.15.tar.gz
6d18c6d25da945442fcc1187b3b63b7f memcached-1.4.13.tar.gz