X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fontconfig.spec;h=3fc1b19fa1ead52391ca297edcd87800b0b8febd;hb=2cc361d33777e586992a52f5b59380bb910ab6f5;hp=59ab552437fbf9c82db44495d03b7f3ce3540616;hpb=4266a9fd93c4fbd00fd9db875d3955b41f04b07e;p=packages%2Ffontconfig.git

diff --git a/fontconfig.spec b/fontconfig.spec
index 59ab552..3fc1b19 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -1,27 +1,26 @@
 #
 # Conditional build
-%bcond_with	bytecode	# use bytecode hinting instead of autohinting by default
 %bcond_without	static_libs	# don't build static library
 #
 Summary:	Font configuration and customization tools
 Summary(pl.UTF-8):	Narzędzia do konfigurowania fontów
 Summary(pt_BR.UTF-8):	Ferramentas para configuração e customização do acesso a fontes
 Name:		fontconfig
-Version:	2.4.2
+Version:	2.7.0
 Release:	2
 Epoch:		1
 License:	MIT
 Group:		Libraries
 Source0:	http://fontconfig.org/release/%{name}-%{version}.tar.gz
-# Source0-md5:	f035852f521b54677f2b5c9e2f6d54a4
+# Source0-md5:	7a9b3f53a7cf431d0acac13aab7573f7
+Source1:	%{name}-lcd-filter.conf
 Patch0:		%{name}-blacklist.patch
-Patch1:		%{name}-autohint.patch
-Patch2:		%{name}-bitstream-cyberbit.patch
+Patch1:		%{name}-bitstream-cyberbit.patch
 URL:		http://fontconfig.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	docbook-utils >= 0.6.13-3
 BuildRequires:	docbook-dtd41-sgml
+BuildRequires:	docbook-utils >= 0.6.13-3
 BuildRequires:	ed
 BuildRequires:	expat-devel
 BuildRequires:	freetype-devel >= 2.1.5
@@ -56,8 +55,8 @@ Summary(pt_BR.UTF-8):	Biblioteca para configuração e customização do acesso
 Group:		Development/Libraries
 Requires:	freetype >= 2.1.5
 Provides:	XFree86-fontconfig
-Conflicts:	fontconfig <= 1:2.2.98-1
 Obsoletes:	XFree86-fontconfig
+Conflicts:	fontconfig <= 1:2.2.98-1
 
 %description libs
 Fontconfig is designed to locate fonts within the system and select
@@ -124,10 +123,7 @@ Este pacote contém a biblioteca estática do fontconfig
 %prep
 %setup -q
 %patch0 -p1
-%if %{with bytecode}
 %patch1 -p1
-%endif
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -136,7 +132,7 @@ Este pacote contém a biblioteca estática do fontconfig
 %{__autoheader}
 %{__automake}
 %configure \
-	--disable-docs \
+	--enable-docs \
 	%{!?with_static_libs:--disable-static}
 %{__make}
 
@@ -145,10 +141,11 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_mandir}/man{1,3,5},/var/cache/fontconfig}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-install doc/*.3 $RPM_BUILD_ROOT%{_mandir}/man3
-install doc/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
+	DESTDIR=$RPM_BUILD_ROOT \
+	htmldoc_DATA= \
+	doc_DATA=
+install %{SOURCE1} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/10-lcd-filter.conf
 
 cp -f conf.d/README README.confd
 
@@ -165,34 +162,40 @@ HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null || :
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog README README.confd
-%attr(755,root,root) %{_bindir}/fc-*
-%{_mandir}/man1/*.1*
-%{_mandir}/man5/*.5*
-/var/cache/fontconfig
-
-%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.avail
 %{_sysconfdir}/fonts/conf.avail/*.conf
-%{_sysconfdir}/fonts/conf.avail/README
 %dir %{_sysconfdir}/fonts/conf.d
+%{_sysconfdir}/fonts/conf.d/README
 %config(noreplace,missingok) %verify(not link md5 mtime size) %{_sysconfdir}/fonts/conf.d/*.conf
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_bindir}/fc-cache
+%attr(755,root,root) %{_bindir}/fc-cat
+%attr(755,root,root) %{_bindir}/fc-list
+%attr(755,root,root) %{_bindir}/fc-match
+%attr(755,root,root) %{_bindir}/fc-query
+%attr(755,root,root) %{_bindir}/fc-scan
+%{_mandir}/man1/fc-*.1*
+%{_mandir}/man5/fonts-conf.5*
+/var/cache/fontconfig
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libfontconfig.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfontconfig.so.1
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/fontconfig-devel/*.html
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libfontconfig.so
+%{_libdir}/libfontconfig.la
 %{_includedir}/fontconfig
 %{_pkgconfigdir}/fontconfig.pc
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/Fc*.3*
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libfontconfig.a
 %endif