rpms/mgopen-fonts/devel mgopen-fonts.spec,1.6,1.7

[Sarantis Paskalis (sarantis)]

Author: sarantis

Update of /cvs/extras/rpms/mgopen-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30211

Modified Files:
	mgopen-fonts.spec 
Log Message:
- Drop ancient Conflicts < fontconfig-2.3.93
- Convert LICENCE file to UTF-8
- Fix License description to Bitstream Vera
- Spec cleanup




Index: mgopen-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mgopen-fonts/devel/mgopen-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mgopen-fonts.spec	10 Feb 2008 16:30:50 -0000	1.6
+++ mgopen-fonts.spec	3 Mar 2008 13:55:53 -0000	1.7
@@ -1,22 +1,24 @@
+%define fontname 	mgopen
+%define fontdir		%{_datadir}/fonts/%{fontname}
+%define fontconfdir %{_sysconfdir}/fonts/conf.d
 %define archivename     MgOpen
-%define fontdir         %{_datadir}/fonts/mgopen
 %define upstream_date   20050515
 
-Name:      mgopen-fonts
+Name:      %{fontname}-fonts
 Version:   0.%{upstream_date}
-Release:   6%{?dist}
+Release:   7%{?dist}
 Summary:   Truetype greek fonts
 Group:     User Interface/X
-License:   Redistributable, with restrictions
+License:   Bitstream Vera
 URL:       http://www.ellak.gr/fonts/mgopen/
 Source0:   %{archivename}-%{upstream_date}.tar.gz
 # Upstream tarball is not versioned http://www.ellak.gr/fonts/mgopen/files/%{archivename}.tar.gz
 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
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
-Conflicts: fontconfig < 2.3.93
+# Conflicts: fontconfig < 2.3.93
 
 
 %description
@@ -27,28 +29,29 @@
 
 %prep
 %setup -q -c -a1 -n %{archivename}-%{version}
+iconv -f ISO-8859-1 -t UTF-8 LICENCE > LICENCE.tmp; mv LICENCE.tmp LICENCE
 
 %build
 
 %install
-/bin/rm -rf $RPM_BUILD_ROOT
-install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
-install -m 0644 *.ttf  $RPM_BUILD_ROOT%{fontdir}
+rm -rf %{buildroot}
+install -d -m 0755 %{buildroot}%{fontdir}
+install -m 0644 *.ttf  %{buildroot}%{fontdir}
 
 
 %clean
-/bin/rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
 if [ -x %{_bindir}/fc-cache ]; then 
-  %{_bindir}/fc-cache %{_datadir}/fonts
+  %{_bindir}/fc-cache -r %{fontdir} || :
 fi
 
 %postun
 if [ "$1" = "0" ]; then
   if [ -x %{_bindir}/fc-cache ]; then 
-    %{_bindir}/fc-cache %{_datadir}/fonts
+    %{_bindir}/fc-cache -f %{fontdir} || :
   fi
 fi
 
@@ -61,7 +64,13 @@
 
 
 %changelog
-* Sun Feb 10 2008 Sarantis Paskalis <paskalis at di.uoa.gr>
+* Mon Mar  3 2008 Sarantis Paskalis <paskalis at di.uoa.gr> 0.20050515-7
+- Drop ancient Conflicts < fontconfig-2.3.93
+- Convert LICENCE file to UTF-8
+- Fix License description to Bitstream Vera
+- Spec cleanup
+
+* Sun Feb 10 2008 Sarantis Paskalis <paskalis at di.uoa.gr> 0.20050515-6
 - rebuilt for GCC 4.3 as requested by Fedora Release Engineering
 
 * Tue Aug 29 2006 Sarantis Paskalis <paskalis at di.uoa.gr> 0.20050515-5