rpms/liberation-fonts/devel 65-liberation-mono.conf, NONE, 1.1 65-liberation-sans.conf, NONE, 1.1 65-liberation-serif.conf, NONE, 1.1 liberation-fonts.spec, 1.27, 1.28

Mon Jan 19 05:43:09 UTC 2009

Author: cchance

Update of /cvs/pkgs/rpms/liberation-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29355

Modified Files:
	liberation-fonts.spec 
Added Files:
	65-liberation-mono.conf 65-liberation-sans.conf 
	65-liberation-serif.conf 
Log Message:
reseolves 474734
incl fontconfig .conf files
rename package for post-1.13 fontpackages macros

--- NEW FILE 65-liberation-mono.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
  monospace faces
 -->
	<alias>
		<family>Liberation Mono</family>
		<default>
            <family>monospace</family>
        </default>
	</alias>
	<alias>
		<family>monospace</family>
		<prefer>
			<family>Liberation Mono</family>
		</prefer>
	</alias>
</fontconfig>


--- NEW FILE 65-liberation-sans.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
  Sans-serif faces
 -->
	<alias>
		<family>Liberation Sans</family>
		<default>
            <family>sans-serif</family>
        </default>
	</alias>
	<alias>
		<family>sans-serif</family>
		<prefer>
			<family>Liberation Sans</family>
		</prefer>
	</alias>
</fontconfig>


--- NEW FILE 65-liberation-serif.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
  Serif faces
 -->
	<alias>
		<family>Liberation Serif</family>
		<default>
            <family>serif</family>
        </default>
	</alias>
	<alias>
		<family>serif</family>
		<prefer>
			<family>Liberation Serif</family>
		</prefer>
	</alias>
</fontconfig>


Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- liberation-fonts.spec	9 Jan 2009 03:31:34 -0000	1.27
+++ liberation-fonts.spec	19 Jan 2009 05:42:39 -0000	1.28
@@ -1,18 +1,16 @@
 %define fontname liberation
-%define fontconf <65>-%{fontname}
 %define archivename %{name}-%{version}
 %define common_desc \
 The Liberation Fonts are intended to be replacements for the three most \
 commonly used fonts on Microsoft systems: Times New Roman, Arial, and Courier \
 New.
 
-%define fontdir %{_datadir}/fonts/%{fontname}
 %define catalogue %{_sysconfdir}/X11/fontpath.d
 
 Name:             %{fontname}-fonts
 Summary:          Fonts to replace commonly used Microsoft Windows fonts
 Version:          1.04.93
-Release:          3%{?dist}
+Release:          4%{?dist}
 # The license of the Liberation Fonts is a EULA that contains GPLv2 and two 
 # exceptions:
 # The first exception is the standard FSF font exception.
@@ -23,12 +21,15 @@
 URL:              https://www.redhat.com/promo/fonts/
 Source0:          liberation-fonts-1.04.93.devel.tar.gz
 
-Requires:         liberation-fonts-sans >= %{version}
-Requires:         liberation-fonts-serif >= %{version}
-Requires:         liberation-fonts-mono >= %{version}
+Requires:         %{name}-sans >= %{version}-%{release}
+Requires:         %{name}-serif >= %{version}-%{release}
+Requires:         %{name}-mono >= %{version}-%{release}
+Obsoletes:        liberation-fonts-sans < %{version}-%{release}
+Obsoletes:        liberation-fonts-serif < %{version}-%{release}
+Obsoletes:        liberation-fonts-mono < %{version}-%{release}
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:        noarch
-Buildrequires:    fontpackages-devel xorg-x11-font-utils
+Buildrequires:    fontpackages-devel >= 1.13, xorg-x11-font-utils
 
 %description
 %common_desc
@@ -36,33 +37,43 @@
 Meta-package of Liberation fonts which installs Sans, Serif, and Monospace 
 families.
 
-%package common
+%files
+%{nil}
+
+%package -n %{fontname}-common-fonts
 Summary:          Shared common files of Liberation font families.
 License:          Liberation
 Group:            User Interface/X
-Requires:         fontpackages-filesystem
+Requires:         fontpackages-filesystem >= 1.13
 
-%description common
+%description -n %{fontname}-common-fonts
 %common_desc
 
 Shared common files of Liberation font families.
 
+%files -n %{fontname}-common-fonts
+%defattr(0644,root,root,0755)
+%doc AUTHORS ChangeLog COPYING License.txt README
+%dir %{_fontdir}
+%verify(not md5 size mtime) %{_fontdir}/fonts.dir
+%verify(not md5 size mtime) %{_fontdir}/fonts.scale
+%{catalogue}/%{name}
+
 %define mk_pkg()\
-%package %1\
+%package -n %{fontname}-%1-fonts\
 Summary:          %3 fonts to replace commonly used Microsoft %4\
 License:          Liberation\
 Group:            User Interface/X\
-Requires:         fontpackages-filesystem, %{name}-common >= %{version}\
+Obsoletes:        %{name}-%1 < %{version}-%{release}\
+Requires:         fontpackages-filesystem >= 1.13\
+Requires:         %{fontname}-common-fonts = %{version}-%{release}\
 \
-%description %1\
+%description -n %{fontname}-%1-fonts\
 %common_desc\
 \
-%3 TrueType fonts that replaced commonly used Microsoft %4.\
+This is %3 TrueType fonts that replaced commonly used Microsoft %4.\
 \
-%files %1\
-%defattr(0644,root,root,0755)\
-%dir %{fontdir}\
-%{fontdir}/Liberation%2-*.ttf
+%_font_pkg -n %1 -f *-%{fontname}-%1*.conf Liberation%2-*.ttf
 
 %mk_pkg sans Sans Sans Arial
 %mk_pkg serif Serif Sans-serif Times_New_Roman
@@ -79,42 +90,23 @@
 
 %install
 rm -rf %{buildroot}
-# fonts
-install -m 0755 -d %{buildroot}%{fontdir}
-install -m 0644 *.ttf %{buildroot}%{fontdir}
-# configuration
+# fonts .ttf
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 *.ttf %{buildroot}%{_fontdir}
+# fontconfig .conf
 install -m 0755 -d %{buildroot}%{_sysconfdir}/fonts/conf.d
 # catalogue
 install -d %{buildroot}%{catalogue}
-ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name}
-
-# generate fonts.dir and fonts.scale
-mkfontdir %{buildroot}%{fontdir}
-mkfontscale %{buildroot}%{fontdir}
-
-%post
-if [ -x /usr/bin/fc-cache ]; then
-  /usr/bin/fc-cache %{_datadir}/fonts
-fi
-
-%postun
-if [ "$1" = "0" ]; then
-  if [ -x /usr/bin/fc-cache ]; then
-    /usr/bin/fc-cache %{_datadir}/fonts
-  fi
-fi
-
-%files
-%{nil}
-
-%files common
-%defattr(0644,root,root,0755)
-%doc AUTHORS ChangeLog COPYING License.txt README
-%verify(not md5 size mtime) %{fontdir}/fonts.dir
-%verify(not md5 size mtime) %{fontdir}/fonts.scale
-%{catalogue}/%{name}
+ln -sf %{_fontdir} %{buildroot}%{catalogue}/%{name}
+# fonts.{dir,scale}
+mkfontdir %{buildroot}%{_fontdir}
+mkfontscale %{buildroot}%{_fontdir}
 
 %changelog
+* Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 1.04.93-4.fc11
+- Resolves: thbz#477410
+- Package renaming for post-1.13 fontpackages macros.
+
 * Fri Jan 09 2009 Caius Chance <cchance at redhat.com> - 1.04.93-3.fc11
 - Resolves: rhbz#477410 (Convert to new font packaging guidelines.)
 


