Author: qboosh Date: Mon Apr 30 22:00:25 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 4.6.0 (just in case) - updated do_not_run_fccache,TTF_build patches - allow to build using X11R7 tools
---- Files affected: SPECS: XFree86-fonts.spec (1.111 -> 1.112) ---- Diffs: ================================================================ Index: SPECS/XFree86-fonts.spec diff -u SPECS/XFree86-fonts.spec:1.111 SPECS/XFree86-fonts.spec:1.112 --- SPECS/XFree86-fonts.spec:1.111 Sun Apr 1 20:00:16 2007 +++ SPECS/XFree86-fonts.spec Tue May 1 00:00:20 2007 @@ -2,25 +2,29 @@ Summary: XFree86 Fonts Summary(pl.UTF-8): Fonty dla systemu XFree86 Name: XFree86-fonts -Version: 4.4.0 -Release: 2 +Version: 4.6.0 +Release: 1 License: MIT Group: Fonts -#Source0: ftp://ftp.xfree86.org/pub/XFree86/develsnaps/XFree86-%{version}.tar.bz2 # We need source0 for arabic fonts Source0: ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/XFree86-%{version}-src-1.tgz -# Source0-md5: 97cea3d9e1197dde32ca34e3b6086469 +# Source0-md5: 6c05f3486f088d01584f4517540e8d18 Source1: ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/XFree86-%{version}-src-4.tgz -# Source1-md5: 5d1792f5c154c7462c6aef39c7853b3b +# Source1-md5: 102ed22d33bd31a5853cb5addb51d7c9 Source2: ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/XFree86-%{version}-src-5.tgz -# Source2-md5: 5c37f028efc6d54a9c725e333f9cc8ae +# Source2-md5: f66708c7ff882e4ca232896266fbf92f Source3: %{name}.Fontmap Patch0: %{name}-extras-fix.patch Patch1: %{name}-do_not_run_fccache.patch Patch2: %{name}-TTF_build.patch -#BuildRequires: XFree86 >= %{version}-1 -#BuildRequires: XFree86-devel >= %{version}-1 -BuildRequires: XFree86 +# allow utils from X11R7 +%if %(test -x /usr/bin/bdftopcf ; echo $?) +BuildRequires: XFree86-devel +%else +BuildRequires: xorg-app-bdftopcf +BuildRequires: xorg-cf-files +BuildRequires: xorg-util-imake +%endif BuildRequires: perl BuildRequires: t1utils Requires(post,postun): fontpostinst @@ -36,6 +40,12 @@ %define _t1afmdir %{_t1fontsdir}/afm %define _t1pfmdir %{_t1fontsdir}/pfm +%if %(test -d /usr/%{_lib}/X11/config ; echo $?) +%define xconfdir %{_prefix}/lib/X11/config +%else +%define xconfdir /usr/%{_lib}/X11/config +%endif + %description This package contains some common used fonts. Normally fonts are needed only by X server (either locally to server or through xfs). @@ -861,11 +871,11 @@ %build cd xc/fonts -imake -DBuildFonts -DUseInstalled -I%{_prefix}/lib/X11/config +imake -DBuildFonts -DUseInstalled -I%{xconfdir} %{__make} Makefiles cd scaled -imake -DBuildFonts -DBuildEthiopicFonts -DBuildBethMarduthoFonts \ - -DUseInstalled -I%{_prefix}/lib/X11/config +imake -DBuildFonts -DBuildEthiopicFonts -DBuildBethMarduthoFonts -DBuildSpeedoFonts \ + -DUseInstalled -I%{xconfdir} %{__make} Makefiles cd .. %{__make} depend @@ -887,12 +897,16 @@ UCS2ANY=`pwd`/fonts/util/ucs2any.pl \ BDFTRUNCATE=`pwd`/fonts/util/bdftruncate.pl \ UCSMAPPREFIX=`pwd`/fonts/util/map- \ + BINDIR=%{_bindir} \ + FONTDIR=%{_fontsdir} \ + ENCODINGSDIR=%{_fontsdir}/encodings \ DESTDIR=$RPM_BUILD_ROOT %{__make} -C fonts install.man \ TOP=`pwd` \ UCS2ANY=`pwd`/fonts/util/ucs2any.pl \ BDFTRUNCATE=`pwd`/fonts/util/bdftruncate.pl \ UCSMAPPREFIX=`pwd`/fonts/util/map- \ + MANDIR=%{_mandir}/man1 \ DESTDIR=$RPM_BUILD_ROOT cd .. @@ -1593,6 +1607,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.112 2007/04/30 22:00:20 qboosh +- updated to 4.6.0 (just in case) +- updated do_not_run_fccache,TTF_build patches +- allow to build using X11R7 tools + Revision 1.111 2007/04/01 18:00:16 qboosh - biznet ISO8859-2 fonts moved to separate fonts-bitmap-biznet-ISO8859-2.spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/XFree86-fonts.spec?r1=1.111&r2=1.112&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
