- Remove duplicate manpages.

- Patch to delete logfile left when building (unused) manpages.

diff --git a/.hgignore b/.hgignore
index 71e08bf..c743b5b 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,7 @@
 syntax: glob
 *~
 binutils/binutils-2.18.50-20080109-2-src.tar.gz
+fontconfig/fontconfig-2.6.0.tar.gz
 freetype/freetype-2.3.7.tar.bz2
 gcc/gcc-core-4.3.2.tar.bz2
 gcc/gcc-g++-4.3.2.tar.bz2

diff --git a/fontconfig/mingw-fontconfig-2.6.0-remove-logfile.patch b/fontconfig/mingw-fontconfig-2.6.0-remove-logfile.patch
new file mode 100644 (file)
index 0000000..2b784c9
--- /dev/null
+++ b/fontconfig/mingw-fontconfig-2.6.0-remove-logfile.patch
@@ -0,0 +1,11 @@
+--- fontconfig-2.6.0.orig/doc/Makefile.am      2007-11-06 00:05:37.000000000 +0000
++++ fontconfig-2.6.0/doc/Makefile.am   2008-09-21 13:50:38.000000000 +0100
+@@ -121,7 +121,7 @@
+       $(DOC2MAN) -o devel-man local-fontconfig-devel.sgml && \
+       mv devel-man/manpage.refs func.refs && \
+       mv devel-man/*.3 . && \
+-      $(RM) devel-man/manpage.links && \
++      $(RM) devel-man/manpage.links devel-man/manpage.log && \
+       rmdir devel-man
+ 
+ local-fontconfig-devel.sgml: fontconfig-devel.sgml

diff --git a/fontconfig/mingw-fontconfig.spec b/fontconfig/mingw-fontconfig.spec
index 350c458..dc4d268 100644 (file)
--- a/fontconfig/mingw-fontconfig.spec
+++ b/fontconfig/mingw-fontconfig.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw-fontconfig
 Version:        2.6.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows Fontconfig library
 
 License:        MIT
@@ -15,6 +15,8 @@ Source0:        http://fontconfig.org/release/fontconfig-%{version}.tar.gz
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         mingw-fontconfig-2.6.0-remove-logfile.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw-filesystem >= 23
@@ -23,6 +25,8 @@ BuildRequires:  mingw-binutils
 BuildRequires:  mingw-freetype
 BuildRequires:  mingw-libxml2
 BuildRequires:  pkgconfig
+BuildRequires:  docbook-utils
+
 
 %description
 MinGW Windows Fontconfig library.
@@ -30,6 +34,9 @@ MinGW Windows Fontconfig library.
 
 %prep
 %setup -q -n fontconfig-%{version}
+%patch0 -p1
+autoreconf
+
 
 %build
 PATH="%{_mingw_bindir}:$PATH" \
@@ -47,6 +54,10 @@ rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
 # Remove static library.
 rm $RPM_BUILD_ROOT%{_mingw_libdir}/libfontconfig.a
 
+# Remove duplicate manpages.
+rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -64,15 +75,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_libdir}/pkgconfig/fontconfig.pc
 %{_mingw_includedir}/fontconfig/
 %{_mingw_sysconfdir}/fonts/
-%{_mingw_mandir}/man1/fc-cache.1*
-%{_mingw_mandir}/man1/fc-cat.1*
-%{_mingw_mandir}/man1/fc-list.1*
-%{_mingw_mandir}/man1/fc-match.1*
-%{_mingw_mandir}/man3/Fc*.3*
-%{_mingw_mandir}/man5/fonts-conf.5*
 %{_mingw_datadir}/doc/fontconfig
 
 %changelog
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.0-4
+- Remove duplicate manpages.
+- Patch to delete logfile left when building (unused) manpages.
+
 * Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 2.6.0-3
 - Add mingw_bindir to $PATH for freetype-config script