rpms/dejavu-fonts/devel dejavu-fonts.spec,1.60,1.61

[Nicolas Mailhot (nim)]

Author: nim

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

Modified Files:
	dejavu-fonts.spec 
Log Message:
small spec changes


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- dejavu-fonts.spec	26 May 2007 19:40:27 -0000	1.60
+++ dejavu-fonts.spec	31 May 2007 18:32:34 -0000	1.61
@@ -2,12 +2,11 @@
 %define fontdir         %{_datadir}/fonts/%{fontname}
 %define fontconfdir     %{_sysconfdir}/fonts
 
+%define archivename     %{fontname}-sfd-%{archiveversion}
 
 #define alphatag        .20070509svn1766
 #define alphatag        .rc1
 
-%define archivename     %{fontname}-sfd
-# This macro has the same value as %{version}, except when testing pre-release snapshots
 #define archiveversion  20070509-1766
 %define archiveversion  %{version}
 
@@ -18,18 +17,20 @@
 
 Name:      %{fontname}-fonts
 Version:   2.17
-Release:   2%{?alphatag}%{?dist}
+Release:   3%{?alphatag}%{?dist}
 Summary:   DejaVu fonts
+
 Group:     User Interface/X
 License:   Redistributable, with restrictions
 URL:       http://%{fontname}.sf.net/
-Source0:   http://%{fontname}.sourceforge.net/%{?alphatag:snapshots/}%{archivename}-%{archiveversion}.tar.bz2
+Source0:   http://%{fontname}.sourceforge.net/%{?alphatag:snapshots/}%{archivename}.tar.bz2
 # DejaVu fontconfig setup
 Source1:   %{name}-fontconfig.conf
 Source2:   %{name}-fontconfig-unhint-small.conf
 # DejaVu fontconfig setup (experimental families)
 Source3:   %{name}-experimental-fontconfig.conf
 Source4:   %{name}-experimental-fontconfig-unhint-small.conf
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Older fontforge versions may not work, current fontforge definitely won't
 BuildRequires: fontforge = 20061220
@@ -38,16 +39,6 @@
 BuildRequires: %{Blocks} %{UnicodeData}
 BuildArch: noarch
 
-# We do not want font packages to depend on fontconfig
-# However these packages do install configuration files in 
-# %{_sysconfdir}/fonts; also they rely on the current release fontconfig cache 
-# handling style, if fontconfig is available on the system.
-# To prevent strange things should anyone try to install them on a system
-# with an older fontconfig, we explicitely conflict with fontconfig versions
-# found in older Fedora releases
-Conflicts: fontconfig < 2.4.0
-
-
 %description
 The DejaVu fonts are a font family based on the "Bitstream Vera" fonts release
 1.10. Its purpose is to provide a wider range of characters while maintaining
@@ -71,7 +62,7 @@
 
 
 %prep
-%setup -q -n %{archivename}-%{archiveversion}
+%setup -q -n %{archivename}
 
 
 %build
@@ -96,22 +87,22 @@
 
 
 %install
-/bin/rm -rf %{buildroot}
+rm -fr %{buildroot}
 
-#fonts
-install -d -m 0755 %{buildroot}%{fontdir}
-install -m 0644 generated/*.ttf  %{buildroot}%{fontdir}
+# Fonts
+install -m 0755 -d %{buildroot}%{fontdir}
+install -m 0644 -p generated/*.ttf  %{buildroot}%{fontdir}
 
 # Fontconfig tweaks
-install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d
-install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/57-%{fontname}.conf
-install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-%{fontname}.conf
-install -m 0644 %{SOURCE3} %{buildroot}%{fontconfdir}/conf.d/61-%{fontname}-experimental.conf
-install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-%{fontname}-experimental.conf
+install -m 0755 -d %{buildroot}%{fontconfdir}/conf.d
+install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/57-%{fontname}.conf
+install -m 0644 -p %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-%{fontname}.conf
+install -m 0644 -p %{SOURCE3} %{buildroot}%{fontconfdir}/conf.d/61-%{fontname}-experimental.conf
+install -m 0644 -p %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-%{fontname}-experimental.conf
 
 
 %clean
-/bin/rm -fr %{buildroot}
+rm -fr %{buildroot}
 
 
 %post
@@ -150,7 +141,7 @@
 %config(noreplace) %{fontconfdir}/conf.d/57-%{fontname}.conf
 
 %dir %{fontdir}
-%{fontdir}/DejaVu*.ttf
+%{fontdir}/*.ttf
 %exclude %{fontdir}/DejaVu*Condensed*.ttf
 %exclude %{fontdir}/DejaVu*ExtraLight*.ttf
 %exclude %{fontdir}/DejaVuSerif-*Oblique.ttf
@@ -168,6 +159,10 @@
 
 
 %changelog
+* Thu May 31 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+☺ 2.17-3
+✓ small spec cleanups
+
 * Sat May 26 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 ☺ 2.17-2
 ✓ perl-Font-TTF has been fixed upstream, use perl(Font::TTF) BR