rpms/mgopen-fonts/devel mgopen-fonts.spec,1.9,1.10

[Sarantis Paskalis]

Author: sarantis

Update of /cvs/extras/rpms/mgopen-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9432

Modified Files:
	mgopen-fonts.spec 
Log Message:
- Rename subpackages according to 
  http://fedoraproject.org/wiki/PackagingDrafts/Font_package_naming_(2009-01-13)
- Differentiate between macro and variable (fontconf->fconf)




Index: mgopen-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mgopen-fonts/devel/mgopen-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mgopen-fonts.spec	30 Dec 2008 14:07:38 -0000	1.9
+++ mgopen-fonts.spec	19 Jan 2009 10:17:58 -0000	1.10
@@ -19,7 +19,7 @@
 
 Name:      %{fontname}-fonts
 Version:   0.%{upstream_date}
-Release:   9%{?dist}
+Release:   10%{?dist}
 Summary:   Truetype greek fonts
 Group:     User Interface/X
 License:   MgOpen
@@ -31,86 +31,80 @@
 # The LICENCE file is an excerpt from the html page
 Source2:   %{fontname}-fontconfig.tar.gz
 # Tarball of fontconfig files for each font
-
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 BuildRequires: fontpackages-devel
 Requires:  fontpackages-filesystem
-
 %description
 %common_desc
 
+
 %package common
 Summary:  Truetype greek fonts, common files (documentation…)
 Group:    User Interface/X
-
-Obsoletes: mgopen-fonts<0.20050515-8
-
 %description common
 %common_desc
-
 This package consists of files used by other MgOpen packages.
 
+
+
 %package compat
 Summary: Truetype greek fonts, compatibility package
 Group:     User Interface/X
-
-Obsoletes: mgopen-fonts<0.20050515-6
-
-Requires: %{name}-canonica, %{name}-cosmetica, %{name}-modata, %{name}-moderna
-
+Obsoletes: mgopen-fonts<0.20050515-8
+Requires: %{fontname}-canonica-fonts, %{fontname}-cosmetica-fonts,
+Requires: %{fontname}-modata-fonts, %{fontname}-moderna-fonts
 %description compat
 %common_desc
 %compat_desc
 
 
-%package canonica
+
+%package -n %{fontname}-canonica-fonts
 Summary:   Truetype variable-stroke-width serif font faces
 Group:     User Interface/X
 Requires:  %{name}-common = %{version}-%{release}
-
-%description canonica
+%description -n %{fontname}-canonica-fonts
 %common_desc
-
 This package contains the MgOpen Canonica serif variable-stroke-width typeface,
 which is based on the design of Times Roman.
 
 %_font_pkg -n canonica -f %{fontconf}-canonica.conf MgOpenCanonica*.ttf
 
-%package cosmetica
+
+
+%package -n %{fontname}-cosmetica-fonts
 Summary:   Truetype variable-stroke-width sans serif font faces
 Group:     User Interface/X
 Requires:  %{name}-common = %{version}-%{release}
-
-%description cosmetica
+%description -n %{fontname}-cosmetica-fonts
 %common_desc
-
 This package contains the MgOpen Cosmetica sans serif variable-stroke-width
 typeface, which is  based on the design of Optima.
 
 %_font_pkg -n cosmetica -f %{fontconf}-cosmetica.conf MgOpenCosmetica*.ttf
 
-%package modata
+
+
+%package -n %{fontname}-modata-fonts
 Summary:   Truetype fixed-stroke-width sans serif font faces
 Group:     User Interface/X
 Requires:  %{name}-common = %{version}-%{release}
-
-%description modata
+%description -n %{fontname}-modata-fonts
 %common_desc
-
 This package contains the MgOpen Modata sans serif fixed-stroke-width
 which is based on the design of VAG rounded.
 
 %_font_pkg -n modata -f %{fontconf}-modata.conf MgOpenModata*.ttf
 
-%package moderna
+
+
+%package -n %{fontname}-moderna-fonts
 Summary:   Truetype fixed-stroke-width sans serif font faces
 Group:     User Interface/X
 Requires:  %{name}-common = %{version}-%{release}
-
-%description moderna
+%description -n %{fontname}-moderna-fonts
 %common_desc
-
 This package contains the MgOpen Moderna sans serif fixed-stroke-width
 typeface which is based on the design of Helvetica.
 
@@ -141,11 +135,11 @@
 install -m 0644 -p fontconfig/%{fontname}-moderna.conf \
          %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-moderna.conf
 
-for fontconf in %{fontconf}-canonica.conf \
+for fconf in %{fontconf}-canonica.conf \
                 %{fontconf}-cosmetica.conf \
                 %{fontconf}-modata.conf \
                 %{fontconf}-moderna.conf ; do
-  ln -s %{_fontconfig_templatedir}/$fontconf \
+  ln -s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fontconf
 done
 
@@ -163,6 +157,11 @@
 %files compat
 
 %changelog
+* Mon Jan 19 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.20050515-9
+- Rename subpackages according to 
+  http://fedoraproject.org/wiki/PackagingDrafts/Font_package_naming_(2009-01-13)
+- Differentiate between macro and variable (fontconf->fconf)
+
 * Tue Dec 30 2008 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.20050515-9
 - Restructure spec file according to
   https://fedoraproject.org/wiki/Fonts_SIG_Fedora_11_packaging_changes