From d0564995baae9159c8f04d978fc4685861e2fcfc Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Jun 25 2007 22:03:03 +0000 Subject: - Use the new catalogue font install mechanism, drop all chkfontpath dependencies. - Unsplit base and misc subpackages, we don't require any base fonts now that we have built-ins. --- diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec index d3b5236..9ed2067 100644 --- a/xorg-x11-fonts.spec +++ b/xorg-x11-fonts.spec @@ -11,13 +11,7 @@ # NOTE: Fonts strictly intended for X core fonts, should be installed # into _x11fontdir. %define _x11fontdir %{_x11fontdirprefix}/X11/fonts -# NOTE: Fonts intended to be visible to both fontconfig, and the core fonts -# system, should be installed into _systemfontdir. -%define _sysfontdir %{_datadir}/fonts - -#%define _type1_fontdir %{_sysfontdir} %define _type1_fontdir %{_x11fontdir} -#%define _otf_fontdir %{_sysfontdir} %define _otf_fontdir %{_x11fontdir} %define _ttf_fontdir %{_x11fontdir} @@ -31,8 +25,8 @@ Summary: X.Org X11 fonts Name: xorg-x11-fonts -Version: 7.1 -Release: 4%{?dist} +Version: 7.2 +Release: 1%{?dist} License: Various licenses Group: User Interface/X URL: http://www.x.org @@ -98,8 +92,8 @@ BuildRequires: font-utils >= 1.0.2-1 BuildRequires: fontconfig BuildRequires: ucs2any, bdftruncate, bdftopcf -# FIXME: sed is used for now to avoid having to maintain a big patch. -BuildRequires: sed +# FIXME: perl is used for now to avoid having to maintain a big patch. +BuildRequires: perl Conflicts: xorg-x11-server-Xorg < 1.3.0.0-10 Conflicts: xorg-x11-server-Xnext < 1.3.0.0-10 @@ -361,29 +355,25 @@ Contains a set of Cyrillic fonts. #-------------------------------------------------------------------------- %build -for dir in $(find . -maxdepth 1 -type d -name '[a-z]*-[0-9]*' | sort | sed -e 's#\./##g') ; do - pushd $dir - case $dir in - encodings-*) - %configure - ;; - - *) - # FIXME: Yes, this perl hack is fairly ugly, but beats the heck out of - # making a patch that patches 35 or so configure.ac files and maintaining - # it for an indefinite amount of time. Hopefully my solution here will - # get considered to be included in upstream 7.1 release in which case I'll - # turn it into a series of diffs instead and submit it. For now tho, perl - # is my friend. -- mharris - perl -p -i -e 's#(^DEFAULT(_|_OTF|_TTF)FONTDIR=)\${libdir}/X11/fonts#\1\$(pkg-config --variable=fontdir fontutil)#' configure.ac - autoconf - %configure \ - --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-6 \ - --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 \ - --disable-iso8859-13 --disable-iso8859-16 - ;; - esac +pushd encodings-* +%configure +make +popd +for dir in font-*; do + pushd $dir + # FIXME: Yes, this perl hack is fairly ugly, but beats the heck out of + # making a patch that patches 35 or so configure.ac files and maintaining + # it for an indefinite amount of time. Hopefully my solution here will + # get considered to be included in upstream 7.1 release in which case I'll + # turn it into a series of diffs instead and submit it. For now tho, perl + # is my friend. -- mharris + perl -p -i -e 's#(^DEFAULT(_|_OTF|_TTF)FONTDIR=)\${libdir}/X11/fonts#\1\$(pkg-config --variable=fontdir fontutil)#' configure.ac + autoconf + %configure \ + --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-6 \ + --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 \ + --disable-iso8859-13 --disable-iso8859-16 make popd done @@ -392,19 +382,17 @@ done %install rm -rf $RPM_BUILD_ROOT -for dir in $(find . -maxdepth 1 -type d -name '[a-z]*-[0-9]*' | sort | sed -e 's#\./##g') ; do - pushd $dir +for dir in *; do # FIXME: The upstream sources need to be patched to allow direct # specification of the 'fontdir' variable, instead of it being # relative to libdir. - make install DESTDIR=$RPM_BUILD_ROOT - popd + make -C $dir install DESTDIR=$RPM_BUILD_ROOT done # Install catalogue symlinks mkdir -p $RPM_BUILD_ROOT%{_catalogue} -for f in misc:unscaled Type1 TTF OTF 75dpi:unscaled 100dpi:unscaled cyrillic; do - ln -fs %{_x11fontdir}/${f%:unscaled} $RPM_BUILD_ROOT%{_catalogue}/xorg-x11-fonts-$f +for f in misc:unscaled:pri=10 75dpi:unscaled:pri=20 100dpi:unscaled:pri=30 Type1 TTF OTF cyrillic; do + ln -fs %{_x11fontdir}/${f%%:*} $RPM_BUILD_ROOT%{_catalogue}/xorg-x11-fonts-$f done # Generate the encodings.dir files in the encodings directories during @@ -710,7 +698,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc %dir %{_catalogue} -%{_catalogue}/xorg-x11-fonts-misc:unscaled +%{_catalogue}/xorg-x11-fonts-misc:unscaled:pri=10 %dir %{_x11fontdir} %dir %{_x11fontdir}/misc %{_x11fontdir}/misc/* @@ -811,7 +799,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc %dir %{_catalogue} -%{_catalogue}/xorg-x11-fonts-75dpi:unscaled +%{_catalogue}/xorg-x11-fonts-75dpi:unscaled:pri=20 %dir %{_x11fontdir} %dir %{_x11fontdir}/75dpi # font-adobe-75dpi @@ -854,7 +842,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc %dir %{_catalogue} -%{_catalogue}/xorg-x11-fonts-100dpi:unscaled +%{_catalogue}/xorg-x11-fonts-100dpi:unscaled:pri=30 %dir %{_x11fontdir} %dir %{_x11fontdir}/100dpi # font-adobe-100dpi @@ -897,7 +885,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc %dir %{_catalogue} -%{_catalogue}/xorg-x11-fonts-75dpi:unscaled +%{_catalogue}/xorg-x11-fonts-75dpi:unscaled:pri=20 %dir %{_x11fontdir} %dir %{_x11fontdir}/75dpi # font-adobe-75dpi @@ -932,7 +920,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc %dir %{_catalogue} -%{_catalogue}/xorg-x11-fonts-100dpi:unscaled +%{_catalogue}/xorg-x11-fonts-100dpi:unscaled:pri=30 %dir %{_x11fontdir} %dir %{_x11fontdir}/100dpi # font-adobe-100dpi @@ -967,7 +955,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc %dir %{_catalogue} -%{_catalogue}/xorg-x11-fonts-75dpi:unscaled +%{_catalogue}/xorg-x11-fonts-75dpi:unscaled:pri=20 %dir %{_x11fontdir} %dir %{_x11fontdir}/75dpi # font-adobe-75dpi @@ -1002,7 +990,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc %dir %{_catalogue} -%{_catalogue}/xorg-x11-fonts-100dpi:unscaled +%{_catalogue}/xorg-x11-fonts-100dpi:unscaled:pri=30 %dir %{_x11fontdir} %dir %{_x11fontdir}/100dpi # font-adobe-100dpi @@ -1037,7 +1025,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc %dir %{_catalogue} -%{_catalogue}/xorg-x11-fonts-75dpi:unscaled +%{_catalogue}/xorg-x11-fonts-75dpi:unscaled:pri=20 %dir %{_x11fontdir} %dir %{_x11fontdir}/75dpi # font-adobe-75dpi @@ -1072,7 +1060,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc %dir %{_catalogue} -%{_catalogue}/xorg-x11-fonts-100dpi:unscaled +%{_catalogue}/xorg-x11-fonts-100dpi:unscaled:pri=30 %dir %{_x11fontdir} %dir %{_x11fontdir}/100dpi # font-adobe-100dpi @@ -1107,7 +1095,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc %dir %{_catalogue} -%{_catalogue}/xorg-x11-fonts-75dpi:unscaled +%{_catalogue}/xorg-x11-fonts-75dpi:unscaled:pri=20 %dir %{_x11fontdir} %dir %{_x11fontdir}/75dpi # font-adobe-75dpi @@ -1142,7 +1130,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc %dir %{_catalogue} -%{_catalogue}/xorg-x11-fonts-100dpi:unscaled +%{_catalogue}/xorg-x11-fonts-100dpi:unscaled:pri=30 %dir %{_x11fontdir} %dir %{_x11fontdir}/100dpi # font-adobe-100dpi @@ -1177,7 +1165,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc %dir %{_catalogue} -%{_catalogue}/xorg-x11-fonts-75dpi:unscaled +%{_catalogue}/xorg-x11-fonts-75dpi:unscaled:pri=20 %dir %{_x11fontdir} %dir %{_x11fontdir}/75dpi # font-adobe-75dpi @@ -1212,7 +1200,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc %dir %{_catalogue} -%{_catalogue}/xorg-x11-fonts-100dpi:unscaled +%{_catalogue}/xorg-x11-fonts-100dpi:unscaled:pri=30 %dir %{_x11fontdir} %dir %{_x11fontdir}/100dpi # font-adobe-100dpi @@ -1299,7 +1287,7 @@ rm -rf $RPM_BUILD_ROOT %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-* %changelog -* Fri Jun 22 2007 Kristian Høgsberg - 7.1-4 +* Fri Jun 22 2007 Kristian Høgsberg - 7.2-1 - Use the new catalogue font install mechanism, drop all chkfontpath dependencies. - Unsplit base and misc subpackages, we don't require any base fonts now that we have built-ins.