rpms/dejavu-fonts/devel .cvsignore, 1.50, 1.51 dejavu-fonts.spec, 1.90, 1.91 import.log, 1.7, 1.8 sources, 1.50, 1.51

Nicolas Mailhot nim at fedoraproject.org
Wed Dec 17 20:11:32 UTC 2008 

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8681/devel

Modified Files:
	.cvsignore dejavu-fonts.spec import.log sources 
Log Message:
update for new fonts guidelines


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	27 Jul 2008 13:35:50 -0000	1.50
+++ .cvsignore	17 Dec 2008 20:11:02 -0000	1.51
@@ -1 +1 @@
-dejavu-fonts-2.26.tar.bz2
+dejavu-fonts-2.27.tar.bz2


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- dejavu-fonts.spec	9 Nov 2008 09:06:24 -0000	1.90
+++ dejavu-fonts.spec	17 Dec 2008 20:11:02 -0000	1.91
@@ -1,7 +1,4 @@
 %define fontname    dejavu
-%define fontdir     %{_datadir}/fonts/%{fontname}/
-%define fontconfdir %{_sysconfdir}/fonts/conf.d/
-
 %define archivename %{name}-%{archiveversion}
 
 #define alphatag .20080512svn2226
@@ -11,8 +8,8 @@
 %define archiveversion %{version}
 
 # Let the perl maintainer worry about Unicode.org data files
-%define Blocks          %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt
-%define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
+%define Blocks      %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt
+%define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 # Common description
 %define common_desc \
@@ -26,65 +23,33 @@
 package split. It will be removed after one distribution release cycle, please\
 do not reference it or depend on it in any way.\
 \
-It can be safely uninstalled. 
-
+It can be safely uninstalled.
 
-# Subpackage magic - should be generic enough for reuse in other packages
-%define font_subpkg(n:f:) \
-\
-%post %{-n*} \
-if [ -x %{_bindir}/fc-cache ]; then \
-    %{_bindir}/fc-cache %{fontdir} || : \
-fi \
-\
-\
-%postun %{-n*} \
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then \
-    %{_bindir}/fc-cache %{fontdir} || : \
-fi\
-\
-\
-%files %{-n*} \
-%defattr(0644,root,root,0755) \
-\
-%{-f:%config(noreplace) %{fontconfdir}%{-f*}} \
-\
-%(echo %* | sed "s+ +\\n+g"| sed "s+^+%{fontdir}+g")
 
 Name:    %{fontname}-fonts
-Version: 2.26
-Release: 6%{?alphatag}%{?dist}
+Version: 2.27
+Release: 7%{?alphatag}%{?dist}
 Summary: DejaVu fonts
 
-Group:   User Interface/X
-License: Bitstream Vera and Public Domain
-URL:     http://%{fontname}.sf.net/
-Source0: %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2
-Patch0:  %{name}-2.26-fontconfig.patch
-
+Group:     User Interface/X
+License:   Bitstream Vera and Public Domain
+URL:       http://%{fontname}.sf.net/
+Source0:   %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2
+Patch0:    %{name}-2.26-fontconfig.patch
 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)
 # Needed to compute unicode coverage
 BuildRequires: %{Blocks} %{UnicodeData}
-BuildArch: noarch
 
-%description
-%common_desc
+BuildArch:     noarch
+BuildRequires: fontpackages-devel
 
-
-%package common
-Summary:  DejaVu fonts, common files (documentation…)
-Group:    User Interface/X
-
-Obsoletes: dejavu-fonts-doc < 2.26-6
-
-%description common
+%description
 %common_desc
 
-This package consists of files used by other DejaVu packages.
-
 
 %package compat
 Summary: DejaVu fonts, compatibility
@@ -111,18 +76,34 @@
 %compat_desc
 
 
+%package common
+Summary:  DejaVu fonts, common files (documentation…)
+Group:    User Interface/X
+Requires: fontpackages-filesystem
+
+Obsoletes: dejavu-fonts-doc < 2.26-6
+
+%description common
+%common_desc
+
+This package consists of files used by other DejaVu packages.
+
+
 %package sans
 Summary:  DejaVu, variable-width sans-serif font faces
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 
+Conflicts: dejavu-fonts < 2.26-3
+Conflicts: dejavu-fonts-experimental < 2.26-3
+
 %description sans
 %common_desc
 
 This package consists of the DejaVu sans-serif variable-width font faces, in
 their unabridged version.
 
-%font_subpkg -n sans -f *-%{fontname}-sans.conf DejaVuSans.ttf DejaVuSans-*.ttf DejaVuSansCondensed*.ttf
+%_font_pkg -n sans -f *-%{fontname}-sans.conf DejaVuSans.ttf DejaVuSans-*.ttf DejaVuSansCondensed*.ttf
 
 
 %package serif
@@ -130,13 +111,16 @@
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 
+Conflicts: dejavu-fonts < 2.26-3
+Conflicts: dejavu-fonts-experimental < 2.26-3
+
 %description serif
 %common_desc
 
 This package consists of the DejaVu serif variable-width font faces, in their
 unabridged version.
 
-%font_subpkg -n serif -f *-%{fontname}-serif.conf DejaVuSerif.ttf DejaVuSerif-*.ttf DejaVuSerifCondensed*.ttf
+%_font_pkg -n serif -f *-%{fontname}-serif.conf DejaVuSerif.ttf DejaVuSerif-*.ttf DejaVuSerifCondensed*.ttf
 
 
 %package sans-mono
@@ -144,13 +128,16 @@
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 
+Conflicts: dejavu-fonts < 2.26-3
+Conflicts: dejavu-fonts-experimental < 2.26-3
+
 %description sans-mono
 %common_desc
 
 This package consists of the DejaVu sans-serif monospace font faces, in their
 unabridged version.
 
-%font_subpkg -n sans-mono -f *-%{fontname}-sans-mono.conf DejaVuSansMono*.ttf
+%_font_pkg -n sans-mono -f *-%{fontname}-sans-mono.conf DejaVuSansMono*.ttf
 
 
 %package lgc-sans
@@ -158,13 +145,15 @@
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 
+Conflicts: dejavu-lgc-fonts < 2.26-3
+
 %description lgc-sans
 %common_desc
 
 This package consists of the DejaVu sans-serif variable-width font faces, with
 unicode coverage restricted to Latin, Greek and Cyrillic.
 
-%font_subpkg -n lgc-sans -f *-%{fontname}-lgc-sans.conf DejaVuLGCSans.ttf DejaVuLGCSans-*.ttf DejaVuLGCSansCondensed*.ttf
+%_font_pkg -n lgc-sans -f *-%{fontname}-lgc-sans.conf DejaVuLGCSans.ttf DejaVuLGCSans-*.ttf DejaVuLGCSansCondensed*.ttf
 
 
 %package lgc-serif
@@ -172,13 +161,15 @@
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 
+Conflicts: dejavu-lgc-fonts < 2.26-3
+
 %description lgc-serif
 %common_desc
 
 This package consists of the DejaVu serif variable-width font faces, with
 unicode coverage restricted to Latin, Greek and Cyrillic.
 
-%font_subpkg -n lgc-serif -f *-%{fontname}-lgc-serif.conf DejaVuLGCSerif.ttf DejaVuLGCSerif-*.ttf DejaVuLGCSerifCondensed*.ttf
+%_font_pkg -n lgc-serif -f *-%{fontname}-lgc-serif.conf DejaVuLGCSerif.ttf DejaVuLGCSerif-*.ttf DejaVuLGCSerifCondensed*.ttf
 
 
 %package lgc-sans-mono
@@ -186,13 +177,15 @@
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 
+Conflicts: dejavu-lgc-fonts < 2.26-3
+
 %description lgc-sans-mono
 %common_desc
 
 This package consists of the DejaVu sans-serif monospace font faces, with
 unicode coverage restricted to Latin, Greek and Cyrillic.
 
-%font_subpkg -n lgc-sans-mono -f *-%{fontname}-lgc-sans-mono.conf DejaVuLGCSansMono*.ttf
+%_font_pkg -n lgc-sans-mono -f *-%{fontname}-lgc-sans-mono.conf DejaVuLGCSansMono*.ttf
 
 
 %prep
@@ -215,29 +208,53 @@
 %install
 rm -fr %{buildroot}
 
-install -m 0755 -d %{buildroot}%{fontdir}
-install -m 0644 -p build/*.ttf %{buildroot}%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p build/*.ttf %{buildroot}%{_fontdir}
 
-install -m 0755 -d %{buildroot}%{fontconfdir}
-install -m 0644 -p fontconfig/*conf %{buildroot}%{fontconfdir}
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
+
+cd fontconfig
+for fontconf in *conf ; do
+  install -m 0644 -p $fontconf %{buildroot}%{_fontconfig_templatedir}
+  ln -s %{_fontconfig_templatedir}/$fontconf \
+        %{buildroot}%{_fontconfig_confdir}/$fontconf
+done
 
 
 %clean
 rm -fr %{buildroot}
 
+
+%files compat
+%files lgc-compat
+
+
 %files common
 %defattr(0644,root,root,0755)
 %doc AUTHORS BUGS LICENSE NEWS README
 %doc build/unicover.txt build/status.txt.bz2
 
-%dir %{fontdir}/
-
-
-%files compat
-%files lgc-compat
+%dir %{_fontdir}
 
 
 %changelog
+* Sat Dec  6 2008 <nicolas.mailhot at laposte.net>
+- 2.27-7
+ß¹ Add explicit conflicts to help yum
+
+* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
+- 2.27-5
+ᛤ ‘rpm-fonts’ renamed to “fontpackages”
+
+* Tue Nov 12 2008 <nicolas.mailhot at laposte.net>
+- 2.27-4
+▤ Tweak using new « rpm-fonts »
+
+* Mon Nov 10 2008 <nicolas.mailhot at laposte.net>
+- 2.26-7
+▤ Rebuild using new « rpm-fonts »
+
 * Sun Nov 9 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 2.26-6
 ⧎ Package split reorganisation, following font family lines


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	9 Nov 2008 09:06:25 -0000	1.7
+++ import.log	17 Dec 2008 20:11:02 -0000	1.8
@@ -5,3 +5,4 @@
 dejavu-fonts-2_26-4_fc11:HEAD:dejavu-fonts-2.26-4.fc11.src.rpm:1226172743
 dejavu-fonts-2_26-5_fc11:HEAD:dejavu-fonts-2.26-5.fc11.src.rpm:1226174018
 dejavu-fonts-2_26-6_fc11:HEAD:dejavu-fonts-2.26-6.fc11.src.rpm:1226221359
+dejavu-fonts-2_27-7_fc11:HEAD:dejavu-fonts-2.27-7.fc11.src.rpm:1229544635


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	27 Jul 2008 13:35:50 -0000	1.50
+++ sources	17 Dec 2008 20:11:02 -0000	1.51
@@ -1 +1 @@
-26bae23fdfaba1020a88bcbf147ccd79  dejavu-fonts-2.26.tar.bz2
+bcab42220bcc27e094227ad6677d184d  dejavu-fonts-2.27.tar.bz2

More information about the fedora-extras-commits mailing list