[liberation-fonts] spec file clean up

[Pravin Satpute]

commit 64b0320a25928d7847350e31d618063fd60b3471
Author: प्रविण सातपुते <psatpute at redhat.com>
Date:   Thu Nov 22 15:04:55 2012 +0530

    spec file clean up

 ...eration-mono.conf => liberation-fonts-mono.conf |    0
 ...eration-sans.conf => liberation-fonts-sans.conf |    0
 ...ation-serif.conf => liberation-fonts-serif.conf |    0
 liberation-fonts.spec                              |   31 +++++++++++---------
 4 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/30-0-liberation-mono.conf b/liberation-fonts-mono.conf
similarity index 100%
rename from 30-0-liberation-mono.conf
rename to liberation-fonts-mono.conf
diff --git a/30-0-liberation-sans.conf b/liberation-fonts-sans.conf
similarity index 100%
rename from 30-0-liberation-sans.conf
rename to liberation-fonts-sans.conf
diff --git a/30-0-liberation-serif.conf b/liberation-fonts-serif.conf
similarity index 100%
rename from 30-0-liberation-serif.conf
rename to liberation-fonts-serif.conf
diff --git a/liberation-fonts.spec b/liberation-fonts.spec
index 39fef32..a1c1e96 100644
--- a/liberation-fonts.spec
+++ b/liberation-fonts.spec
@@ -1,7 +1,8 @@
+%global priority	30-0
 %global fontname liberation
-%global fontconf30 30-0-%{fontname}
+%global fontconf %{priority}-%{fontname}
 %global archivename %{name}-%{version}
-%define common_desc \
+%global common_desc \
 The Liberation Fonts are intended to be replacements for the three most \
 commonly used fonts on Microsoft systems: Times New Roman, Arial, and Courier \
 New.
@@ -11,14 +12,14 @@ New.
 Name:             %{fontname}-fonts
 Summary:          Fonts to replace commonly used Microsoft Windows fonts
 Version:          2.00.1
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          OFL
 Group:            User Interface/X
 URL:              http://fedorahosted.org/liberation-fonts/
 Source0:          https://fedorahosted.org/releases/l/i/liberation-fonts/%{archivename}.tar.gz
-Source2:          30-0-liberation-mono.conf
-Source3:          30-0-liberation-sans.conf
-Source4:          30-0-liberation-serif.conf
+Source2:          %{name}-mono.conf
+Source3:          %{name}-sans.conf
+Source4:          %{name}-serif.conf
 BuildArch:        noarch
 BuildRequires:    fontpackages-devel >= 1.13, xorg-x11-font-utils
 BuildRequires:    fontforge
@@ -44,7 +45,6 @@ Obsoletes:        liberation-fonts-compat <= 1.05.1.20090630
 Shared common files of Liberation font families.
 
 %files -n %{fontname}-fonts-common
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog LICENSE README TODO
 %dir %{_fontdir}
 %verify(not md5 size mtime) %{_fontdir}/fonts.dir
@@ -93,7 +93,7 @@ New.
 %setup -q -n %{archivename}
 
 %build
-make
+make %{?_smp_mflags} 
 mv liberation-fonts-ttf-%{version}/* .
 
 
@@ -110,15 +110,15 @@ install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
 
 # Repeat for every font family
 install -m 0644 -p %{SOURCE2} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf30}-mono.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-mono.conf
 install -m 0644 -p %{SOURCE3} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf30}-sans.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sans.conf
 install -m 0644 -p %{SOURCE4} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf30}-serif.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-serif.conf
 
-for fconf in %{fontconf30}-mono.conf \
-             %{fontconf30}-sans.conf \
-             %{fontconf30}-serif.conf; do
+for fconf in %{fontconf}-mono.conf \
+             %{fontconf}-sans.conf \
+             %{fontconf}-serif.conf; do
   ln -s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
@@ -128,6 +128,9 @@ mkfontscale %{buildroot}%{_fontdir}
 mkfontdir %{buildroot}%{_fontdir}
 
 %changelog
+* Thu Nov 22 2012 Pravin Satpute <psatpute at redhat.com> - 2.00.1-4
+- Improved spec file
+
 * Tue Nov 20 2012 Pravin Satpute <psatpute at redhat.com> - 2.00.1-3
 - Resolved bug 878305