rpms/fonts-ISO8859-2/devel fonts-ISO8859-2.spec,1.13,1.14

[Rahul Bhalerao (rbhalera)]

Author: rbhalera

Update of /cvs/pkgs/rpms/fonts-ISO8859-2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24124

Modified Files:
	fonts-ISO8859-2.spec 
Log Message:
Dropping chkfontpath dependency


Index: fonts-ISO8859-2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-ISO8859-2/devel/fonts-ISO8859-2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fonts-ISO8859-2.spec	12 Jul 2006 05:49:53 -0000	1.13
+++ fonts-ISO8859-2.spec	21 Aug 2007 11:35:38 -0000	1.14
@@ -4,6 +4,9 @@
 
 %define __mkfontdir umask 133;mkfontdir
 
+%define fontdir %{_datadir}/fonts/ISO8859-2
+%define catalogue /etc/X11/fontpath.d
+
 Name: fonts-%{ISONAME}
 Version: 1.0
 Release: 17.1
@@ -19,7 +22,7 @@
 Group: User Interface/X
 Summary: Central European language fonts for the X Window System.
 Buildrequires: xorg-x11-font-utils
-Requires: mkfontdir, chkfontpath
+Requires: mkfontdir
  
 %description
 If you use the X Window System and you want to display Central
@@ -32,7 +35,7 @@
 %package 75dpi
 Group: User Interface/X
 Summary: A set of 75dpi Central European language fonts for X.
-Requires: mkfontdir, chkfontpath
+Requires: mkfontdir
 
 %description 75dpi
 This package contains a set of Central European language fonts in 75 dpi
@@ -42,7 +45,7 @@
 %package 100dpi
 Group: User Interface/X
 Summary: A set of 100dpi Central European language fonts for X.
-Requires: mkfontdir, chkfontpath
+Requires: mkfontdir
 
 %description 100dpi
 This package includes Central European (ISO8859-2) fonts, in 100 dpi
@@ -52,7 +55,7 @@
 %package Type1
 Group: User Interface/X
 Summary: Type 1 scalable Central European language (ISO8859-2) fonts for X.
-Requires: mkfontdir, chkfontpath
+Requires: mkfontdir
 
 %description Type1
 This package contains Central European Type 1 fonts for the X Window System.
@@ -92,60 +95,37 @@
 )
 %endif
 
+# Install catalogue symlink
+mkdir -p $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{fontdir}/misc $RPM_BUILD_ROOT%{catalogue}/fonts-ISO8859-2
+ln -sf %{fontdir}/75dpi $RPM_BUILD_ROOT%{catalogue}/fonts-ISO8859-2-75dpi
+ln -sf %{fontdir}/100dpi $RPM_BUILD_ROOT%{catalogue}/fonts-ISO8859-2-100dpi
+%if %{include_ulT1mo}
+ln -sf %{fontdir}/Type1 $RPM_BUILD_ROOT%{catalogue}/fonts-ISO8859-2-Type1
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 {
     %__mkfontdir /usr/share/fonts/%{ISONAME}/misc
-    /usr/sbin/chkfontpath -q -a /usr/share/fonts/%{ISONAME}/misc:unscaled
-} &> /dev/null || :
-
-%postun
-{
-    if [ "$1" = "0" ]; then
-	/usr/sbin/chkfontpath -q -r /usr/share/fonts/%{ISONAME}/misc:unscaled
-    fi
 } &> /dev/null || :
 
 %post 75dpi
 {
     %__mkfontdir /usr/share/fonts/%{ISONAME}/75dpi
-    /usr/sbin/chkfontpath -q -a /usr/share/fonts/%{ISONAME}/75dpi:unscaled
-} &> /dev/null || :
-
-%postun 75dpi
-{
-    if [ "$1" = "0" ]; then
-	/usr/sbin/chkfontpath -q -r /usr/share/fonts/%{ISONAME}/75dpi:unscaled
-    fi
 } &> /dev/null || :
 
 %post 100dpi
 {
     %__mkfontdir /usr/share/fonts/%{ISONAME}/100dpi
-    /usr/sbin/chkfontpath -q -a /usr/share/fonts/%{ISONAME}/100dpi:unscaled
-} &> /dev/null || :
-
-%postun 100dpi
-{
-    if [ "$1" = "0" ]; then
-	/usr/sbin/chkfontpath -q -r /usr/share/fonts/%{ISONAME}/100dpi:unscaled
-    fi
 } &> /dev/null || :
 
 %if %{include_ulT1mo}
 %post Type1
 {
     %__mkfontdir /usr/share/fonts/%{ISONAME}/Type1
-    /usr/sbin/chkfontpath -q -a /usr/share/fonts/%{ISONAME}/Type1
-} &> /dev/null || :
-
-%postun Type1
-{
-    if [ "$1" = "0" ]; then
-	/usr/sbin/chkfontpath -q -r /usr/share/fonts/%{ISONAME}/Type1
-    fi
 } &> /dev/null || :
 %endif
 
@@ -157,6 +137,8 @@
 /usr/share/fonts/%{ISONAME}/misc/*.gz
 %config(noreplace) %verify(not md5 size mtime) /usr/share/fonts/%{ISONAME}/misc/fonts.alias
 %ghost %verify(not md5 size mtime) /usr/share/fonts/%{ISONAME}/misc/fonts.dir
+%dir %{catalogue}
+%{catalogue}/fonts-ISO8859-2
 
 %files 75dpi
 %defattr(-,root,root)
@@ -164,6 +146,8 @@
 /usr/share/fonts/%{ISONAME}/75dpi/*.gz
 %config(noreplace) %verify(not md5 size mtime) /usr/share/fonts/%{ISONAME}/75dpi/fonts.alias
 %ghost %verify(not md5 size mtime) /usr/share/fonts/%{ISONAME}/75dpi/fonts.dir
+%dir %{catalogue}
+%{catalogue}/fonts-ISO8859-2-75dpi
 
 %files 100dpi
 %defattr(-,root,root)
@@ -171,6 +155,8 @@
 /usr/share/fonts/%{ISONAME}/100dpi/*.gz
 %config(noreplace) %verify(not md5 size mtime) /usr/share/fonts/%{ISONAME}/100dpi/fonts.alias
 %ghost %verify(not md5 size mtime) /usr/share/fonts/%{ISONAME}/100dpi/fonts.dir
+%dir %{catalogue}
+%{catalogue}/fonts-ISO8859-2-100dpi
 
 %if %{include_ulT1mo}
 %files Type1
@@ -184,9 +170,14 @@
 %config(noreplace) %verify(not md5 size mtime) /usr/share/fonts/%{ISONAME}/Type1/fonts.alias
 %verify(not md5 size mtime) /usr/share/fonts/%{ISONAME}/Type1/fonts.scale
 %ghost %verify(not md5 size mtime) /usr/share/fonts/%{ISONAME}/Type1/fonts.dir
+%dir %{catalogue}
+%{catalogue}/fonts-ISO8859-2-Type1
 %endif
 
 %changelog
+* Tue Aug 21 2007 Rahul Bhalerao <rbhalera at redhat.com>
+- Dropping chkfontpath dependency (bug #251026, by Matthias Clasen)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0-17.1
 - rebuild