rpms/fonts-KOI8-R/devel fonts-KOI8-R.spec,1.10,1.11

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/fonts-KOI8-R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11831

Modified Files:
	fonts-KOI8-R.spec 
Log Message:
* Tue Aug 21 2007 Karsten Hopp <karsten at redhat.com> 1.0-10
- remove chkfontpath dependency (#252271)
- fix URL, fix buildroot



Index: fonts-KOI8-R.spec
===================================================================
RCS file: /cvs/extras/rpms/fonts-KOI8-R/devel/fonts-KOI8-R.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fonts-KOI8-R.spec	12 Jul 2006 05:50:19 -0000	1.10
+++ fonts-KOI8-R.spec	28 Aug 2007 03:28:12 -0000	1.11
@@ -1,18 +1,18 @@
 %define ISONAME KOI8-R
+%define catalogue /etc/X11/fontpath.d
 Name: fonts-%{ISONAME}
 Version: 1.0
-Release: 9.1.1
-License: distributable
+Release: 10
+License: MIT
 #URL: <none yet>
-Source: http://www.inp.nsk.su/~bolkhov/files/fonts/cyr_rfx/srctgz/cyr-rfx-koi8-ub-1.1.bdfs.tar.bz2
+Source: http://www.inp.nsk.su/~bolkhov/files/fonts/cyr-rfx/srctgz/cyr-rfx-koi8-ub-1.1.bdfs.tar.bz2
 Source1: Makefile.cyrfonts
 Source2: ftp://ftp.ksi-linux.com/pub/patches/ksi-XFree86-cyrillic-fonts.tar.bz2
 Patch: koi8-ub-bcl.patch
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Group: User Interface/X
 Summary: Russian and Ukrainian language fonts for the X Window System.
-Prereq: /usr/sbin/chkfontpath
 Obsoletes: XFree86-KOI8-R
 Provides: XFree86-KOI8-R
 BuildRequires:  mkfontdir, bdftopcf
@@ -28,7 +28,6 @@
 
 
 %package 75dpi
-Prereq: /usr/sbin/chkfontpath
 Group: User Interface/X
 Summary: A set of 75 dpi Russian and Ukrainian language fonts for X.
 Obsoletes: XFree86-KOI8-R-75dpi-fonts
@@ -43,7 +42,6 @@
 install this package.
 
 %package 100dpi
-Prereq: /usr/sbin/chkfontpath
 Group: User Interface/X
 Summary: KOI8-R fonts in 100 dpi resolution for the X Window System.
 Obsoletes: XFree86-KOI8-R-100dpi-fonts
@@ -72,61 +70,36 @@
 DSTFONT=$RPM_BUILD_ROOT/usr/share/fonts/%{ISONAME}
 make install PREFIX=$RPM_BUILD_ROOT \
 	FONTDIR=$DSTFONT
+mkdir -p $RPM_BUILD_ROOT%{catalogue}
+ln -sf /usr/share/fonts/%{ISONAME}/misc $RPM_BUILD_ROOT%{catalogue}/%{ISONAME}-misc
+ln -sf /usr/share/fonts/%{ISONAME}/75dpi $RPM_BUILD_ROOT%{catalogue}/%{ISONAME}-75dpi
+ln -sf /usr/share/fonts/%{ISONAME}/100dpi $RPM_BUILD_ROOT%{catalogue}/%{ISONAME}-100dpi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-if [ "$LANG" = "ru_RU.KOI8-R" -o "$LANG" = "ru_RU.koi8r" -o "$LANG" = "uk_UA.KOI8-U" -o "$LANG" = "uk_UA" ]; then
-	/usr/sbin/chkfontpath -q --first -a /usr/share/fonts/%{ISONAME}/misc
-else
-	/usr/sbin/chkfontpath -q -a /usr/share/fonts/%{ISONAME}/misc
-fi
-
-%postun
-if [ "$1" = "0" ]; then
-	/usr/sbin/chkfontpath -q -r /usr/share/fonts/%{ISONAME}/misc
-fi
-
-%post 75dpi
-if [ "$LANG" = "ru_RU.KOI8-R" -o "$LANG" = "ru_RU.koi8r" -o "$LANG" = "uk_UA.KOI8-U" -o "$LANG" = "uk_UA" ]; then
-	/usr/sbin/chkfontpath -q --first -a /usr/share/fonts/%{ISONAME}/75dpi
-else
-	/usr/sbin/chkfontpath -q -a /usr/share/fonts/%{ISONAME}/75dpi
-fi
-
-%postun 75dpi
-if [ "$1" = "0" ]; then
-	/usr/sbin/chkfontpath -q -r /usr/share/fonts/%{ISONAME}/75dpi
-fi
-
-%post 100dpi
-if [ "$LANG" = "ru_RU.KOI8-R" -o "$LANG" = "ru_RU.koi8r" -o "$LANG" = "uk_UA.KOI8-U" -o "$LANG" = "uk_UA" ]; then
-	/usr/sbin/chkfontpath -q --first -a /usr/share/fonts/%{ISONAME}/100dpi
-else
-	/usr/sbin/chkfontpath -q -a /usr/share/fonts/%{ISONAME}/100dpi
-fi
-
-%postun 100dpi
-if [ "$1" = "0" ]; then
-	/usr/sbin/chkfontpath -q -r /usr/share/fonts/%{ISONAME}/100dpi
-fi
-
 %files
 %defattr(-,root,root)
 %doc doc  Cyrillic/COPYRIGHT
 %dir /usr/share/fonts/%{ISONAME}
+%{catalogue}/%{ISONAME}-misc
 /usr/share/fonts/%{ISONAME}/misc
 
 %files 75dpi
 %defattr(-,root,root)
+%{catalogue}/%{ISONAME}-75dpi
 /usr/share/fonts/%{ISONAME}/75dpi
 
 %files 100dpi
 %defattr(-,root,root)
+%{catalogue}/%{ISONAME}-100dpi
 /usr/share/fonts/%{ISONAME}/100dpi
 
 %changelog
+* Tue Aug 21 2007 Karsten Hopp <karsten at redhat.com> 1.0-10
+- remove chkfontpath dependency (#252271)
+- fix URL, fix buildroot
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0-9.1.1
 - rebuild