diff --git a/65-liberation-mono.conf b/65-liberation-mono.conf
new file mode 100644
index 0000000..e3a88b3
--- /dev/null
+++ b/65-liberation-mono.conf
@@ -0,0 +1,19 @@
+
+
+
+
+
+ Liberation Mono
+
+ monospace
+
+
+
+ monospace
+
+ Liberation Mono
+
+
+
diff --git a/65-liberation-sans.conf b/65-liberation-sans.conf
new file mode 100644
index 0000000..c1e0413
--- /dev/null
+++ b/65-liberation-sans.conf
@@ -0,0 +1,19 @@
+
+
+
+
+
+ Liberation Sans
+
+ sans-serif
+
+
+
+ sans-serif
+
+ Liberation Sans
+
+
+
diff --git a/65-liberation-serif.conf b/65-liberation-serif.conf
new file mode 100644
index 0000000..e0a167d
--- /dev/null
+++ b/65-liberation-serif.conf
@@ -0,0 +1,19 @@
+
+
+
+
+
+ Liberation Serif
+
+ serif
+
+
+
+ serif
+
+ Liberation Serif
+
+
+
diff --git a/liberation-fonts.spec b/liberation-fonts.spec
index 14f378c..accac43 100644
--- a/liberation-fonts.spec
+++ b/liberation-fonts.spec
@@ -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 @@ Group: User Interface/X
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 @@ Buildrequires: fontpackages-devel xorg-x11-font-utils
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 @@ rm -rf %{buildroot}
%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 - 1.04.93-4.fc11
+- Resolves: thbz#477410
+- Package renaming for post-1.13 fontpackages macros.
+
* Fri Jan 09 2009 Caius Chance - 1.04.93-3.fc11
- Resolves: rhbz#477410 (Convert to new font packaging guidelines.)