diff --git a/.cvsignore b/.cvsignore
index 4cacd3f..f7fd468 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fontconfig-2.3.97.tar.gz
+fontconfig-2.4.0.tar.gz
diff --git a/25-no-hint-fedora.conf b/25-no-hint-fedora.conf
new file mode 100644
index 0000000..9c71eb0
--- /dev/null
+++ b/25-no-hint-fedora.conf
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+
+
+
+ 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
new file mode 100644
index 0000000..6e6d81c
--- /dev/null
+++ b/30-aliases-fedora.conf
@@ -0,0 +1,44 @@
+
+
+
+
+
+ Courier
+
+ Courier New
+
+
+
+ Helvetica
+
+ Arial
+
+
+
+ Times
+
+ Times New Roman
+
+
+
+ Thorndale
+
+ Thorndale AMT
+ Times New Roman
+
+
+
+ Albany
+
+ Albany AMT
+ Arial
+
+
+
+ Cumberland
+
+ Cumberland AMT
+ Courier New
+
+
+
diff --git a/40-generic-fedora.conf b/40-generic-fedora.conf
new file mode 100644
index 0000000..c0e720b
--- /dev/null
+++ b/40-generic-fedora.conf
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+ 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
new file mode 100644
index 0000000..be29084
--- /dev/null
+++ b/64-nonlatin-fedora.conf
@@ -0,0 +1,67 @@
+
+
+
+
+ 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
new file mode 100644
index 0000000..996c17a
--- /dev/null
+++ b/75-blacklist-fedora.conf
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+ 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 f908b19..b421aa7 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -2,19 +2,21 @@
Summary: Font configuration and customization library
Name: fontconfig
-Version: 2.3.97
-Release: 3%{?dist}
+Version: 2.4.0
+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: 40-blacklist-fonts.conf
-Source2: 50-no-hint-fonts.conf
+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
-Patch1: fontconfig-2.3.97-defaultconfig.patch
+# ppc64 architecture signature
Patch2: fontconfig-2.3.97-ppc64.patch
-Patch3: fontconfig-2.4-cmap-parsing.patch
BuildRequires: freetype-devel >= %{freetype_version}
BuildRequires: expat-devel
@@ -50,9 +52,7 @@ will use fontconfig.
%prep
%setup -q
-%patch1 -p1 -b .defaultconfig
%patch2 -p1 -b .ppc64
-%patch3 -p1 -b .cmap-parsing
%build
%configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
@@ -74,6 +74,9 @@ 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
# move installed doc files back to build directory to package themm
# in the right place
@@ -97,14 +100,16 @@ rm -rf $RPM_BUILD_ROOT
umask 0022
mkdir -p %{_localstatedir}/cache/fontconfig
+# Remove stale caches
+rm -f %{_localstatedir}/cache/fontconfig/????????????????????????????????.cache-2
+rm -f %{_localstatedir}/cache/fontconfig/stamp
# Force regeneration of all fontconfig cache files
# The check for existance is needed on dual-arch installs (the second
# copy of fontconfig might install the binary instead of the first)
-# The redirect is because fc-cache is giving warnings about ~/fonts.cache-1
# The HOME setting is to avoid problems if HOME hasn't been reset
if [ -x /usr/bin/fc-cache ] ; then
- HOME=/root /usr/bin/fc-cache -f 2>/dev/null
+ HOME=/root /usr/bin/fc-cache -f
fi
%postun -p /sbin/ldconfig
@@ -119,10 +124,13 @@ fi
%{_bindir}/fc-match
%{_bindir}/fc-cat
%dir %{_sysconfdir}/fonts
+%dir %{_sysconfdir}/fonts/conf.avail
%dir %{_sysconfdir}/fonts/conf.d
%dir %{_datadir}/fonts
%{_sysconfdir}/fonts/fonts.dtd
%config %{_sysconfdir}/fonts/fonts.conf
+%doc %{_sysconfdir}/fonts/conf.avail/README
+%config %{_sysconfdir}/fonts/conf.avail/*.conf
%config %{_sysconfdir}/fonts/conf.d/*.conf
%dir %{_localstatedir}/cache/fontconfig
@@ -138,6 +146,11 @@ fi
%{_mandir}/man3/*
%changelog
+* Mon Sep 11 2006 Behdad Esfahbod - 2.4.0-1
+- Update to 2.4.0
+- Rename/order our configuration stuff to match the new scheme.
+ Breaks expected :-(
+
* Thu Sep 07 2006 Behdad Esfahbod - 2.3.97-3
- Add missing file. Previous update didn't go through
diff --git a/sources b/sources
index ee307ff..ae26b84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7c7a1866341d73455271ad14d8db54e fontconfig-2.3.97.tar.gz
+f87eb0e6596510bbf87e57b33a657ec5 fontconfig-2.4.0.tar.gz