Attachment 607170 Details for Bug 851462 – Patch replaces scriptlets with new systemd macros

[patch] Patch replaces scriptlets with new systemd macros

new-systemd-macros.patch (text/plain), 2.37 KB, created by Václav Pavlín on 2012-08-27 09:36:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Václav Pavlín

Created: 2012-08-27 09:36:15 UTC

Size: 2.37 KB

patch

obsolete

>diff --git a/trafficserver.spec b/trafficserver.spec
>index 5970581..a9380f7 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.2.0
>-Release:	5%{?dist}
>+Release:	6%{?dist}
> License:	ASL 2.0
> Group:		System Environment/Daemons
> Source0:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
>@@ -135,13 +135,17 @@ rm -rf $RPM_BUILD_ROOT
> 
> %post
> /sbin/ldconfig
>-if [ $1 -eq 1 ] ; then
>-%if %{?fedora}0 > 140 || %{?rhel}0 > 60
>-  /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+%if %{?fedora}0 > 170 || %{?rhel}0 > 60
>+  %systemd_post trafficserver.service
> %else
>-  /sbin/chkconfig --add %{name}
>+  if [ $1 -eq 1 ] ; then
>+  %if %{?fedora}0 > 140
>+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+  %else
>+    /sbin/chkconfig --add %{name}
>+  %endif
>+  fi
> %endif
>-fi
> 
> %pre
> getent group ats >/dev/null || groupadd -r ats -g 176 &>/dev/null
>@@ -150,30 +154,25 @@ useradd -r -u 176 -g ats -d / -s /sbin/nologin \
> 	-c "Apache Traffic Server" ats &>/dev/null
> 
> %preun
>-if [ $1 -eq 0 ] ; then
>-%if %{?fedora}0 > 140 || %{?rhel}0 > 60
>-  /bin/systemctl disable trafficserver.service >/dev/null 2>&1 || :
>-  /bin/systemctl stop trafficserver.service >/dev/null 2>&1 || :
>+%if %{?fedora}0 > 170 || %{?rhel}0 > 60
>+  %systemd_preun trafficserver.service
> %else
>+if [ $1 -eq 0 ] ; then
>   /sbin/service %{name} stop > /dev/null 2>&1
>   /sbin/chkconfig --del %{name}
>-%endif
> fi
>+%endif
> 
> %postun
> /sbin/ldconfig
> 
>-%if %{?fedora}0 > 140 || %{?rhel}0 > 60
>-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
>-%endif
>-
>-if [ $1 -eq 1 ] ; then
>-%if %{?fedora}0 > 140 || %{?rhel}0 > 60
>-  /bin/systemctl try-restart trafficserver.service >/dev/null 2>&1 || :
>+%if %{?fedora}0 > 170 || %{?rhel}0 > 60
>+  %systemd_postun_with_restart trafficserver.service
> %else
>+if [ $1 -eq 1 ] ; then
>   /sbin/service trafficserver condrestart &>/dev/null || :
>-%endif
> fi
>+%endif
> 
> 
> %package devel
>@@ -194,6 +193,8 @@ header files, and Apache httpd style module build system.
> %attr(0644,root,root) %{_libdir}/trafficserver/*.so
> 
> %changelog
>+* Fri Aug 24 2012 VÃ¡clav PavlÃn <vpavlin@redhat.com> - 3.2.0-6
>+- Scriptlets replaced with new systemd macros (#851462)
> 
> * Thu Aug 16 2012 Jan-Frode Myklebust <janfrode@tanso.net> - 3.2.0-5
> - Add patch for TS-1392, to fix problem with SNI fallback.

Actions: View | Diff

Attachments on bug 851462: 606800 | 607170