diff --git a/.gitignore b/.gitignore index 633bc4b..41496f1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ bdftopcf-1.0.3.tar.bz2 mkfontscale-1.0.8.tar.bz2 mkfontdir-1.0.6.tar.bz2 font-util-1.2.0.tar.bz2 +/font-util-1.3.0.tar.bz2 diff --git a/font-util-1.0.1-autoconf-add-with-fontdir-option.patch b/font-util-1.0.1-autoconf-add-with-fontdir-option.patch deleted file mode 100644 index eb9fe8f..0000000 --- a/font-util-1.0.1-autoconf-add-with-fontdir-option.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- font-util-1.0.1/configure.ac.autoconf-add-with-fontdir-option 2005-12-16 00:16:32.000000000 -0500 -+++ font-util-1.0.1/configure.ac 2005-12-16 00:13:07.000000000 -0500 -@@ -40,6 +40,13 @@ - [MAPDIR="$DEFAULT_MAPDIR"]) - AC_SUBST(MAPDIR) - -+DEFAULT_FONTDIR=${datadir}/X11/fonts -+AC_ARG_WITH(fontdir, -+ AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install Xorg fonts by default]), -+ [FONTDIR="$withval"], -+ [FONTDIR="$DEFAULT_FONTDIR"]) -+AC_SUBST(FONTDIR) -+ - XORG_MANPAGE_SECTIONS - XORG_RELEASE_VERSION - ---- font-util-1.0.1/fontutil.pc.in.autoconf-add-with-fontdir-option 2005-12-16 00:17:06.000000000 -0500 -+++ font-util-1.0.1/fontutil.pc.in 2005-12-16 00:10:40.000000000 -0500 -@@ -2,6 +2,7 @@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - mapdir=@MAPDIR@ -+fontdir=@FONTDIR@ - - Name: FontUtil - Description: Font utilities dirs diff --git a/font-util-1.0.1-mapdir-use-datadir-fix.patch b/font-util-1.0.1-mapdir-use-datadir-fix.patch deleted file mode 100644 index f3db9c5..0000000 --- a/font-util-1.0.1-mapdir-use-datadir-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- font-util-1.0.0/configure.ac.font-util-mapdir-use-datadir-fix 2005-12-14 19:24:26.000000000 -0500 -+++ font-util-1.0.1/configure.ac 2005-12-16 00:07:23.000000000 -0500 -@@ -33,7 +33,7 @@ - - m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - --DEFAULT_MAPDIR=${libdir}/X11/fonts/util -+DEFAULT_MAPDIR=${datadir}/X11/fonts/util - AC_ARG_WITH(mapdir, - AS_HELP_STRING([--with-mapdir=MAPDIR], [Path to install font maps]), - [MAPDIR="$withval"], diff --git a/sources b/sources index cebcde2..1697411 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ b0ebd86029571239b9d7b0c61191b591 fonttosfnt-1.0.3.tar.bz2 dc342dd8858416254bb5f71a9ddce589 mkfontdir-1.0.6.tar.bz2 4a7a4a848c43c42f7d499b60666434a4 bdftopcf-1.0.3.tar.bz2 -1bdd8ed070e02b2165d7b0f0ed93280b font-util-1.2.0.tar.bz2 5210c9385c6cc4a00ce829d8dc9c819b mkfontscale-1.0.8.tar.bz2 +ddfc8a89d597651408369d940d03d06b font-util-1.3.0.tar.bz2 diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec index 094375a..0cc044e 100644 --- a/xorg-x11-font-utils.spec +++ b/xorg-x11-font-utils.spec @@ -6,7 +6,7 @@ Name: xorg-x11-%{pkgname} # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line! Epoch: 1 Version: 7.5 -Release: 7%{?dist} +Release: 8%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org @@ -15,12 +15,10 @@ Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.0.3.tar.bz2 Source1: ftp://ftp.x.org/pub/individual/app/fonttosfnt-1.0.3.tar.bz2 Source2: ftp://ftp.x.org/pub/individual/app/mkfontdir-1.0.6.tar.bz2 Source3: ftp://ftp.x.org/pub/individual/app/mkfontscale-%{mkfontscale}.tar.bz2 -Source4: ftp://ftp.x.org/pub/individual/font/font-util-1.2.0.tar.bz2 +Source4: ftp://ftp.x.org/pub/individual/font/font-util-1.3.0.tar.bz2 # helper script used in %post for xorg-x11-fonts Source5: xorg-x11-fonts-update-dirs -Patch0: font-util-1.0.1-mapdir-use-datadir-fix.patch -Patch1: font-util-1.0.1-autoconf-add-with-fontdir-option.patch Patch2: mkfontscale-examine-all-encodings.patch BuildRequires: pkgconfig(xfont) pkgconfig(x11) @@ -32,26 +30,16 @@ BuildRequires: autoconf Provides: %{pkgname} Provides: bdftopcf, fonttosfnt, mkfontdir, mkfontscale, ucs2any +# bdftruncate isn't a perl script anymore (repackaged in f18) +Provides: bdftruncate = %{version}-%{release} +Obsoletes: bdftruncate < %{version}-%{release} + %description 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 -#patch1 -p0 -b .autoconf-add-with-fontdir-option oldpwd=$(pwd) cd mkfontscale-%{mkfontscale} %patch2 -p1 -b .all-encodings @@ -63,12 +51,6 @@ cd ${oldpwd} for app in bdftopcf fonttosfnt mkfontdir mkfontscale font-util ; do oldpwd=$(pwd) cd $app-* - # FIXME: We run autoconf to activate font-util-0.99.1-mapdir-use-datadir-fix.patch - case $app in - font-util) - autoconf - ;; - esac # this --with-mapdir should be redundant? %configure --with-mapdir=%{_datadir}/X11/fonts/util make @@ -92,9 +74,6 @@ rm -rf $RPM_BUILD_ROOT for i in */COPYING ; do grep -q stub $i || cp $i COPYING-$(echo $i | sed 's/-[0-9].*//') done - - # bdftruncate is part of font-util - cp font-util-*/COPYING COPYING-bdftruncate } install -m 744 %{SOURCE5} ${RPM_BUILD_ROOT}%{_bindir}/xorg-x11-fonts-update-dirs @@ -107,6 +86,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc README-* COPYING-bdftopcf COPYING-[c-z]* %{_bindir}/bdftopcf +%{_bindir}/bdftruncate %{_bindir}/fonttosfnt %{_bindir}/mkfontdir %{_bindir}/mkfontscale @@ -118,19 +98,17 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/fontutil.m4 %{_libdir}/pkgconfig/fontutil.pc %{_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,-) -%doc COPYING-bdftruncate -%{_bindir}/bdftruncate -%{_mandir}/man1/bdftruncate.1* - - %changelog +* Thu Mar 01 2012 Adam Jackson 7.5-8 +- font-util 1.3.0 +- Un-subpackage bdftruncate, it's not a perl script anymore. + * Sat Jan 14 2012 Fedora Release Engineering - 1:7.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild