[trafficserver/f16] Don't install sysv initscript on systemd systems.
Jan-Frode Myklebust
janfrode at fedoraproject.org
Wed Mar 21 22:45:07 UTC 2012
commit 8bd47371a0503c7fcdb2de4a24171e5e5d1190b6
Author: Jan-Frode Myklebust <janfrode at tanso.net>
Date: Wed Mar 21 23:44:40 2012 +0100
Don't install sysv initscript on systemd systems.
trafficserver.spec | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/trafficserver.spec b/trafficserver.spec
index 0a6a382..e19397d 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -3,7 +3,7 @@
Summary: Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
Name: trafficserver
Version: 3.0.3
-Release: 4%{?dist}
+Release: 5%{?dist}
License: ASL 2.0
Group: System Environment/Daemons
Source0: http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
@@ -69,8 +69,6 @@ The man-pages for enable, disable and exit was renamed to ts-enable,
ts-disable and ts-exit to avoid conflicts with other man-pages.
EOF
-mkdir -p $RPM_BUILD_ROOT/etc/init.d/
-mv $RPM_BUILD_ROOT/usr/bin/trafficserver $RPM_BUILD_ROOT/etc/init.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install -m 644 -p %{SOURCE1} \
@@ -79,6 +77,9 @@ install -m 644 -p %{SOURCE1} \
%if %{?fedora}0 > 140 || %{?rhel}0 > 60
install -D -m 644 -p %{SOURCE2} \
$RPM_BUILD_ROOT/lib/systemd/system/trafficserver.service
+%else
+mkdir -p $RPM_BUILD_ROOT/etc/init.d/
+mv $RPM_BUILD_ROOT/usr/bin/trafficserver $RPM_BUILD_ROOT/etc/init.d
%endif
# Remove static libs (needs to go to separate -static subpackage if we
@@ -186,8 +187,9 @@ header files, and Apache httpd style module build system.
%attr(0644,root,root) %{_libdir}/trafficserver/*.so
%changelog
-* Wed Mar 21 2012 <janfrode at tanso.net> - 3.0.3-4
+* Wed Mar 21 2012 <janfrode at tanso.net> - 3.0.3-5
- Add systemd support.
+- Drop init.d-script on systemd-systems.
* Sun Mar 18 2012 <janfrode at tanso.net> - 3.0.3-3
- change default proxy.config.proxy_name to FIXME.example.com instead of the
More information about the scm-commits
mailing list