- updated to 2.2.92

Changed files:
    fontconfig-defaultconfig.patch -> 1.7
    fontconfig.spec -> 1.33

diff --git a/fontconfig-defaultconfig.patch b/fontconfig-defaultconfig.patch
index f25edd8db17915bc0a98682c219e2101cfb8d33c..3ac2dbb849eb333c6e97415e6c2095b1bbc95323 100644 (file)
--- a/fontconfig-defaultconfig.patch
+++ b/fontconfig-defaultconfig.patch
@@ -1,5 +1,6 @@
---- fontconfig-2.2.90/fonts.conf.in.orig       2003-05-31 22:58:41.000000000 +0200
-+++ fontconfig-2.2.90/fonts.conf.in    2003-07-23 01:38:26.000000000 +0200
+diff -urN fontconfig-2.2.92.org/fonts.conf.in fontconfig-2.2.92/fonts.conf.in
+--- fontconfig-2.2.92.org/fonts.conf.in        2003-11-07 00:08:18.000000000 +0100
++++ fontconfig-2.2.92/fonts.conf.in    2003-11-07 00:15:55.000000000 +0100
 @@ -27,6 +27,13 @@
        @FC_FONTPATH@
        <dir>~/.fonts</dir>
@@ -14,7 +15,7 @@
  <!--
    Accept deprecated 'mono' alias, replacing it with 'monospace'
  -->
-@@ -233,44 +240,102 @@
+@@ -236,46 +243,104 @@
                <family>serif</family>
                <prefer>
                        <family>Bitstream Vera Serif</family>
@@ -44,8 +45,8 @@
 +                      <family>MS Song</family>
                        <family>AR PL SungtiL GB</family>
                        <family>AR PL Mingti2L Big5</family>
--                      <family>Baekmuk Batang</family>                 
-+                      <family>Baekmuk Batang</family>
+                       <family>Baekmuk Batang</family>
+                       <family>FreeSerif</family>
 +                      <family>TSCu_Times</family>
 +                      <family>Times New Roman</family>
 +                      <family>Times</family>
@@ -92,6 +93,7 @@
                        <family>AR PL KaitiM Big5</family>
                        <family>Baekmuk Dotum</family>
                        <family>SimSun</family>
+                       <family>FreeSans</family>
 +                      <family>TSCu_Paranar</family>
 +                      <family>Arial Unicode</family>
 +                      <family>Code2000</family>
@@ -123,4 +125,4 @@
 +                      <family>TSC_AvarangalFxd</family>
                        <family>AR PL KaitiM GB</family>
                        <family>Baekmuk Dotum</family>
-               </prefer>
+                       <family>FreeMono</family>

diff --git a/fontconfig.spec b/fontconfig.spec
index de10dfbd73d6d766a2cef8772124d033ef2d407c..f78b273369f3c36206c2c53f09088c1149a81bf4 100644 (file)
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -2,17 +2,17 @@ Summary:      Font configuration and customization library
 Summary(pl):   Biblioteka do konfigurowania fontów
 Summary(pt_BR):        Fontconfig é uma biblioteca para configuração e customização do acesso a fontes
 Name:          fontconfig
-Version:       2.2.90
-Release:       3
+Version:       2.2.92
+Release:       1
 Epoch:         1
 License:       MIT
 Group:         Libraries
-Source0:       http://fontconfig.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: 5cb87476743be1bbf1674ed72a76ae6a
+# Source0:     http://fontconfig.org/release/%{name}-%{version}.tar.gz
+Source0:       http://pdx.freedesktop.org/~fontconfig/release/%{name}-%{version}.tar.gz
+# Source0-md5: 45c4f2bac99b74fea693eda28fe30c45
 Patch0:                %{name}-blacklist.patch
 Patch1:                %{name}-date.patch
 Patch2:                %{name}-defaultconfig.patch
-Patch3:                %{name}-make-jN.patch
 URL:           http://fontconfig.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -87,7 +87,6 @@ Ten pakiet zawiera statyczn
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -95,17 +94,19 @@ Ten pakiet zawiera statyczn
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure --disable-docs
+%configure \
+       --disable-docs
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install -d $RPM_BUILD_ROOT%{_mandir}/man{1,3,5}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_docdir}/%{name} installed-docs
+install doc/*.3 $RPM_BUILD_ROOT%{_mandir}/man3
+install doc/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -130,7 +131,7 @@ HOME=/root %{_bindir}/fc-cache -f 2> /dev/null
 
 %files devel
 %defattr(644,root,root,755)
-%doc installed-docs/fontconfig-devel/*.html
+%doc doc/fontconfig-devel/*.html
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_includedir}/fontconfig