Attachment 616920 Details for Bug 850399 – Patch adds systemd macros with condition for F18 and RHEL7

[patch] Patch adds systemd macros with condition for F18 and RHEL7

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

(hide)

Description:

Filename:

MIME Type:

Creator: Václav Pavlín

Created: 2012-09-25 08:48:02 UTC

Size: 2.37 KB

patch

obsolete

>diff --git a/krb5.spec b/krb5.spec
>index 31b4c13..74e858d 100644
>--- a/krb5.spec
>+++ b/krb5.spec
>@@ -24,12 +24,19 @@
> %else
> %global WITH_SYSTEMD 0
> %endif
>+
>+%if 0%{?fedora} >= 18 || 0%{?rhel} > 6
>+%global WITH_PRESETS 1
>+%else
>+%global WITH_PRESETS 0
>+%endif
>+
> %global gettext_domain mit-krb5
> 
> Summary: The Kerberos network authentication system
> Name: krb5
> Version: 1.10.3
>-Release: 6%{?dist}
>+Release: 7%{?dist}
> # Maybe we should explode from the now-available-to-everybody tarball instead?
> # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.3-signed.tar
> Source0: krb5-%{version}.tar.gz
>@@ -531,6 +538,9 @@ install -m 755 kdb_check_weak $RPM_BUILD_ROOT/%{_libdir}/krb5/
> %post server
> # Remove the init script for older servers.
> [ -x /etc/rc.d/init.d/krb5server ] && /sbin/chkconfig --del krb5server
>+%if %{WITH_PRESETS}
>+        %systemd_post krb5kdc.service kadmin.service kprop.service
>+%else
> %if %{WITH_SYSTEMD}
> if [ $1 -eq 1 ] ; then 
>     # Initial installation 
>@@ -542,12 +552,17 @@ fi
> /sbin/chkconfig --add kadmin
> /sbin/chkconfig --add kprop
> %endif
>+%endif
>+
> # Install info pages.
> /sbin/install-info %{_infodir}/krb5-admin.info.gz %{_infodir}/dir
> /sbin/install-info %{_infodir}/krb5-install.info.gz %{_infodir}/dir
> exit 0
> 
> %preun server
>+%if %{WITH_PRESETS}
>+        %systemd_preun krb5kdc.service kadmin.service kprop.service
>+%else
> if [ "$1" -eq "0" ] ; then
> %if %{WITH_SYSTEMD}
> 	/bin/systemctl --no-reload disable krb5kdc.service > /dev/null 2>&1 || :
>@@ -567,9 +582,13 @@ if [ "$1" -eq "0" ] ; then
> 	/sbin/install-info --delete %{_infodir}/krb5-admin.info.gz %{_infodir}/dir
> 	/sbin/install-info --delete %{_infodir}/krb5-install.info.gz %{_infodir}/dir
> fi
>+%endif
> exit 0
> 
> %postun server
>+%if %{WITH_PRESETS}
>+        %systemd_postun_with_restart krb5kdc.service kadmin.service kprop.service
>+%else
> %if %{WITH_SYSTEMD}
> /bin/systemctl daemon-reload >/dev/null 2>&1 || :
> if [ "$1" -ge 1 ] ; then
>@@ -584,6 +603,7 @@ if [ "$1" -ge 1 ] ; then
> 	/sbin/service kprop condrestart > /dev/null 2>&1 || :
> fi
> %endif
>+%endif
> exit 0
> 
> %if %{WITH_SYSTEMD}
>@@ -852,6 +872,9 @@ exit 0
> %{_sbindir}/uuserver
> 
> %changelog
>+* Tue Sep 25 2012 VÃ¡clav PavlÃn <vpavlin@redhat.com> - 1.10.3-7
>+- New systemd macros added for F18+ and RHEL7+ (#850399)
>+
> * Tue Sep 25 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.3-6
> - actually pull up the patch for RT#7063, and not some other ticket (#773496)
>

Actions: View | Diff

Attachments on bug 850399: 616920