From d10558376499ff656240c534c3b9edebf2b8b536 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Sun, 9 Nov 2014 11:35:38 +0100
Subject: [PATCH] Rework build/install

---
 xorg-x11-fonts.spec | 65 ++++++++++++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 21 deletions(-)

diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec
index 31edf28..ed23dfd 100644
--- a/xorg-x11-fonts.spec
+++ b/xorg-x11-fonts.spec
@@ -22,7 +22,7 @@
 Summary:	X.Org X11 fonts
 Name:		xorg-x11-fonts
 Version:	7.5
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	MIT and Lucida and Public Domain
 URL:		http://www.x.org
 
@@ -240,29 +240,47 @@ popd
 
 #--------------------------------------------------------------------------
 %build
-pushd encodings-*
-autoreconf -vif
-%configure --with-fontrootdir=%{_x11fontdir}
-make
-popd
-
-for dir in font-*; do
-    pushd $dir
-    # FIXME: do any fonts actually support the ISO8559 configure flags?
-    autoreconf -vif
-    %configure --with-fontrootdir=%{_x11fontdir} \
-	--disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-6 \
-	--disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 \
-	--disable-iso8859-13 --disable-iso8859-16
-    make
-    popd
-done
+# Build all apps
+{
+    for app in * ; do
+        pushd $app
+            autoreconf -vif
+            case $app in
+                font-adobe-100dpi-*|font-adobe-75dpi-*|font-adobe-utopia-100dpi-*|font-adobe-utopia-75dpi-*|font-bh-*)
+                    %configure --with-fontrootdir=%{_x11fontdir} \
+                        --disable-iso8859-3 \
+                        --disable-iso8859-4 \
+                        --disable-iso8859-10 \
+                        --disable-iso8859-13
+                    ;;
+                font-misc-misc-*|font-schumacher-misc-*)
+                    %configure --with-fontrootdir=%{_x11fontdir} \
+                        --disable-iso8859-3 \
+                        --disable-iso8859-4 \
+                        --disable-iso8859-10 \
+                        --disable-iso8859-11 \
+                        --disable-iso8859-13 \
+                        --disable-iso8859-16
+                    ;;
+                *)
+                    %configure --with-fontrootdir=%{_x11fontdir}
+                    ;;
+            esac
+            make %{?_smp_mflags}
+        popd
+    done
+}
 
 #--------------------------------------------------------------------------
 %install
-for dir in *; do
-    make -C $dir install DESTDIR=$RPM_BUILD_ROOT
-done
+# Install all apps
+{
+    for app in * ; do
+        pushd $app
+            %make_install
+        popd
+    done
+}
 
 # Install catalogue symlinks
 mkdir -p $RPM_BUILD_ROOT%{_catalogue}
@@ -955,6 +973,11 @@ mkfontdir %{_x11fontdir}/cyrillic
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
 
 %changelog
+* Sun Nov 09 2014 Simone Caronni <negativo17@gmail.com> - 7.5-12
+- Clean up SPEC file.
+- Rework build/install section to be like other xorg packages.
+- Remove all obsolete provides/obsoletes/conflicts.
+
 * Thu Oct 23 2014 Hans de Goede <hdegoede@redhat.com> - 7.5-11
 - Update most fonts:
    -encodings-1.0.4