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

diff --git a/fontconfig.spec b/fontconfig.spec
index df95aab..9d570aa 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -1,52 +1,79 @@
-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
+#
+# Conditional build
+%bcond_with	bytecode	# use bytecode hinting instead of autohinting by default
+#
+Summary:	Font configuration and customization tools
+Summary(pl):	Narzêdzia do konfigurowania fontów
 Name:		fontconfig
-Version:	2.2.90
-Release:	1
+Version:	2.2.98
+Release:	2
 Epoch:		1
 License:	MIT
 Group:		Libraries
 Source0:	http://fontconfig.org/release/%{name}-%{version}.tar.gz
-# Source0-md5:	5cb87476743be1bbf1674ed72a76ae6a
+# Source0-md5:	f13af7e7dfa4e1d68aeb9dcc8d12045a
 Patch0:		%{name}-blacklist.patch
-Patch1:		%{name}-date.patch
-Patch2:		%{name}-defaultconfig.patch
-Patch3:		%{name}-make-jN.patch
+Patch1:		%{name}-autohint.patch
+Patch2:		%{name}-autohint2.patch
 URL:		http://fontconfig.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	docbook-utils >= 0.6.13-3
+BuildRequires:	docbook-dtd41-sgml
 BuildRequires:	ed
 BuildRequires:	expat-devel
-BuildRequires:	freetype-devel
+BuildRequires:	freetype-devel >= 2.1.5
 BuildRequires:	libtool
-Requires(post):	/sbin/ldconfig
-Provides:	XFree86-fontconfig
-Provides:	%{name}-realpkg = %{epoch}:%{version}
+Requires	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	freetype >= 2.1.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes:	XFree86-fontconfig
 
 %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}-realpkg = %{epoch}:%{version}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	expat-devel
-Requires:	freetype-devel
-Provides:	%{name}-devel-realpkg = %{epoch}:%{version}
+Requires:	freetype-devel >= 2.1.5
 Provides:	XFree86-fontconfig-devel
 Obsoletes:	XFree86-fontconfig-devel
 
@@ -58,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
@@ -72,7 +99,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
 
@@ -83,11 +110,13 @@ This package contains static version of fontconfig library.
 Ten pakiet zawiera statyczn± wersjê biblioteki fontconfig.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
+%if %{with bytecode}
 %patch1 -p1
+%else
 %patch2 -p1
-%patch3 -p1
+%endif
 
 %build
 %{__libtoolize}
@@ -95,42 +124,47 @@ 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
 
 %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
 
 %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 installed-docs/fontconfig-devel/*.html
+%doc doc/fontconfig-devel/*.html
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_includedir}/fontconfig