X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fontconfig.spec;h=4c2843411199f77366aeeed383d6b1fea7ee132e;hb=36a8ce6e4ffb137ef20b5baae221ee957a685ef1;hp=6112cd988708aadfe5ed5616152ece53c960b4f5;hpb=addd7aad6ff1a2e52c1c1a0c57358ceab0a717bb;p=packages%2Ffontconfig.git

diff --git a/fontconfig.spec b/fontconfig.spec
index 6112cd9..4c28434 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -2,56 +2,76 @@
 # 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.96
+Version:	2.3.0
 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:	45041c2ce1b32bf71097fb6c835b0b84
+Source0:	http://fontconfig.org/release/%{name}-%{version}.tar.gz
+# Source0-md5:	a4dea0b513c5d4f88bbf0e78099dbaba
 Patch0:		%{name}-blacklist.patch
-Patch1:		%{name}-date.patch
-Patch2:		%{name}-autohint.patch
-Patch3:		%{name}-autohint2.patch
+Patch1:		%{name}-autohint.patch
+Patch2:		%{name}-autohint2.patch
 URL:		http://fontconfig.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-# --disable-docs is used
-#BuildRequires:	docbook-utils >= 0.6.13-3
-#BuildRequires:	docbook-dtd41-sgml
+BuildRequires:	docbook-utils >= 0.6.13-3
+BuildRequires:	docbook-dtd41-sgml
 BuildRequires:	ed
 BuildRequires:	expat-devel
 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.
+
+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 -l pt_BR
+%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,11 +112,10 @@ Ten pakiet zawiera statyczn
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %if %{with bytecode}
-%patch2 -p1
+%patch1 -p1
 %else
-%patch3 -p1
+%patch2 -p1
 %endif
 
 %build
@@ -119,27 +138,34 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man{1,3,5}
 install doc/*.3 $RPM_BUILD_ROOT%{_mandir}/man3
 install doc/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
 
+cp -f conf.d/README README.confd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
-HOME=/root %{_bindir}/fc-cache -f 2>/dev/null
+umask 022
+HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null
 
-%postun -p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %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
+%doc AUTHORS COPYING ChangeLog README README.confd
 %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
+%{_sysconfdir}/fonts/fonts.dtd
+%dir %{_sysconfdir}/fonts/conf.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fonts/conf.d/*.conf
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
+
 %files devel
 %defattr(644,root,root,755)
 %doc doc/fontconfig-devel/*.html