⌖ Fedora 10 alpha general package cleanup

dejavu-fonts.spec

@@ -16,7 +16,7 @@
 
 Name:    %{fontname}-fonts
 Version: 2.25
-Release:   1%{?alphatag}%{?dist}
+Release: 2%{?alphatag}%{?dist}
 Summary: DejaVu fonts, mature typefaces
 
 Group:   User Interface/X
@@ -24,7 +24,7 @@ License:   Modifiable & redistributable, with naming restrictions
 URL:     http://%{fontname}.sf.net/
 Source0: %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 # Older fontforge versions will not work due to sfd format changes
 BuildRequires: fontforge >= 20080429
 BuildRequires: perl(Font::TTF)
@@ -33,7 +33,7 @@ BuildRequires: %{Blocks} %{UnicodeData}
 BuildArch: noarch
 
 %description
-The DejaVu fonts are a font family based on the "Bitstream Vera" fonts release
+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
 the original look and feel through the process of collaborative development.
 
@@ -87,11 +87,9 @@ make check
 %install
 rm -fr %{buildroot}
 
-# Fonts
 install -m 0755 -d %{buildroot}%{fontdir}
 install -m 0644 -p build/*.ttf %{buildroot}%{fontdir}
 
-# Fontconfig tweaks
 install -m 0755 -d %{buildroot}%{fontconfdir}
 install -m 0644 -p fontconfig/*conf %{buildroot}%{fontconfdir}
 
@@ -101,48 +99,41 @@ rm -fr %{buildroot}
 
 
 %post
-if [ -x %{_bindir}/fc-cache ]; then
+if [ -x %{_bindir}/fc-cache ] ; then
-  %{_bindir}/fc-cache %{fontdir}
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %postun
-if [ "$1" = "0" ]; then
+if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-  if [ -x %{_bindir}/fc-cache ]; then
+    %{_bindir}/fc-cache %{fontdir} || :
-    %{_bindir}/fc-cache %{fontdir}
-  fi
 fi
 
 
 %post experimental
-if [ -x %{_bindir}/fc-cache ]; then
+if [ -x %{_bindir}/fc-cache ] ; then
-  %{_bindir}/fc-cache %{fontdir}
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %postun experimental
-if [ "$1" = "0" ]; then
+if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-  if [ -x %{_bindir}/fc-cache ]; then
+    %{_bindir}/fc-cache %{fontdir} || :
-    %{_bindir}/fc-cache %{fontdir}
-  fi
 fi
 
 
 %post -n %{fontname}-lgc-fonts
-if [ -x %{_bindir}/fc-cache ]; then
+if [ -x %{_bindir}/fc-cache ] ; then
-  %{_bindir}/fc-cache %{fontdir}
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %postun -n %{fontname}-lgc-fonts
-if [ "$1" = "0" ]; then
+if [ -x %{_bindir}/fc-cache ] ; then
-  if [ -x %{_bindir}/fc-cache ]; then
+    %{_bindir}/fc-cache %{fontdir} || :
-    %{_bindir}/fc-cache %{fontdir}
-  fi
 fi
 
 
-
 %files
 %defattr(0644,root,root,0755)
 %doc AUTHORS BUGS LICENSE NEWS README
@@ -151,7 +142,7 @@ fi
 %config(noreplace) %{fontconfdir}/20-unhint-small-%{fontname}.conf
 %config(noreplace) %{fontconfdir}/57-%{fontname}.conf
 
-%dir %{fontdir}
+%dir %{fontdir}/
 %{fontdir}/*.ttf
 %exclude %{fontdir}/DejaVu*Condensed*.ttf
 %exclude %{fontdir}/DejaVu*ExtraLight*.ttf
@@ -171,6 +162,7 @@ fi
 
 %exclude %{fontdir}/DejaVuLGC*.ttf
 
+
 %files -n %{fontname}-lgc-fonts
 %defattr(0644,root,root,0755)
 %doc AUTHORS BUGS LICENSE NEWS README
@@ -179,11 +171,15 @@ fi
 %config(noreplace) %{fontconfdir}/20-unhint-small-%{fontname}-lgc.conf
 %config(noreplace) %{fontconfdir}/58-%{fontname}-lgc.conf
 
-%dir %{fontdir}
+%dir %{fontdir}/
 %{fontdir}/DejaVuLGC*.ttf
 
 
 %changelog
+* Fri Jul 11 2008 <nicolas.mailhot at laposte.net>
+- 2.25-2
+⌖ Fedora 10 alpha general package cleanup
+
 * Mon May 19 2008 <nicolas.mailhot at laposte.net>
 - 2.25-1
 ❋ 2.25 final

import.log

@@ -0,0 +1 @@
+dejavu-fonts-2_25-2_fc10:HEAD:dejavu-fonts-2.25-2.fc10.src.rpm:1215806350