diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec index f1a7b91..02f22ce 100644 --- a/xorg-x11-font-utils.spec +++ b/xorg-x11-font-utils.spec @@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname} # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line! Epoch: 1 Version: 7.2 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT/X11 Group: User Interface/X URL: http://www.x.org @@ -47,7 +47,7 @@ Requires(pre): xorg-x11-filesystem >= 0.99.2-3 Requires(pre): libfontenc >= 0.99.2-2 Provides: %{pkgname} -Provides: bdftopcf, fonttosfnt, mkfontdir, mkfontscale, bdftruncate, ucs2any +Provides: bdftopcf, fonttosfnt, mkfontdir, mkfontscale, ucs2any # NOTE: XFree86-font-utils package contains mkfontdir, mkfontscale, so this # is needed for upgrades to work properly from OS releases that had XFree86 Obsoletes: XFree86-font-utils @@ -64,6 +64,18 @@ Obsoletes: xorg-x11-tools <= 6.7.99.903-3 X.Org X11 font utilities required for font installation, conversion, and generation. +%package -n bdftruncate +Summary: Generate truncated BDF font from ISO 10646-1 encoded BDF font +Group: Applications/System + +%description -n bdftruncate +bdftruncate allows one to generate from an ISO10646-1 encoded BDF font +other ISO10646-1 BDF fonts in which all characters above a threshold +code value are stored unencoded. This is often desirable because the +Xlib API and X11 protocol data structures used for representing font +metric information are extremely inefficient when handling sparsely +populated fonts. + %prep %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 %patch0 -p0 -b .font-util-mapdir-use-datadir-fix @@ -90,11 +102,17 @@ and generation. rm -rf $RPM_BUILD_ROOT # Install all apps { - for app in bdftopcf fonttosfnt mkfontdir mkfontscale font-util; do - pushd $app-* - make install DESTDIR=$RPM_BUILD_ROOT - popd - done + for app in bdftopcf fonttosfnt mkfontdir mkfontscale font-util; do + pushd $app-* + make install DESTDIR=$RPM_BUILD_ROOT + popd + done + for i in */README ; do + [ -s $i ] && cp $i README-$(echo $i | sed 's/-[0-9].*//') + done + for i in */COPYING ; do + grep -q stub $i || cp $i COPYING-$(echo $i | sed 's/-[0-9].*//') + done } %clean @@ -102,29 +120,36 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -# FIXME: Include missing docs sometime -%doc +%doc README-* COPYING-* %{_bindir}/bdftopcf -%{_bindir}/bdftruncate %{_bindir}/fonttosfnt %{_bindir}/mkfontdir %{_bindir}/mkfontscale %{_bindir}/ucs2any +# blech. this one should be in -filesystem %dir %{_datadir}/X11 %dir %{_datadir}/X11/fonts %dir %{_datadir}/X11/fonts/util %{_datadir}/X11/fonts/util/map-* %{_datadir}/aclocal/fontutil.m4 %{_libdir}/pkgconfig/fontutil.pc -#%dir %{_mandir}/man1x %{_mandir}/man1/bdftopcf.1* -%{_mandir}/man1/bdftruncate.1* %{_mandir}/man1/fonttosfnt.1* %{_mandir}/man1/mkfontdir.1* %{_mandir}/man1/mkfontscale.1* %{_mandir}/man1/ucs2any.1* +%files -n bdftruncate +%defattr(-,root,root,-) +%{_bindir}/bdftruncate +%{_mandir}/man1/bdftruncate.1* + + %changelog +* Mon Dec 10 2007 Adam Jackson 1:7.2-3 +- Move bdftruncate (and its perl dependency) to a subpackage. +- %%doc for the non-empty READMEs and non-stub COPYINGs. + * Tue Aug 21 2007 Adam Jackson - 1:7.2-2 - Rebuild for build id