[vlgothic-fonts] the spec file cleanup

[Akira TAGOH]

commit 814a253d8befe72eed1b762e3e711f05d33cecb6
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Fri Nov 23 13:34:12 2012 +0900

    the spec file cleanup

 ...c.conf => vlgothic-fonts-fontconfig-gothic.conf |    0
 ....conf => vlgothic-fonts-fontconfig-pgothic.conf |    0
 vlgothic-fonts.spec                                |   25 +++++++++++--------
 3 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/vlgothic-fontconfig-gothic.conf b/vlgothic-fonts-fontconfig-gothic.conf
similarity index 100%
rename from vlgothic-fontconfig-gothic.conf
rename to vlgothic-fonts-fontconfig-gothic.conf
diff --git a/vlgothic-fontconfig-pgothic.conf b/vlgothic-fonts-fontconfig-pgothic.conf
similarity index 100%
rename from vlgothic-fontconfig-pgothic.conf
rename to vlgothic-fonts-fontconfig-pgothic.conf
diff --git a/vlgothic-fonts.spec b/vlgothic-fonts.spec
index 54dc088..bbc26d6 100644
--- a/vlgothic-fonts.spec
+++ b/vlgothic-fonts.spec
@@ -1,25 +1,25 @@
-%define priority	65-1
-%define ppriority	65-0
-%define fontname	vlgothic
-%define	archivename	VLGothic-%{version}
-%define	fontconf	%{priority}-%{fontname}-gothic
-%define	pfontconf	%{ppriority}-%{fontname}-pgothic
-%define	common_desc	\
+%global	priority	65-1
+%global	ppriority	65-0
+%global	fontname	vlgothic
+%global	archivename	VLGothic-%{version}
+%global	fontconf	%{priority}-%{fontname}-gothic
+%global	pfontconf	%{ppriority}-%{fontname}-pgothic
+%global	common_desc	\
 VLGothic provides Japanese TrueType fonts from the Vine Linux project.\
 Most of the glyphs are taken from the M+ and Sazanami Gothic fonts,\
 but some have also been improved by the project.
 
 Name:		%{fontname}-fonts
 Version:	20121109
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Japanese TrueType font
 
 License:	mplus and BSD
 Group:		User Interface/X
 URL:		http://dicey.org/vlgothic
 Source0:	http://osdn.dl.sourceforge.jp/vlgothic/57344/%{archivename}.tar.bz2
-Source1:	%{fontname}-fontconfig-pgothic.conf
-Source2:	%{fontname}-fontconfig-gothic.conf
+Source1:	%{name}-fontconfig-pgothic.conf
+Source2:	%{name}-fontconfig-gothic.conf
 BuildArch:	noarch
 BuildRequires:	fontpackages-devel
 
@@ -67,7 +67,7 @@ install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
 install -m 0644 -p *.ttf $RPM_BUILD_ROOT%{_fontdir}
 
 install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir} \
-	 		$RPM_BUILD_ROOT%{_fontconfig_confdir}
+			$RPM_BUILD_ROOT%{_fontconfig_confdir}
 
 install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{pfontconf}.conf
 install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}.conf
@@ -87,6 +87,9 @@ done
 
 
 %changelog
+* Fri Nov 23 2012 Akira TAGOH <tagoh at redhat.com> - 20121109-2
+- the spec file cleanup
+
 * Fri Nov 16 2012 Akira TAGOH <tagoh at redhat.com> - 20121109-1
 - New upstream release. (#874981)