- new patches (blacklist, process only valid dirs)

[packages/fontconfig.git] / fontconfig.spec

diff --git a/fontconfig.spec b/fontconfig.spec
index 2ff44ba221f7f8a98c099ed019bb4630753ab656..dfd57c6b01cd5929c71b076a641fbcae295e53da 100644 (file)
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -5,23 +5,26 @@
 Summary:       Font configuration and customization library
 Summary(pl):   Biblioteka do konfigurowania fontów
 Name:          fontconfig
-Version:       2.0
-Release:       1
+Version:       1.0.1
+Release:       4
+Epoch:         1
 License:       MIT
-Group:         X11/Libraries
-Source0:       http://keithp.com/fonts/pub/%{fcname}.%{fcversion}.tar.gz
-URL:           http://keithp.com/fonts
+Group:         Libraries
+Source0:       http://fontconfig.org/release/%{fcname}.%{fcversion}.tar.gz
+Patch0:                %{name}-date.patch
+Patch1:                %{name}-blacklist.patch
+Patch2:                %{name}-defaultconfig.patch
+Patch3:                %{name}-fontdir.patch
+Patch4:                %{name}-subdir.patch
+URL:           http://fontconfig.org/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: freetype-devel
-BuildRequires: expat-devel
 BuildRequires: ed
+BuildRequires: expat-devel
+BuildRequires: freetype-devel
+BuildRequires: libtool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _prefix         /usr/X11R6
-%define                _mandir         %{_prefix}/man
-
 %description
 Fontconfig is designed to locate fonts within the system and select
 them according to requirements specified by applications.
@@ -33,7 +36,7 @@ systemie i wybierania ich w zale
 %package devel
 Summary:       Font configuration and customization library
 Summary(pl):   Biblioteka do konfigurowania fontów
-Group:         X11/Development/Libraries
+Group:         Development/Libraries
 Requires:      %{name} = %{version}
 Requires:      freetype-devel
 
@@ -52,17 +55,25 @@ Ten pakiet zawiera pliki nag
 programów korzystaj±cych z biblioteki fontconfig.
 
 %prep
-%setup -q -n %{fcname}.%{fcversion}/%{name}
+%setup -q -n %{fcname}.%{fcversion}
+%patch0 -p1
+cd %{name}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
+cd %{name}
 %{__autoconf}
 %configure
-%{__make}
+%{__make} CC=%{__cc}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 
+cd %{name}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -72,26 +83,23 @@ install fc-list/fc-list.man $RPM_BUILD_ROOT%{_mandir}/man1/fc-list.3
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
-
+%doc %{name}/{AUTHORS,README}
 %dir %{_sysconfdir}/fonts
-%config %{_sysconfdir}/fonts/fonts.conf
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/fonts/fonts.conf
 %{_sysconfdir}/fonts/fonts.dtd
-
 %attr(755,root,root) %{_bindir}/fc-*
-
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-
 %{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
+%doc %{name}/ChangeLog
 %attr(755,root,root) %{_bindir}/fontconfig-config
 %{_includedir}/fontconfig
+%{_libdir}/lib*.so
 %{_pkgconfigdir}/fontconfig.pc