rpms/liberation-fonts/devel liberation-fonts.spec,1.29,1.30
Caius Chance
cchance at fedoraproject.org
Tue Jan 20 02:33:32 UTC 2009
Author: cchance
Update of /cvs/pkgs/rpms/liberation-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29125
Modified Files:
liberation-fonts.spec
Log Message:
* Tue Jan 20 2009 Caius Chance <cchance at redhat.com> - 1.04.93-5.fc11
- Resolved: rhbz#477410
- Refined .spec file based on Mailhot's review on rhbz.
Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- liberation-fonts.spec 19 Jan 2009 06:08:16 -0000 1.29
+++ liberation-fonts.spec 20 Jan 2009 02:33:02 -0000 1.30
@@ -18,18 +18,12 @@
# GPLv3. This license is Free, but GPLv2 and GPLv3 incompatible.
License: Liberation
Group: User Interface/X
-URL: https://www.redhat.com/promo/fonts/
+URL: https://fedorahosted.org/liberation-fonts/
Source0: liberation-fonts-1.04.93.devel.tar.gz
-Source1: 65-liberation-sans.conf
-Source2: 65-liberation-serif.conf
-Source3: 65-liberation-mono.conf
-
-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}
+
+Obsoletes: liberation-fonts-sans < 1.04.93-4
+Obsoletes: liberation-fonts-serif < 1.04.93-4
+Obsoletes: liberation-fonts-mono < 1.04.93-4
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
Buildrequires: fontpackages-devel >= 1.13, xorg-x11-font-utils
@@ -43,18 +37,17 @@
%files
%{nil}
-%package -n %{fontname}-common-fonts
+%package -n %{fontname}-fonts-common
Summary: Shared common files of Liberation font families.
-License: Liberation
Group: User Interface/X
Requires: fontpackages-filesystem >= 1.13
-%description -n %{fontname}-common-fonts
+%description -n %{fontname}-fonts-common
%common_desc
Shared common files of Liberation font families.
-%files -n %{fontname}-common-fonts
+%files -n %{fontname}-fonts-common
%defattr(0644,root,root,0755)
%doc AUTHORS ChangeLog COPYING License.txt README
%dir %{_fontdir}
@@ -63,42 +56,33 @@
%{catalogue}/%{name}
%package -n %{fontname}-sans-fonts
-Summary: Sans fonts to replace commonly used Microsoft Arial
-License: Liberation
+Summary: Sans-serif fonts to replace commonly used Microsoft Arial
Group: User Interface/X
-Obsoletes: %{name}-sans < %{version}-%{release}
-Requires: fontpackages-filesystem >= 1.13
Requires: %{fontname}-common-fonts = %{version}-%{release}
%description -n %{fontname}-sans-fonts
%common_desc
-This is Sans TrueType fonts that replaced commonly used Microsoft Arial.
+This is Sans-serif TrueType fonts that replaced commonly used Microsoft Arial.
-%_font_pkg -n sans -f 65-%{fontname}-sans.conf LiberationSans-*.ttf
+%_font_pkg -n sans LiberationSans-*.ttf
%package -n %{fontname}-serif-fonts
-Summary: San-serif fonts to replace commonly used Microsoft Times New Roman
-License: Liberation
+Summary: Serif fonts to replace commonly used Microsoft Times New Roman
Group: User Interface/X
-Obsoletes: %{name}-serif < %{version}-%{release}
-Requires: fontpackages-filesystem >= 1.13
Requires: %{fontname}-common-fonts = %{version}-%{release}
%description -n %{fontname}-serif-fonts
%common_desc
-This is Sans-serif TrueType fonts that replaced commonly used Microsoft Times \
-New Roman.
+This is Serif TrueType fonts that replaced commonly used Microsoft Times New \
+Roman.
-%_font_pkg -n serif -f 65-%{fontname}-serif.conf LiberationSerif-*.ttf
+%_font_pkg -n serif LiberationSerif-*.ttf
%package -n %{fontname}-mono-fonts
Summary: Monospace fonts to replace commonly used Microsoft Courier New
-License: Liberation
Group: User Interface/X
-Obsoletes: %{name}-sans < %{version}-%{release}
-Requires: fontpackages-filesystem >= 1.13
Requires: %{fontname}-common-fonts = %{version}-%{release}
%description -n %{fontname}-mono-fonts
@@ -107,7 +91,7 @@
This is Monospace TrueType fonts that replaced commonly used Microsoft Courier \
New.
-%_font_pkg -n mono -f 65-%{fontname}-mono.conf LiberationMono-*.ttf
+%_font_pkg -n mono LiberationMono-*.ttf
%prep
%setup -q -n %{name}-%{version}.devel
@@ -119,20 +103,9 @@
rm -rf %{buildroot}
# fonts .ttf
install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 *.ttf %{buildroot}%{_fontdir}
-# fontconfig .conf
-%__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
-%__install -m 0755 -d %{buildroot}%{_fontconfig_confdir}
-cd ../
-for fconf in %{SOURCE1} %{SOURCE2} %{SOURCE3}
-do
- %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
- %__ln_s %{_fontconfig_templatedir}/`basename $fconf` \
- %{buildroot}%{_fontconfig_confdir}/`basename $fconf`
-done
-cd -
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
# catalogue
-install -d %{buildroot}%{catalogue}
+install -m 0755 -d %{buildroot}%{catalogue}
ln -sf %{_fontdir} %{buildroot}%{catalogue}/%{name}
# fonts.{dir,scale}
mkfontdir %{buildroot}%{_fontdir}
@@ -142,6 +115,10 @@
rm -rf %{buildroot}
%changelog
+* Tue Jan 20 2009 Caius Chance <cchance at redhat.com> - 1.04.93-5.fc11
+- Resolved: rhbz#477410
+- Refined .spec file based on Mailhot's review on rhbz.
+
* 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.
More information about the Fedora-fonts-bugs-list
mailing list