- updated to 2.2.93

- removed obsolete freetype-includes and evil+obsolete defaultconfig patch
- dropped -realpkg stuff, there is no alternative fontconfig packages now

Changed files:
    fontconfig.spec -> 1.41

diff --git a/fontconfig.spec b/fontconfig.spec
index 6d879a0fd03bb590f342df73ff1b0aafdce2e50b..0b8e80ecca419c91f7efc5f3c69adee2360ee123 100644 (file)
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -2,19 +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.92
-Release:       4
+Version:       2.2.93
+Release:       1
 Epoch:         1
 License:       MIT
 Group:         Libraries
 # Source0:     http://fontconfig.org/release/%{name}-%{version}.tar.gz
 Source0:       http://pdx.freedesktop.org/~fontconfig/release/%{name}-%{version}.tar.gz
-# Source0-md5: 45c4f2bac99b74fea693eda28fe30c45
+# Source0-md5: 82bafe9691095ec9348449b785bd0744
 Patch0:                %{name}-blacklist.patch
 Patch1:                %{name}-date.patch
-Patch2:                %{name}-defaultconfig.patch
-Patch3:                %{name}-freetype-includes.patch
-Patch4:                %{name}-autohint.patch
+Patch2:                %{name}-autohint.patch
 URL:           http://fontconfig.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -22,11 +20,10 @@ BuildRequires:      docbook-utils >= 0.6.13-3
 BuildRequires: docbook-dtd41-sgml
 BuildRequires: ed
 BuildRequires: expat-devel
-BuildRequires: freetype-devel >= 2.1.4
+BuildRequires: freetype-devel >= 2.1.5
 BuildRequires: libtool
 Requires(post):        /sbin/ldconfig
-Requires:      freetype >= 2.1.4
-Provides:      %{name}-realpkg = %{epoch}:%{version}-%{release}
+Requires:      freetype >= 2.1.5
 Provides:      XFree86-fontconfig
 Obsoletes:     XFree86-fontconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -48,10 +45,9 @@ 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
 Group:         Development/Libraries
-Requires:      %{name}-realpkg = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      expat-devel
-Requires:      freetype-devel >= 2.1.4
-Provides:      %{name}-devel-realpkg = %{epoch}:%{version}-%{release}
+Requires:      freetype-devel >= 2.1.5
 Provides:      XFree86-fontconfig-devel
 Obsoletes:     XFree86-fontconfig-devel
 
@@ -77,7 +73,7 @@ a fontes.
 Summary:       Static font configuration and customization library
 Summary(pl):   Statyczna biblioteka do konfigurowania fontów
 Group:         Development/Libraries
-Requires:      %{name}-devel-realpkg = %{epoch}:%{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Provides:      XFree86-fontconfig-static
 Obsoletes:     XFree86-fontconfig-static
 
@@ -92,8 +88,6 @@ Ten pakiet zawiera statyczn
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -120,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-HOME=/root %{_bindir}/fc-cache -f 2> /dev/null
+HOME=/root %{_bindir}/fc-cache -f 2>/dev/null
 
 %postun -p /sbin/ldconfig