From b127d80138b2dfc827667aa14f949e5056e27164 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 6 Nov 2007 01:14:00 +0000 Subject: [PATCH] - Update to 2.4.92. - Mark /etc/fonts/conf.d/* as config(noreplace). - Remove most of our conf file, all upstreamed except for 75-blacklist-fedora.conf that I'm happily dropping. Who has Hershey fonts these days... - ln upstream'ed 25-unhint-nonlatin.conf from conf.avail in conf.d - Add 25-no-bitmap-fedora.conf which is the tiny remaining bit of conf that didn't end up upstream. Can get rid of it in the future, but not just yet. --- .cvsignore | 2 +- 25-no-bitmap-fedora.conf | 44 +++++++ 25-no-hint-fedora.conf | 243 --------------------------------------- 30-aliases-fedora.conf | 180 ----------------------------- 40-generic-fedora.conf | 35 ------ 64-nonlatin-fedora.conf | 67 ----------- 75-blacklist-fedora.conf | 54 --------- fontconfig.spec | 28 +++-- sources | 2 +- 9 files changed, 62 insertions(+), 593 deletions(-) create mode 100644 25-no-bitmap-fedora.conf delete mode 100644 25-no-hint-fedora.conf delete mode 100644 30-aliases-fedora.conf delete mode 100644 40-generic-fedora.conf delete mode 100644 64-nonlatin-fedora.conf delete mode 100644 75-blacklist-fedora.conf diff --git a/.cvsignore b/.cvsignore index eb047ac..03c1992 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fontconfig-2.4.91.tar.gz +fontconfig-2.4.92.tar.gz diff --git a/25-no-bitmap-fedora.conf b/25-no-bitmap-fedora.conf new file mode 100644 index 0000000..ffa7926 --- /dev/null +++ b/25-no-bitmap-fedora.conf @@ -0,0 +1,44 @@ + + + + + + Kochi Mincho + + + false + + + + + Kochi Gothic + + + false + + + + + Sazanami Mincho + + + false + + + + + Sazanami Gothic + + + false + + + + + AR PL ShanHeiSun Uni + + + true + + + diff --git a/25-no-hint-fedora.conf b/25-no-hint-fedora.conf deleted file mode 100644 index 9c71eb0..0000000 --- a/25-no-hint-fedora.conf +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - - - Kochi Mincho - - - false - - - false - - - - - Kochi Gothic - - - false - - - false - - - - - Sazanami Mincho - - - false - - - false - - - - - Sazanami Gothic - - - false - - - false - - - - - Baekmuk Batang - - - false - - - - - Baekmuk Dotum - - - false - - - - - Baekmuk Gulim - - - false - - - - - Baekmuk Headline - - - false - - - - - AR PL Mingti2L Big5 - - - false - - - - - AR PL ShanHeiSun Uni - - - false - - - true - - - - - AR PL KaitiM Big5 - - - false - - - - - AR PL ZenKai Uni - - - false - - - - - AR PL SungtiL GB - - - false - - - - - AR PL KaitiM GB - - - false - - - - - ZYSong18030 - - - false - - - - - - - Mukti Narrow - - - false - - - - - Lohit Hindi - - - false - - - - - Lohit Bengali - - - false - - - - - Lohit Punjabi - - - false - - - - - - - Lohit Gujarati - - - false - - - - - - - Lohit Kannada - - - false - - - - - - Lohit Oriya - - - false - - - - - - Lohit Malayalam - - - false - - - - - - Lohit Telugu - - - false - - - - - - - LKLUG - - - false - - - - diff --git a/30-aliases-fedora.conf b/30-aliases-fedora.conf deleted file mode 100644 index 776a777..0000000 --- a/30-aliases-fedora.conf +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - Helvetica - - Nimbus Sans L - Liberation Sans - Arial - Albany - Albany AMT - - - - - Times - - Nimbus Roman No9 L - Liberation Serif - Times New Roman - Thorndale - Thorndale AMT - - - - - Courier - - Nimbus Mono L - Liberation Mono - Courier New - Cumberland - Cumberland AMT - - - - - - - - Arial - - Liberation Sans - Albany - Albany AMT - Helvetica - Nimbus Sans L - - - - - Times New Roman - - Liberation Serif - Thorndale - Thorndale AMT - Times - Nimbus Roman No9 L - - - - - Courier New - - Liberation Mono - Cumberland - Cumberland AMT - Courier - Nimbus Mono L - - - - - - - Albany - - Liberation Sans - Arial - Albany AMT - Helvetica - Nimbus Sans L - - - - - Thorndale - - Liberation Serif - Times New Roman - Thorndale AMT - Times - Nimbus Roman No9 L - - - - - Cumberland - - Liberation Mono - Courier New - Cumberland AMT - Courier - Nimbus Mono L - - - - - - - Albany AMT - - Liberation Sans - Arial - Albany - Helvetica - Nimbus Sans L - - - - - Thorndale AMT - - Liberation Serif - Times New Roman - Thorndale - Times - Nimbus Roman No9 L - - - - - Cumberland AMT - - Liberation Mono - Courier New - Cumberland - Courier - Nimbus Mono L - - - - diff --git a/40-generic-fedora.conf b/40-generic-fedora.conf deleted file mode 100644 index c0e720b..0000000 --- a/40-generic-fedora.conf +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - Sazanami Mincho - AR PL ZenKai Uni - ZYSong18030 - serif - - - - Sazanami Gothic - AR PL ShanHeiSun Uni - ZYSong18030 - sans-serif - - - - Cumberland - ZYSong18030 - monospace - - diff --git a/64-nonlatin-fedora.conf b/64-nonlatin-fedora.conf deleted file mode 100644 index be29084..0000000 --- a/64-nonlatin-fedora.conf +++ /dev/null @@ -1,67 +0,0 @@ - - - - - serif - - KacstQura - Frank Ruehl CLM - Lohit Bengali - Lohit Gujarati - Lohit Hindi - Lohit Punjabi - Lohit Tamil - Lohit Malayalam - Lohit Kannada - Lohit Telugu - Lohit Oriya - LKLUG - Sazanami Mincho - AR PL Zenkai Uni - ZYSong18030 - - - - sans-serif - - KacstQura - Lohit Bengali - Lohit Gujarati - Lohit Hindi - Lohit Punjabi - Lohit Tamil - Lohit Malayalam - Lohit Kannada - Lohit Telugu - Lohit Oriya - LKLUG - Sazanami Gothic - AR PL ShanHeiSun Uni - AR PL SungtiL GB - AR PL Mingti2L Big5 - ZYSong18030 - Baekmuk Gulim - - - - monospace - - Lohit Bengali - Lohit Gujarati - Lohit Hindi - Lohit Punjabi - Lohit Tamil - Lohit Malayalam - Lohit Kannada - Lohit Telugu - Lohit Oriya - LKLUG - Sazanami Gothic - AR PL ShanHeiSun Uni - AR PL SungtiL GB - AR PL Mingti2L Big5 - ZYSong18030 - Baekmuk Gulim - - - diff --git a/75-blacklist-fedora.conf b/75-blacklist-fedora.conf deleted file mode 100644 index 996c17a..0000000 --- a/75-blacklist-fedora.conf +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - Hershey-Gothic-English - - - - - Hershey-Plain-Duplex-Italic - - - - - Hershey-Plain-Duplex - - - - - Hershey-Script-Simplex - - - - - Hershey-Plain-Triplex - - - - - Hershey-Plain-Triplex-Italic - - - - - Hershey-Script-Complex - - - - - Hershey-Gothic-Italian - - - - - Hershey-Gothic-German - - - - diff --git a/fontconfig.spec b/fontconfig.spec index 8a34f8b..ab4306a 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -2,18 +2,14 @@ Summary: Font configuration and customization library Name: fontconfig -Version: 2.4.91 +Version: 2.4.92 Release: 1%{?dist} License: MIT Group: System Environment/Libraries Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz URL: http://fontconfig.org BuildRoot: %{_tmppath}/%{name}-%{version}-root -Source1: 25-no-hint-fedora.conf -Source2: 30-aliases-fedora.conf -Source3: 40-generic-fedora.conf -Source4: 64-nonlatin-fedora.conf -Source5: 75-blacklist-fedora.conf +Source1: 25-no-bitmap-fedora.conf BuildRequires: gawk BuildRequires: expat-devel @@ -54,7 +50,7 @@ will use fontconfig. # We don't want to rebuild the docs, but we want to install the included ones. export HASDOCBOOK=no -%configure %--with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts +%configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts make make check @@ -65,10 +61,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d +ln -s ../conf.avail/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d # move installed doc files back to build directory to package themm # in the right place @@ -121,7 +114,7 @@ fi %config %{_sysconfdir}/fonts/fonts.conf %doc %{_sysconfdir}/fonts/conf.avail/README %config %{_sysconfdir}/fonts/conf.avail/*.conf -%config %{_sysconfdir}/fonts/conf.d/*.conf +%config(noreplace) %{_sysconfdir}/fonts/conf.d/*.conf %dir %{_localstatedir}/cache/fontconfig %{_mandir}/man1/* @@ -136,6 +129,17 @@ fi %{_mandir}/man3/* %changelog +* Thu Oct 25 2007 Behdad Esfahbod - 2.4.92-1 +- Update to 2.4.92. +- Mark /etc/fonts/conf.d/* as config(noreplace). +- Remove most of our conf file, all upstreamed except for + 75-blacklist-fedora.conf that I'm happily dropping. Who has + Hershey fonts these days... +- ln upstream'ed 25-unhint-nonlatin.conf from conf.avail in conf.d +- Add 25-no-bitmap-fedora.conf which is the tiny remaining bit + of conf that didn't end up upstream. Can get rid of it in the + future, but not just yet. + * Thu Oct 25 2007 Behdad Esfahbod - 2.4.91-1 - Update to 2.4.91. - Add /usr/local/share/fonts to default config. (#147004) diff --git a/sources b/sources index e671f97..989434b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -126f59b34499c70aaef2803f7fdd3ad3 fontconfig-2.4.91.tar.gz +92018e32c8b5d4b7edc2f8e9f8e15d08 fontconfig-2.4.92.tar.gz