- rel 3; fixes from git

[packages/fontconfig.git] / fontconfig.spec

diff --git a/fontconfig.spec b/fontconfig.spec
index 4c2843411199f77366aeeed383d6b1fea7ee132e..2dd35ad90ed728b90d48f280d42b581413fd4e00 100644 (file)
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -1,29 +1,35 @@
 #
 # Conditional build
 #
 # Conditional build

-%bcond_with    bytecode        # use bytecode hinting instead of autohinting by default
-#
+%bcond_without static_libs     # don't build static library
+%bcond_without doc
+

 Summary:       Font configuration and customization tools
 Summary:       Font configuration and customization tools

-Summary(pl):   Narzêdzia do konfigurowania fontów
+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
 Name:          fontconfig

-Version:       2.3.0
-Release:       1
+Version:       2.10.93
+Release:       3

 Epoch:         1
 License:       MIT
 Group:         Libraries
 Epoch:         1
 License:       MIT
 Group:         Libraries

-Source0:       http://fontconfig.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: a4dea0b513c5d4f88bbf0e78099dbaba
-Patch0:                %{name}-blacklist.patch
-Patch1:                %{name}-autohint.patch
-Patch2:                %{name}-autohint2.patch
+Source0:       http://fontconfig.org/release/%{name}-%{version}.tar.bz2
+# Source0-md5: 0f8e5c63c2d6931626185c02802375a3
+Source1:       %{name}-lcd-filter.conf
+Patch0:                %{name}-bitstream-cyberbit.patch
+Patch1:                %{name}-git.patch

 URL:           http://fontconfig.org/
 URL:           http://fontconfig.org/

-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: docbook-utils >= 0.6.13-3
+BuildRequires: autoconf >= 2.61
+BuildRequires: automake >= 1:1.11
+%if %{with doc}
+BuildRequires: docbook-dtd31-sgml

 BuildRequires: docbook-dtd41-sgml
 BuildRequires: docbook-dtd41-sgml

+BuildRequires: docbook-utils >= 0.6.13-3
+%endif

 BuildRequires: ed
 BuildRequires: expat-devel
 BuildRequires: freetype-devel >= 2.1.5
 BuildRequires: libtool
 BuildRequires: ed
 BuildRequires: expat-devel
 BuildRequires: freetype-devel >= 2.1.5
 BuildRequires: libtool

+BuildRequires: pkgconfig

 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      freetype >= 2.1.5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      freetype >= 2.1.5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)


@@ -34,42 +40,44 @@ them according to requirements specified by applications.
 
 This package contains tools and documentation.
 
 
 This package contains tools and documentation.
 

-%description -l pl
-Fontconfig jest bibliotek± przeznaczon± do lokalizowania fontów w
-systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji.
+%description -l pl.UTF-8
+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ę.

 
 

-Paket ten zawiera programy narzêdziowe i dokumentacjê.
+%description -l pt_BR.UTF-8
+Fontconfig é uma biblioteca para configuração e customização do acesso
+a fontes.

 
 

-#%description -l pt_BR
-#Fontconfig é uma biblioteca para configuração e customização do acesso
-#a fontes.
+Este pacote contém as ferramentas e documentação.

 
 %package libs
 Summary:       Font configuration and customization library
 
 %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
+Summary(pl.UTF-8):     Biblioteka do konfigurowania fontów
+Summary(pt_BR.UTF-8):  Biblioteca para configuração e customização do acesso a fontes
+Group:         Libraries

 Requires:      freetype >= 2.1.5
 Provides:      XFree86-fontconfig
 Requires:      freetype >= 2.1.5
 Provides:      XFree86-fontconfig

-Conflicts:     fontconfig <= 1:2.2.98-1

 Obsoletes:     XFree86-fontconfig
 Obsoletes:     XFree86-fontconfig

+Conflicts:     fontconfig <= 1:2.2.98-1

 
 %description libs
 Fontconfig is designed to locate fonts within the system and select
 them according to requirements specified by applications.
 
 
 %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 pl.UTF-8
+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
+%description libs -l pt_BR.UTF-8
+Fontconfig é uma biblioteca para configuração e customização do acesso

 a fontes.
 
 %package devel
 Summary:       Font configuration and customization library - development files
 a fontes.
 
 %package devel
 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
+Summary(pl.UTF-8):     Biblioteka do konfigurowania fontów - pliki dla programistów
+Summary(pt_BR.UTF-8):  Biblioteca para configuração e customização do acesso a fontes - arquivos de desenvolvimento

 Group:         Development/Libraries
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      expat-devel
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      expat-devel


@@ -84,20 +92,24 @@ them according to requirements specified by applications.
 This package contains the header files needed to develop programs that
 use these fontconfig.
 
 This package contains the header files needed to develop programs that
 use these fontconfig.
 

-%description devel -l pl
-Fontconfig jest bibliotek± przeznaczon± do lokalizowania fontów w
-systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji.
+%description devel -l pl.UTF-8
+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
-programów korzystaj±cych z biblioteki fontconfig.
+Ten pakiet zawiera pliki nagłówkowe potrzebne do kompilowania
+programów korzystających z biblioteki fontconfig.

 
 

-%description devel -l pt_BR
-Fontconfig é uma biblioteca para configuração e customização do acesso
+%description devel -l pt_BR.UTF-8
+Fontconfig é uma biblioteca para configuração e customização do acesso

 a fontes.
 
 a fontes.
 

+Este pacote contém arquivos de desenvolvimento necessários à criação
+de extensões baseadas na biblioteca fontconfig.
+

 %package static
 Summary:       Static font configuration and customization library
 %package static
 Summary:       Static font configuration and customization library

-Summary(pl):   Statyczna biblioteka do konfigurowania fontów
+Summary(pl.UTF-8):     Statyczna biblioteka do konfigurowania fontów
+Summary(pt_BR.UTF-8):  Biblioteca estática para configuração e customização do acesso a fontes

 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Provides:      XFree86-fontconfig-static
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Provides:      XFree86-fontconfig-static


@@ -106,75 +118,115 @@ Obsoletes:       XFree86-fontconfig-static
 %description static
 This package contains static version of fontconfig library.
 
 %description static
 This package contains static version of fontconfig library.
 

-%description static -l pl
-Ten pakiet zawiera statyczn± wersjê biblioteki fontconfig.
+%description static -l pl.UTF-8
+Ten pakiet zawiera statyczną wersję biblioteki fontconfig.
+
+%description static -l pt_BR.UTF-8
+Este pacote contém a biblioteca estática do fontconfig

 
 %prep
 %setup -q
 %patch0 -p1
 
 %prep
 %setup -q
 %patch0 -p1

-%if %{with bytecode}

 %patch1 -p1
 %patch1 -p1

-%else
-%patch2 -p1
-%endif

 
 %build
 %{__libtoolize}
 
 %build
 %{__libtoolize}

-%{__aclocal}
+%{__aclocal} -I m4

 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
 %{__autoheader}
 %{__automake}

+
+# don't rebuild docs by default, use prebuild ones
+export HASDOCBOOK=no
+

 %configure \
 %configure \

-       --disable-docs
+       --%{?with_doc:en}%{!?with_doc:dis}able-docs \
+       --disable-silent-rules \
+       %{!?with_static_libs:--disable-static}

 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT%{_mandir}/man{1,3,5}
+install -d $RPM_BUILD_ROOT{%{_mandir}/man{1,3,5},/var/cache/fontconfig} \

 
 %{__make} install \
 
 %{__make} install \

-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       htmldoc_DATA= \
+       doc_DATA=

 
 

-install doc/*.3 $RPM_BUILD_ROOT%{_mandir}/man3
-install doc/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
+install %{SOURCE1} \
+       $RPM_BUILD_ROOT%{_datadir}/%{name}/conf.avail/10-lcd-filter.conf

 
 

-cp -f conf.d/README README.confd
+ln -s %{_datadir}/%{name}/conf.avail $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail
+
+cp -pf conf.d/README README.confd

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

+%pretrans
+# this needs to be a symlink
+if [ -d %{_sysconfdir}/fonts/conf.avail ] && [ ! -L %{_sysconfdir}/fonts/conf.avail ]; then
+       mv -f %{_sysconfdir}/fonts/conf.avail{,.rpmsave}
+       install -d %{_datadir}/%{name}/conf.avail
+       ln -s %{_datadir}/%{name}/conf.avail %{_sysconfdir}/fonts/conf.avail
+       mv -f %{_sysconfdir}/fonts/conf.avail.rpmsave/*.conf %{_sysconfdir}/fonts/conf.avail/
+       rmdir %{_sysconfdir}/fonts/conf.avail.rpmsave 2>/dev/null || :
+fi
+

 %post
 umask 022
 %post
 umask 022

-HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null
+HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null || :

 
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
 %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*
-
-%files libs
-%defattr(644,root,root,755)
+%doc AUTHORS COPYING ChangeLog README README.confd doc/fontconfig-user.html

 %dir %{_sysconfdir}/fonts
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fonts/fonts.conf
 %dir %{_sysconfdir}/fonts
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fonts/fonts.conf

-%{_sysconfdir}/fonts/fonts.dtd
+%{_sysconfdir}/fonts/conf.avail
+%dir %{_datadir}/xml/%{name}
+%{_datadir}/xml/%{name}/fonts.dtd
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/conf.avail
+%{_datadir}/%{name}/conf.avail/*.conf

 %dir %{_sysconfdir}/fonts/conf.d
 %dir %{_sysconfdir}/fonts/conf.d

-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fonts/conf.d/*.conf
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%{_sysconfdir}/fonts/conf.d/README
+%config(noreplace,missingok) %verify(not link md5 mtime size) %{_sysconfdir}/fonts/conf.d/*.conf
+%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-pattern
+%attr(755,root,root) %{_bindir}/fc-scan
+%attr(755,root,root) %{_bindir}/fc-validate
+%if %{with doc}
+%{_mandir}/man1/fc-*.1*
+%{_mandir}/man5/fonts-conf.5*
+%endif
+%dir /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
 
 %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
 %{_includedir}/fontconfig
 %{_pkgconfigdir}/fontconfig.pc

-%{_mandir}/man3/*.3*
+%if %{with doc}
+%{_mandir}/man3/Fc*.3*
+%endif

 
 

+%if %{with static_libs}

 %files static
 %defattr(644,root,root,755)
 %files static
 %defattr(644,root,root,755)

-%{_libdir}/lib*.a
+%{_libdir}/libfontconfig.a
+%endif