[zvbi/el6] Drop chkconfig completely
Dmitry Butskoy
buc at fedoraproject.org
Tue Sep 6 13:30:43 UTC 2011
commit 288a1688017489976b6b8946d93274389598791f
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Tue Sep 6 17:30:11 2011 +0400
Drop chkconfig completely
zvbi.spec | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/zvbi.spec b/zvbi.spec
index 926dea6..3c5605b 100644
--- a/zvbi.spec
+++ b/zvbi.spec
@@ -3,7 +3,7 @@
Name: zvbi
Version: 0.2.33
-Release: 5%{?dist}.1
+Release: 6%{?dist}
Summary: Raw VBI, Teletext and Closed Caption decoding library
Group: System Environment/Libraries
# See NEWS for a full breakdown of licensing.
@@ -50,14 +50,7 @@ Summary: Fonts from zvbi converted to X11
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
@@ -115,10 +108,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
@@ -146,17 +137,11 @@ fi
%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
@@ -183,13 +168,14 @@ fi
%{fontdir}/*.gz
%{fontdir}/fonts.dir
%{fontdir}/fonts.alias
-%if 0%{?fedora} > 7
%{catalogue}/%{name}
-%endif
%ghost %{fontdir}/fonts.cache-1
%changelog
+* Tue Sep 6 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.2.33-6
+- Drop old chkconfig stuff completely
+
* Thu Sep 1 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.2.33-5.1
- rebuild for EPEL6
More information about the scm-commits
mailing list