[zvbi/f16] add missing triggerun for systemd migration

[Tom Callaway]

commit 9870d60e51ec137f1356d2c85ffed43c143693d4
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Fri Sep 23 15:29:16 2011 -0400

    add missing triggerun for systemd migration

 zvbi.spec |   43 +++++++++++++++++++------------------------
 1 files changed, 19 insertions(+), 24 deletions(-)
---
diff --git a/zvbi.spec b/zvbi.spec
index 34242b6..4c63be9 100644
--- a/zvbi.spec
+++ b/zvbi.spec
@@ -3,7 +3,7 @@
 
 Name:               zvbi
 Version:            0.2.33
-Release:            7%{?dist}
+Release:            9%{?dist}
 Summary:            Raw VBI, Teletext and Closed Caption decoding library
 Group:              System Environment/Libraries
 # See NEWS for a full breakdown of licensing.
@@ -13,7 +13,6 @@ Source0:            http://downloads.sourceforge.net/zapping/%{name}-%{version}.
 Patch0:             %{name}-0.2.24-tvfonts.patch
 Patch1:             %{name}-0.2.25-openfix.patch
 Patch2:		    %{name}-0.2.33-stat.patch
-BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:      doxygen
 BuildRequires:      fontconfig
 BuildRequires:      gettext >= 0.16.1
@@ -22,6 +21,7 @@ BuildRequires:      libICE-devel
 BuildRequires:      xorg-x11-font-utils
 BuildRequires:      systemd-units
 
+Requires(post):     systemd-sysv
 Requires(post):     systemd-units
 Requires(preun):    systemd-units
 Requires(postun):   systemd-units
@@ -53,13 +53,7 @@ Group:              User Interface/X
 Requires(post):     fontconfig
 Requires(postun):   fontconfig
 # Don't use chkfontpath for F8+, it's legacy.
-%if 0%{?fedora} <= 7
-Requires(post):     chkfontpath
-Requires(postun):   chkfontpath
-%endif
-%if 0%{?fedora} > 9
 BuildArch:	    noarch
-%endif
 Obsoletes:          xawtv-tv-fonts < 3.95
 Provides:           xawtv-tv-fonts >= 3.95
 
@@ -114,7 +108,6 @@ popd
 
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}%{fontdir}
 make install DESTDIR=%{buildroot}
 
@@ -135,14 +128,8 @@ install -pm0644 contrib/fonts.* %{buildroot}%{fontdir}
 #%%ghost the fonts.cache-1 and fonts.dir
 touch %{buildroot}%{fontdir}/fonts.cache-1
 
-%if 0%{?fedora} > 7
 mkdir -p %{buildroot}%{catalogue}
 ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name}
-%endif
-
-
-%clean
-rm -rf %{buildroot}
 
 
 %post
@@ -169,25 +156,29 @@ if [ $1 = 0 ]; then
     /bin/systemctl stop zvbid.service >/dev/null 2>&1 || :
 fi
 
+%triggerun -- zvbi < 0.2.33-9
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply zvbid
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save zvbid >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del zvbid >/dev/null 2>&1 || :
+/bin/systemctl try-restart zvbid.service >/dev/null 2>&1 || :
+
+
 
 %post fonts
 fc-cache -f %{_datadir}/fonts/%{name} || :
-%if 0%{?fedora} <= 7
-chkfontpath -q -a %{fontdir} || :
-%endif
 
 
 %postun fonts
 if [ "$1" = "0" ]; then
     fc-cache -f %{_datadir}/fonts || :
-%if 0%{?fedora} <= 7
-    chkfontpath -q -r %{fontdir} || :
-%endif
 fi
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %{_bindir}/%{name}*
 %{_sbindir}/zvbid
 #%{_initrddir}/zvbid
@@ -210,13 +201,17 @@ fi
 %{fontdir}/*.gz
 %{fontdir}/fonts.dir
 %{fontdir}/fonts.alias
-%if 0%{?fedora} > 7
 %{catalogue}/%{name}
-%endif
 %ghost %{fontdir}/fonts.cache-1
 
 
 %changelog
+* Fri Sep 23 2011 Tom Callaway <spot at fedoraproject.org> - 0.2.33-9
+- add missing triggerun for systemd migration
+
+* Tue Sep  6 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.2.33-8
+- Drop chkconfig stuff completely
+
 * Wed Aug 17 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.2.33-7
 - Migration from SysV to Systemd init system (#730154)