diff --git a/zvbi.spec b/zvbi.spec index 15431ba..4c63be9 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 8%{?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 @@ -108,7 +108,6 @@ popd %install -rm -rf %{buildroot} mkdir -p %{buildroot}%{fontdir} make install DESTDIR=%{buildroot} @@ -133,10 +132,6 @@ mkdir -p %{buildroot}%{catalogue} ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} -%clean -rm -rf %{buildroot} - - %post /sbin/ldconfig @@ -161,6 +156,17 @@ 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} || : @@ -173,7 +179,6 @@ fi %files -f %{name}.lang -%defattr(-,root,root,-) %{_bindir}/%{name}* %{_sbindir}/zvbid #%{_initrddir}/zvbid @@ -201,6 +206,9 @@ fi %changelog +* Fri Sep 23 2011 Tom Callaway - 0.2.33-9 +- add missing triggerun for systemd migration + * Tue Sep 6 2011 Dmitry Butskoy - 0.2.33-8 - Drop chkconfig stuff completely