rpms/mgopen-fonts/devel .cvsignore, 1.2, 1.3 mgopen-fonts.spec, 1.8, 1.9 sources, 1.2, 1.3

[Sarantis Paskalis]

Author: sarantis

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

Modified Files:
	.cvsignore mgopen-fonts.spec sources 
Log Message:
- Restructure spec file according to
  https://fedoraproject.org/wiki/Fonts_SIG_Fedora_11_packaging_changes
- Provide fontconfig files for the fonts
- Provide alias for VAG rounded --> Modata (bug #472835)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mgopen-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jul 2005 09:44:04 -0000	1.2
+++ .cvsignore	30 Dec 2008 14:07:38 -0000	1.3
@@ -1,2 +1,3 @@
-MgOpen-20050515-doc.tar.gz
 MgOpen-20050515.tar.gz
+MgOpen-20050515-doc.tar.gz
+mgopen-fontconfig.tar.gz


Index: mgopen-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mgopen-fonts/devel/mgopen-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mgopen-fonts.spec	19 Dec 2008 21:39:11 -0000	1.8
+++ mgopen-fonts.spec	30 Dec 2008 14:07:38 -0000	1.9
@@ -1,12 +1,25 @@
 %define fontname 	mgopen
-%define fontdir		%{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define fontconf        61-%{fontname}
 %define archivename     MgOpen
 %define upstream_date   20050515
 
+# Common description
+%define common_desc The MgOpen fonts are a font family that includes Latin and Greek glyphs.\
+The fonts have been released under a liberal license, similar to the\
+license covering the Bitstream Vera fonts.
+
+# Compat description
+%define compat_desc \
+This package only exists to help transition pre Fedora 11 MgOpen font users to\
+the new package split. It will be removed after one distribution release cycle,\
+please do not reference it or depend on it in any way.\
+\
+It can be safely uninstalled.
+
+
 Name:      %{fontname}-fonts
 Version:   0.%{upstream_date}
-Release:   8%{?dist}
+Release:   9%{?dist}
 Summary:   Truetype greek fonts
 Group:     User Interface/X
 License:   MgOpen
@@ -16,54 +29,146 @@
 Source1:   %{archivename}-%{upstream_date}-doc.tar.gz
 # Tarball of the documentation on the site http://www.ellak.gr/fonts/mgopen/
 # 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
-# Conflicts: fontconfig < 2.3.93
-
+BuildRequires: fontpackages-devel
+Requires:  fontpackages-filesystem
 
 %description
-The MgOpen fonts are a font family that includes Latin and Greek glyphs.
-The fonts have been released under a liberal license, similar to the
-license covering the Bitstream Vera fonts.
+%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
+
+%description compat
+%common_desc
+%compat_desc
+
+
+%package canonica
+Summary:   Truetype variable-stroke-width serif font faces
+Group:     User Interface/X
+Requires:  %{name}-common = %{version}-%{release}
+
+%description canonica
+%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
+Summary:   Truetype variable-stroke-width sans serif font faces
+Group:     User Interface/X
+Requires:  %{name}-common = %{version}-%{release}
+
+%description cosmetica
+%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
+Summary:   Truetype fixed-stroke-width sans serif font faces
+Group:     User Interface/X
+Requires:  %{name}-common = %{version}-%{release}
+
+%description modata
+%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
+Summary:   Truetype fixed-stroke-width sans serif font faces
+Group:     User Interface/X
+Requires:  %{name}-common = %{version}-%{release}
+
+%description moderna
+%common_desc
+
+This package contains the MgOpen Moderna sans serif fixed-stroke-width
+typeface which is based on the design of Helvetica.
+
+%_font_pkg -n moderna -f %{fontconf}-moderna.conf MgOpenModerna*.ttf
+
 
 
 %prep
-%setup -q -c -a1 -n %{archivename}-%{version}
+%setup -q -c -a1 -a2 -n %{archivename}-%{version}
 iconv -f ISO-8859-1 -t UTF-8 LICENCE > LICENCE.tmp; mv LICENCE.tmp LICENCE
 
 %build
 
 %install
 rm -rf %{buildroot}
-install -d -m 0755 %{buildroot}%{fontdir}
-install -m 0644 *.ttf  %{buildroot}%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf  %{buildroot}%{_fontdir}
 
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
-%clean
-rm -rf %{buildroot}
+install -m 0644 -p fontconfig/%{fontname}-canonica.conf \
+	 %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-canonica.conf
+install -m 0644 -p fontconfig/%{fontname}-cosmetica.conf \
+         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-cosmetica.conf
+install -m 0644 -p fontconfig/%{fontname}-modata.conf \
+         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-modata.conf
+install -m 0644 -p fontconfig/%{fontname}-moderna.conf \
+         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-moderna.conf
+
+for fontconf in %{fontconf}-canonica.conf \
+                %{fontconf}-cosmetica.conf \
+                %{fontconf}-modata.conf \
+                %{fontconf}-moderna.conf ; do
+  ln -s %{_fontconfig_templatedir}/$fontconf \
+        %{buildroot}%{_fontconfig_confdir}/$fontconf
+done
 
 
-%post
-if [ -x %{_bindir}/fc-cache ]; then 
-  %{_bindir}/fc-cache -r %{fontdir} || :
-fi
-
-%postun
-if [ "$1" = "0" ]; then
-  if [ -x %{_bindir}/fc-cache ]; then 
-    %{_bindir}/fc-cache -f %{fontdir} || :
-  fi
-fi
+%clean
+rm -rf %{buildroot}
 
 
-%files
+%files common
 %defattr(0644,root,root,0755)
 %doc LICENCE mgopen.html _files/
-%dir %{fontdir}
-%{fontdir}/*.ttf
+%dir %{_fontdir}
 
 
+%files compat
+
 %changelog
+* 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
+- Provide fontconfig files for the fonts
+- Provide alias for VAG rounded --> Modata (bug #472835)
+
 * Fri Dec 19 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.20050515-8
 - It was decided that the license for these fonts is sufficiently different
   from Vera to require a different license tag.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mgopen-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jul 2005 09:44:04 -0000	1.2
+++ sources	30 Dec 2008 14:07:38 -0000	1.3
@@ -1,2 +1,3 @@
-eb667a1458a92bc4d4e9a1f5924f6e61  MgOpen-20050515-doc.tar.gz
 9ad4bba3d173e92734320286bfff4c8e  MgOpen-20050515.tar.gz
+eb667a1458a92bc4d4e9a1f5924f6e61  MgOpen-20050515-doc.tar.gz
+c01d7492aa697128799b5c2cc8dd1997  mgopen-fontconfig.tar.gz