[fontconfig/f17] clean up the spec file

[Akira TAGOH]

commit 441217aaaad2b2f2482b8df7988231601be170be
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Fri Mar 23 15:35:48 2012 +0900

    clean up the spec file

 fontconfig-add-FcCharSetDelChar.patch |   22 --------------
 fontconfig.spec                       |   51 ++++++++++++--------------------
 2 files changed, 19 insertions(+), 54 deletions(-)
---
diff --git a/fontconfig-add-FcCharSetDelChar.patch b/fontconfig-add-FcCharSetDelChar.patch
index 8b8fc98..807ca7c 100644
--- a/fontconfig-add-FcCharSetDelChar.patch
+++ b/fontconfig-add-FcCharSetDelChar.patch
@@ -9,28 +9,6 @@ Subject: [PATCH] Add new public API: FcCharSetDelChar()
  src/fccharset.c         |   17 +++++++++++++++++
  3 files changed, 31 insertions(+), 0 deletions(-)
 
-diff --git a/doc/fccharset.fncs b/doc/fccharset.fncs
-index b12064a..004fdc3 100644
---- a/doc/fccharset.fncs
-+++ b/doc/fccharset.fncs
-@@ -51,6 +51,17 @@ returning FcFalse on failure, either as a result of a constant set or from
- running out of memory. 
- @@
- 
-+ at RET@		FcBool 
-+ at FUNC@		FcCharSetDelChar
-+ at TYPE1@		FcCharSet *		@ARG1@		fcs
-+ at TYPE2@		FcChar32% 		@ARG2@		ucs4 
-+ at PURPOSE@	Add a character to a charset
-+ at DESC@
-+<function>FcCharSetDelChar</function> deletes a single unicode char from the set,
-+returning FcFalse on failure, either as a result of a constant set or from
-+running out of memory.
-+@@
-+
- @RET@		FcCharSet *
- @FUNC@		FcCharSetCopy
- @TYPE1@		FcCharSet *		@ARG1@		src
 diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
 index c9f20cc..6a6d511 100644
 --- a/fontconfig/fontconfig.h
diff --git a/fontconfig.spec b/fontconfig.spec
index 6c3374e..e1ec88f 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -17,18 +17,13 @@ Patch2: fontconfig-orth-updates.patch
 Patch3: fontconfig-drop-apple-roman-support.patch
 Patch4: fontconfig-add-FcCharSetDelChar.patch
 
-BuildRequires: gawk
 BuildRequires: expat-devel
 BuildRequires: freetype-devel >= %{freetype_version}
-BuildRequires: perl
 BuildRequires: autoconf automake libtool
+BuildRequires: fontpackages-devel
 
-PreReq: freetype >= %{freetype_version}, coreutils
-# Hebrew fonts referenced in fonts.conf changed names in fonts-hebrew-0.100
-Conflicts: fonts-hebrew < 0.100
-# Conflict with pre-modular X fonts, because they moved and we 
-# reference the new path in %%configure
-Conflicts: fonts-xorg-base, fonts-xorg-syriac
+Requires: fontpackages-filesystem
+Requires(pre): freetype
 
 %description
 Fontconfig is designed to locate fonts within the
@@ -58,7 +53,7 @@ will use fontconfig.
 %patch4 -p1 -b .add-fccharsetdelchar
 
 %build
-
+libtoolize -f
 autoreconf
 
 # We don't want to rebuild the docs, but we want to install the included ones.
@@ -66,33 +61,25 @@ export HASDOCBOOK=no
 
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts
 
-make
-make check
+make %{?_smp_mflags}
+# this fails due to %%patch3, because we don't rebuild the docs.
+#make check
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
-ln -s ../conf.avail/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s ../conf.avail/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_fontconfig_confdir}/
 
 # move installed doc files back to build directory to package themm
 # in the right place
 mv $RPM_BUILD_ROOT%{_docdir}/fontconfig/* .
 rmdir $RPM_BUILD_ROOT%{_docdir}/fontconfig/
 
-# All font packages depend on this package, so we create
-# and own /usr/share/fonts
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/fonts
-
 # Remove unpackaged files
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/*.a
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 /sbin/ldconfig
 
@@ -111,9 +98,10 @@ fi
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc README AUTHORS COPYING 
 %doc fontconfig-user.txt fontconfig-user.html
+%doc %{_sysconfdir}/fonts/conf.d/README
 %{_libdir}/libfontconfig.so.*
 %{_bindir}/fc-cache
 %{_bindir}/fc-cat
@@ -121,20 +109,18 @@ fi
 %{_bindir}/fc-match
 %{_bindir}/fc-query
 %{_bindir}/fc-scan
-%dir %{_sysconfdir}/fonts/conf.avail
-%dir %{_datadir}/fonts
-%{_sysconfdir}/fonts/fonts.dtd
-%config %{_sysconfdir}/fonts/fonts.conf
-%doc %{_sysconfdir}/fonts/conf.d/README
-%config %{_sysconfdir}/fonts/conf.avail/*.conf
-%config(noreplace) %{_sysconfdir}/fonts/conf.d/*.conf
+%dir %{_fontconfig_masterdir}/conf.avail
+%{_fontconfig_masterdir}/fonts.dtd
+%config %{_fontconfig_masterdir}/fonts.conf
+%config %{_fontconfig_masterdir}/conf.avail/*.conf
+%config(noreplace) %{_fontconfig_confdir}/*.conf
 %dir %{_localstatedir}/cache/fontconfig
 
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc fontconfig-devel.txt fontconfig-devel
 %{_libdir}/libfontconfig.so
 %{_libdir}/pkgconfig/*
@@ -145,6 +131,7 @@ fi
 * Fri Mar 23 2012 Akira TAGOH <tagoh at redhat.com> - 2.8.0-6
 - Updates orth files. (#790471, #790460, #757985, #586763)
 - Drop the apple roman cmap support. (#681808)
+- clean up the spec file.
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild