[vdradmin-am] Drop sysv-to-systemd migration scriptlets.

[Ville Skyttä]

commit e0f0cb5081bfeaaa2302de9497f8bdb419e0502f
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Jul 26 20:54:59 2013 +0300

    Drop sysv-to-systemd migration scriptlets.
    
    - Honor %{_pkgdocdir} where available.

 vdradmin-am.spec |   26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 deletions(-)
---
diff --git a/vdradmin-am.spec b/vdradmin-am.spec
index f1bd426..affbd9f 100644
--- a/vdradmin-am.spec
+++ b/vdradmin-am.spec
@@ -1,9 +1,9 @@
-%global migrfile %{_var}/run/systemd-migr_%{name}-%{version}-%{release}.%{_arch}
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 %global svdrpport %(pkg-config --atleast-version 1.7.15 vdr && echo 6419 || echo 2001)
 
 Name:           vdradmin-am
 Version:        3.6.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Web interface for VDR
 
 # infobox.js is GPLv2, crystal icons LGPLv2+, everything else GPLv2+
@@ -27,7 +27,7 @@ BuildRequires:  systemd-units
 Requires:       perl(Locale::gettext)
 Requires:       perl(Sys::Syslog)
 Requires:       perl(Template::Plugin::JavaScript)
-Requires(pre):  shadow-utils systemd-sysv chkconfig
+Requires(pre):  shadow-utils
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -73,7 +73,7 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 install -Dpm 640 vdradmind.conf $RPM_BUILD_ROOT/var/lib/vdradmin/vdradmind.conf
 install -dm 755 $RPM_BUILD_ROOT/var/{cache,log}/vdradmin
 install -dm 755 $RPM_BUILD_ROOT%{_unitdir}
-sed -e 's|/usr/share/doc/vdradmin-am/|%{_docdir}/%{name}-%{version}/|' \
+sed -e 's|/usr/share/doc/vdradmin-am/|%{_pkgdocdir}/|' \
   < %{SOURCE1} > $RPM_BUILD_ROOT%{_unitdir}/vdradmind.service
 install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/%{name}
 install -dm 500 $RPM_BUILD_ROOT/etc/pki/tls/private/vdradmin
@@ -85,13 +85,6 @@ getent group vdradmin >/dev/null || groupadd -r vdradmin
 getent passwd vdradmin >/dev/null || \
 useradd -r -g vdradmin -d /var/lib/vdradmin -s /sbin/nologin \
     -c "VDR web interface" -M -n vdradmin
-rm -f %{migrfile} >/dev/null 2>&1
-if [ $1 -gt 1 ] && [ ! -e %{_unitdir}/vdradmind.service ] && \
-   [ -e %{_initddir}/vdradmind ] ; then
-    systemd-sysv-convert --save vdradmind >/dev/null 2>&1
-    chkconfig --del vdradmind >/dev/null 2>&1
-    touch %{migrfile} >/dev/null 2>&1
-fi
 exit 0
 
 %post
@@ -117,13 +110,6 @@ if [ $1 -gt 0 ] ; then
     systemctl try-restart vdradmind.service >/dev/null 2>&1 || :
 fi
 
-%triggerpostun -- vdradmin-am
-if [ $1 -gt 0 ] && [ -e %{migrfile} ] ; then
-    systemctl daemon-reload >/dev/null 2>&1
-    systemctl try-restart vdradmind.service >/dev/null 2>&1
-fi
-rm -f %{migrfile} >/dev/null 2>&1 || :
-
 %files -f vdradmin.lang
 %doc COPYING CREDITS FAQ HISTORY INSTALL LGPL.txt README*
 %doc contrib/*example convert.pl
@@ -144,6 +130,10 @@ rm -f %{migrfile} >/dev/null 2>&1 || :
 
 
 %changelog
+* Fri Jul 26 2013 Ville Skyttä <ville.skytta at iki.fi> - 3.6.9-7
+- Drop sysv-to-systemd migration scriptlets.
+- Honor %%{_pkgdocdir} where available.
+
 * Sun Jul 21 2013 Petr Pisar <ppisar at redhat.com> - 3.6.9-6
 - Perl 5.18 rebuild