[sil-gentium-basic-fonts/f15] spec file clean up

mjg mjg at fedoraproject.org
Wed Jan 11 14:13:39 UTC 2012


commit 0cfa6fbde4824cb1d38084fde8edfab711c5cd84
Author: Michael J Gruber <mjg at fedoraproject.org>
Date:   Wed Jan 11 15:08:26 2012 +0100

    spec file clean up

 ....conf => sil-gentium-basic-book-fontconfig.conf |    0
 ...basic.conf => sil-gentium-basic-fontconfig.conf |    0
 sil-gentium-basic-fonts.spec                       |   33 ++++++++-----------
 3 files changed, 14 insertions(+), 19 deletions(-)
---
diff --git a/59-sil-gentium-basic-book.conf b/sil-gentium-basic-book-fontconfig.conf
similarity index 100%
rename from 59-sil-gentium-basic-book.conf
rename to sil-gentium-basic-book-fontconfig.conf
diff --git a/59-sil-gentium-basic.conf b/sil-gentium-basic-fontconfig.conf
similarity index 100%
rename from 59-sil-gentium-basic.conf
rename to sil-gentium-basic-fontconfig.conf
diff --git a/sil-gentium-basic-fonts.spec b/sil-gentium-basic-fonts.spec
index e9f5fe7..f1296fc 100644
--- a/sil-gentium-basic-fonts.spec
+++ b/sil-gentium-basic-fonts.spec
@@ -12,16 +12,15 @@ characters, with miscellaneous diacritical marks, symbols and punctuation.
 
 Name: %{fontname}-fonts
 Version: 1.1
-Release: 6%{?dist}
-Summary: Gentium Basic Font Family from SIL
+Release: 7%{?dist}
+Summary: SIL Gentium Basic font family
 
 Group:     User Interface/X
 License:   OFL
 URL:       http://scripts.sil.org/Gentium_Basic
 Source0:   GentiumBasic_110.zip
-Source1:   %{fontconf}.conf
-Source2:   %{fontconf}-book.conf
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Source1:   %{fontname}-fontconfig.conf
+Source2:   %{fontname}-book-fontconfig.conf
 BuildArch:     noarch
 BuildRequires: fontpackages-devel
 
@@ -30,25 +29,26 @@ Requires: %{name}-common = %{version}-%{release}
 %description
 %common_desc
 
+This is the base variant.
+
 %_font_pkg -f %{fontconf}.conf GenBas*.ttf
 
 %package common
-Summary:  SIL Genitum Basic fonts, common files (documentation…)
-Group:    User Interface/X
+Summary:  Common files of %{fontname}
 Requires: fontpackages-filesystem
 
 %description common
 %common_desc
 
-This package consists of files used by other %{name} packages.
+This package consists of files used by other %{fontname} packages.
 
 %package  -n %{fontname}-book-fonts
-Summary:  SIL Gentium Basic Family fonts
-Group:    User Interface/X
+Summary:  SIL Gentium Book Basic font family
 Requires: %{name}-common = %{version}-%{release}
 
 %description -n %{fontname}-book-fonts
-%common_desc\
+%common_desc
+
 The "Book" family is slightly heavier.
 
 %_font_pkg -n book -f %{fontconf}-book.conf GenBkBas*.ttf
@@ -69,10 +69,8 @@ touch -r GENTIUM-FAQ.txt GENTIUM-FAQ.txt_
 mv GENTIUM-FAQ.txt_ GENTIUM-FAQ.txt
 
 %build
-echo "Nothing to do in Build."
 
 %install
-rm -fr %{buildroot}
 
 install -m 0755 -d %{buildroot}%{_fontdir}
 install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
@@ -80,7 +78,6 @@ install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                    %{buildroot}%{_fontconfig_confdir}
 
-# Repeat for every font family
 
 install -m 0644 -p %{SOURCE1} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
@@ -94,19 +91,17 @@ for fconf in %{fontconf}.conf\
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
 
-%clean
-rm -fr %{buildroot}
-
 
 %files common
 %defattr(0644,root,root,0755)
 %doc FONTLOG.txt GENTIUM-FAQ.txt OFL-FAQ.txt OFL.txt
 
 
-%dir %{_fontdir}
-
 
 %changelog
+* Wed Jan 11 2012 Michael J Gruber <mjg at fedoraproject.org> - 1.1-7
+- spec file clean up.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the fonts-bugs mailing list