From a6169b85fb0d72f0daf0351749e55d459254fc2699c9703a2aaa91926a096e9a Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Wed, 8 Aug 2012 07:12:55 +0000
Subject: [PATCH] - call spec-cleaner

OBS-URL: https://build.opensuse.org/package/show/M17N/fonts-config?expand=0&rev=26
---
 fonts-config.changes |  5 ++++
 fonts-config.spec    | 62 ++++++++++++++++++++++----------------------
 2 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/fonts-config.changes b/fonts-config.changes
index 6ac09f2..c70e8d8 100644
--- a/fonts-config.changes
+++ b/fonts-config.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug  8 07:12:28 UTC 2012 - pgajdos@suse.com
+
+- call spec-cleaner
+
 -------------------------------------------------------------------
 Mon Aug  6 15:51:33 UTC 2012 - pgajdos@suse.com
 
diff --git a/fonts-config.spec b/fonts-config.spec
index a337046..78a93ac 100644
--- a/fonts-config.spec
+++ b/fonts-config.spec
@@ -17,14 +17,6 @@
 
 
 Name:           fonts-config
-Provides:       xf86tools:/usr/sbin/fonts-config
-BuildRequires:  fontconfig
-BuildRequires:  fontpackages-devel
-Requires:       fontconfig >= 2.3.93.20060103
-Requires:       perl(English)
-%reconfigure_fonts_prereq
-Recommends:     ft2demos
-PreReq:         %fillup_prereq
 Version:        20080121
 Release:        0
 Summary:        Configures Fonts for X Windows and other applications
@@ -38,8 +30,16 @@ Source5:        fontconfig.SuSE.properties.template
 Source6:        suse-hinting.conf.template
 Source7:        suse-bitmaps.conf.template
 Source8:        suse-font-dirs.conf.template
-BuildArch:      noarch
+BuildRequires:  fontconfig
+BuildRequires:  fontpackages-devel
+Requires(pre):  %fillup_prereq
+Requires:       fontconfig >= 2.3.93.20060103
+Requires:       perl(English)
+Recommends:     ft2demos
+Provides:       xf86tools:/usr/sbin/fonts-config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
+%reconfigure_fonts_prereq
 
 %description
 Configures Fonts for X Windows and other applications.
@@ -54,29 +54,29 @@ debugging it.
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT/sbin/conf.d
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-mkdir -p $RPM_BUILD_ROOT/usr/share/fonts-config
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
-install -m 755 $RPM_SOURCE_DIR/SuSEconfig.fonts $RPM_BUILD_ROOT/sbin/conf.d
-install -m 755 $RPM_SOURCE_DIR/fonts-config $RPM_BUILD_ROOT/usr/sbin
-install -m 644 $RPM_SOURCE_DIR/*.template $RPM_BUILD_ROOT/usr/share/fonts-config
+mkdir -p %{buildroot}/sbin/conf.d
+mkdir -p %{buildroot}%{_prefix}/sbin
+mkdir -p %{buildroot}%{_datadir}/fonts-config
+mkdir -p %{buildroot}/%{_mandir}/man1
+mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -m 755 $RPM_SOURCE_DIR/SuSEconfig.fonts %{buildroot}/sbin/conf.d
+install -m 755 $RPM_SOURCE_DIR/fonts-config %{buildroot}%{_prefix}/sbin
+install -m 644 $RPM_SOURCE_DIR/*.template %{buildroot}%{_datadir}/fonts-config
 pod2man --section 1 --center=" " $RPM_SOURCE_DIR/fonts-config > \
-  $RPM_BUILD_ROOT/%{_mandir}/man1/fonts-config.1
+  %{buildroot}/%{_mandir}/man1/fonts-config.1
 install -m 644 $RPM_SOURCE_DIR/sysconfig.fonts-config \
-  $RPM_BUILD_ROOT/var/adm/fillup-templates/
+  %{buildroot}%{_localstatedir}/adm/fillup-templates/
 #
-mkdir -p $RPM_BUILD_ROOT%{_fontsconfddir}
-mkdir -p $RPM_BUILD_ROOT%{_fontsconfavaildir}
-sed -e's/_BYTECODE_BW_MAX_PIXEL_/0/' %{S:6} \
-  > $RPM_BUILD_ROOT%{_fontsconfavaildir}/12-suse-hinting-bc.conf
-sed -e's/_USE_EMBEDDED_BITMAPS_PLACEHOLDER_//' %{S:7} \
-  > $RPM_BUILD_ROOT%{_fontsconfavaildir}/17-suse-bitmaps.conf
+mkdir -p %{buildroot}%{_fontsconfddir}
+mkdir -p %{buildroot}%{_fontsconfavaildir}
+sed -e's/_BYTECODE_BW_MAX_PIXEL_/0/' %{SOURCE6} \
+  > %{buildroot}%{_fontsconfavaildir}/12-suse-hinting-bc.conf
+sed -e's/_USE_EMBEDDED_BITMAPS_PLACEHOLDER_//' %{SOURCE7} \
+  > %{buildroot}%{_fontsconfavaildir}/17-suse-bitmaps.conf
 ln -s ../conf.avail/12-suse-hinting-bc.conf \
-    $RPM_BUILD_ROOT%{_fontsconfddir}/12-suse-hinting-bc.conf
+    %{buildroot}%{_fontsconfddir}/12-suse-hinting-bc.conf
 ln -s ../conf.avail/17-suse-bitmaps.conf \
-    $RPM_BUILD_ROOT%{_fontsconfddir}/17-suse-bitmaps.conf 
+    %{buildroot}%{_fontsconfddir}/17-suse-bitmaps.conf
 
 %post
 %{fillup_only -n fonts-config}
@@ -85,12 +85,12 @@ exit 0
 
 %files
 %defattr(-,root,root)
-/usr/sbin/fonts-config
-%dir /usr/share/fonts-config/
-/usr/share/fonts-config/*
+%{_sbindir}/fonts-config
+%dir %{_datadir}/fonts-config/
+%{_datadir}/fonts-config/*
 /sbin/conf.d/SuSEconfig.fonts
 %{_mandir}/man1/fonts-config.1.gz
-/var/adm/fillup-templates/sysconfig.fonts-config
+%{_localstatedir}/adm/fillup-templates/sysconfig.fonts-config
 %{_fontsconfavaildir}/*
 %{_fontsconfddir}/*