X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fontconfig.spec;h=9d570aa97201dbdda4aa816eead3165738a26d79;hb=2084b6d9b55b589991442893c3c093b179ca0b39;hp=fc7bbcfe42711d1b0031b97121fb3404100fc9a7;hpb=07959cfe30a63a563cbe8c6d2a0320100d96f550;p=packages%2Ffontconfig.git

diff --git a/fontconfig.spec b/fontconfig.spec
index fc7bbcf..9d570aa 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -2,23 +2,19 @@
 # Conditional build
 %bcond_with	bytecode	# use bytecode hinting instead of autohinting by default
 #
-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
+Summary:	Font configuration and customization tools
+Summary(pl):	Narzêdzia do konfigurowania fontów
 Name:		fontconfig
-Version:	2.2.94
-Release:	1
+Version:	2.2.98
+Release:	2
 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:	7f1bb467b6821cb9bf4bf8d235767c6f
+Source0:	http://fontconfig.org/release/%{name}-%{version}.tar.gz
+# Source0-md5:	f13af7e7dfa4e1d68aeb9dcc8d12045a
 Patch0:		%{name}-blacklist.patch
-Patch1:		%{name}-date.patch
-Patch2:		%{name}-autohint.patch
-Patch3:		%{name}-autohint2.patch
-Patch4:		%{name}-freetype.patch
+Patch1:		%{name}-autohint.patch
+Patch2:		%{name}-autohint2.patch
 URL:		http://fontconfig.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -26,32 +22,56 @@ BuildRequires:	docbook-utils >= 0.6.13-3
 BuildRequires:	docbook-dtd41-sgml
 BuildRequires:	ed
 BuildRequires:	expat-devel
-BuildRequires:	freetype-devel >= 2.1.8
+BuildRequires:	freetype-devel >= 2.1.5
 BuildRequires:	libtool
-Requires(post):	/sbin/ldconfig
+Requires	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	freetype >= 2.1.5
-Provides:	XFree86-fontconfig
-Obsoletes:	XFree86-fontconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Fontconfig is designed to locate fonts within the system and select
 them according to requirements specified by applications.
 
+This package contains tools and documentation.
+
 %description -l pl
-Fontconfig jest biblioteka przeznaczon± do lokalizowania fontów w
+Fontconfig jest bibliotek± przeznaczon± do lokalizowania fontów w
 systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji.
 
-%description -l pt_BR
+Paket ten zawiera programy narzêdziowe i dokumentacjê.
+
+#%description -l pt_BR
+#Fontconfig é uma biblioteca para configuração e customização do acesso
+#a fontes.
+
+%package libs
+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:	freetype >= 2.1.5
+Provides:       XFree86-fontconfig
+Conflicts:	fontconfig <= 1:2.2.98-1
+Obsoletes:      XFree86-fontconfig
+
+%description libs
+Fontconfig is designed to locate fonts within the system and select
+them according to requirements specified by applications.
+
+%description libs -l pl
+Fontconfig jest bibliotek± przeznaczon± do lokalizowania fontów w
+systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji.
+
+%description libs -l pt_BR
 Fontconfig é uma biblioteca para configuração e customização do acesso
 a fontes.
 
 %package devel
-Summary:	Font configuration and customization library
-Summary(pl):	Biblioteka do konfigurowania fontów
+Summary:	Font configuration and customization library - development files
+Summary(pl):	Biblioteka do konfigurowania fontów - pliki dla programistów
 Summary(pt_BR):	Fontconfig é uma biblioteca para configuração e customização do acesso a fontes
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	expat-devel
 Requires:	freetype-devel >= 2.1.5
 Provides:	XFree86-fontconfig-devel
@@ -65,7 +85,7 @@ This package contains the header files needed to develop programs that
 use these fontconfig.
 
 %description devel -l pl
-Fontconfig jest biblioteka przeznaczon± do lokalizowania fontów w
+Fontconfig jest bibliotek± przeznaczon± do lokalizowania fontów w
 systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji.
 
 Ten pakiet zawiera pliki nag³ówkowe potrzebne do kompilowania
@@ -92,13 +112,11 @@ Ten pakiet zawiera statyczn
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %if %{with bytecode}
-%patch2 -p1
+%patch1 -p1
 %else
-%patch3 -p1
+%patch2 -p1
 %endif
-%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -132,15 +150,18 @@ HOME=/root %{_bindir}/fc-cache -f 2>/dev/null
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog README
-%dir %{_sysconfdir}/fonts
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/fonts/fonts.conf
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/fonts/local.conf
-%{_sysconfdir}/fonts/fonts.dtd
 %attr(755,root,root) %{_bindir}/fc-*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
 %{_mandir}/man1/*.1*
 %{_mandir}/man5/*.5*
 
+%files libs
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/fonts
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fonts/fonts.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fonts/local.conf
+%{_sysconfdir}/fonts/fonts.dtd
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
+
 %files devel
 %defattr(644,root,root,755)
 %doc doc/fontconfig-devel/*.html