rpms/dejavu-fonts/devel .cvsignore, 1.32, 1.33 dejavu-fonts.spec, 1.58, 1.59 sources, 1.32, 1.33
Nicolas Mailhot (nim)
fedora-extras-commits at redhat.com
Sun May 13 21:25:38 UTC 2007
- Previous message (by thread): rpms/dejavu-fonts import.log,1.101,1.102
- Next message (by thread): rpms/cernlib/devel cernlib-122-fix-cdf-file-syntax-errors.dpatch, NONE, 1.1 cernlib-123-extern-memmove-only-if-not-macro.dpatch, NONE, 1.1 .cvsignore, 1.5, 1.6 cernlib-321-support-gfortran.dpatch, 1.2, 1.3 cernlib-800-implement-shared-library-rules-in-Imake.dpatch, 1.1, 1.2 cernlib-fedora_desktop.patch, 1.1, 1.2 cernlib.spec, 1.50, 1.51 paw-806-bump-mathlib-and-dependents-sonames.dpatch, 1.1, 1.2 sources, 1.6, 1.7 cernlib-fedora_script.patch, 1.1, NONE cernlib-fortify.patch, 1.2, NONE cernlib-soname.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nim
Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19711/devel
Modified Files:
.cvsignore dejavu-fonts.spec sources
Log Message:
2.17 final + more cleanups
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore 11 May 2007 13:11:07 -0000 1.32
+++ .cvsignore 13 May 2007 21:25:04 -0000 1.33
@@ -1 +1 @@
-dejavu-sfd-20070509-1766.tar.bz2
+dejavu-sfd-2.17.tar.bz2
Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- dejavu-fonts.spec 11 May 2007 13:49:55 -0000 1.58
+++ dejavu-fonts.spec 13 May 2007 21:25:04 -0000 1.59
@@ -1,26 +1,29 @@
-%define archivename dejavu-sfd
+%define fontname dejavu
+%define fontdir %{_datadir}/fonts/%{fontname}
+%define fontconfdir %{_sysconfdir}/fonts
+
#define alphatag .20070509svn1766
-%define alphatag .rc1
+#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}
+#define archiveversion 20070509-1766
+%define archiveversion %{version}
-%define fontdir %{_datadir}/fonts/%{name}
-%define fontconfdir %{_sysconfdir}/fonts
-# Let the perl maintainer worry about Unicode.org data files (updates, licensingâ¦)
+# 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
-Name: dejavu-fonts
+Name: %{fontname}-fonts
Version: 2.17
-Release: 0.3%{?alphatag}%{?dist}
+Release: 1%{?alphatag}%{?dist}
Summary: DejaVu fonts
Group: User Interface/X
License: Redistributable, with restrictions
-URL: http://dejavu.sf.net/
-Source0: http://dejavu.sourceforge.net/%{?alphatag:snapshots/}%{archivename}-%{archiveversion}.tar.bz2
+URL: http://%{fontname}.sf.net/
+Source0: http://%{fontname}.sourceforge.net/%{?alphatag:snapshots/}%{archivename}-%{archiveversion}.tar.bz2
# DejaVu fontconfig setup
Source1: %{name}-fontconfig.conf
Source2: %{name}-fontconfig-unhint-small.conf
@@ -28,7 +31,8 @@
Source3: %{name}-experimental-fontconfig.conf
Source4: %{name}-experimental-fontconfig-unhint-small.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: fontforge >= 20061019-1
+# Older fontforge versions may not work, current fontforge definitely won't
+BuildRequires: fontforge = 20061220
# The CPAN sources do not declare perl(Font::TTF)
BuildRequires: perl-Font-TTF
# Needed to compute unicode coverage
@@ -46,13 +50,6 @@
# found in older Fedora releases
Conflicts: fontconfig < 2.4.0
-Obsoletes: %{name}-fontconfig < 2.7.0-0.15
-Obsoletes: %{name}-makedefault < 2.9.0-1
-Obsoletes: %{name}-block < 2.9.0-1
-
-Provides: %{name}-makedefault = %{version}
-Provides: %{name}-fontconfig = %{version}
-
%description
The DejaVu fonts are a font family based on the "Bitstream Vera" fonts release
@@ -79,6 +76,7 @@
%prep
%setup -q -n %{archivename}-%{archiveversion}
+
%build
./generate.sh
./status.pl %{version} status.txt *.sfd > status.txt.new
@@ -91,6 +89,8 @@
# but it requires resolution of
# https://bugs.freedesktop.org/show_bug.cgi?id=6316
+# Remove mes files or they end in %doc
+rm mes*.txt
%check
# Current upstream files are full of "problems"
@@ -105,41 +105,42 @@
install -d -m 0755 %{buildroot}%{fontdir}
install -m 0644 generated/*.ttf %{buildroot}%{fontdir}
-# Fontconfig overrides for some scripts
+# Fontconfig tweaks
install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d
-install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/57-dejavu.conf
-install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-dejavu.conf
-install -m 0644 %{SOURCE3} %{buildroot}%{fontconfdir}/conf.d/61-dejavu-experimental.conf
-install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-dejavu-experimental.conf
+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
+
%clean
-/bin/rm -rf %{buildroot}
+/bin/rm -fr %{buildroot}
%post
-if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{_datadir}/fonts
+if [ -x /usr/bin/fc-cache ]; then
+ /usr/bin/fc-cache /usr/share/fonts
fi
%postun
if [ "$1" = "0" ]; then
- if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{_datadir}/fonts
+ if [ -x /usr/bin/fc-cache ]; then
+ /usr/bin/fc-cache /usr/share/fonts
fi
fi
%post experimental
-if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{_datadir}/fonts
+if [ -x /usr/bin/fc-cache ]; then
+ /usr/bin/fc-cache /usr/share/fonts
fi
%postun experimental
if [ "$1" = "0" ]; then
- if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{_datadir}/fonts
+ if [ -x /usr/bin/fc-cache ]; then
+ /usr/bin/fc-cache /usr/share/fonts
fi
fi
@@ -148,8 +149,8 @@
%defattr(0644,root,root,0755)
%doc *.txt AUTHORS BUGS LICENSE NEWS README
-%config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-dejavu.conf
-%config(noreplace) %{fontconfdir}/conf.d/57-dejavu.conf
+%config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-%{fontname}.conf
+%config(noreplace) %{fontconfdir}/conf.d/57-%{fontname}.conf
%dir %{fontdir}
%{fontdir}/DejaVu*.ttf
@@ -161,8 +162,8 @@
%files experimental
%defattr(0644,root,root,0755)
-%config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-dejavu-experimental.conf
-%config(noreplace) %{fontconfdir}/conf.d/61-dejavu-experimental.conf
+%config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-%{fontname}-experimental.conf
+%config(noreplace) %{fontconfdir}/conf.d/61-%{fontname}-experimental.conf
%{fontdir}/DejaVu*Condensed*.ttf
%{fontdir}/DejaVu*ExtraLight*.ttf
@@ -170,6 +171,15 @@
%changelog
+* Sun May 13 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+⺠2.17-1
+â rebase scriptlets from guidelines
+â fontforge broke compat: BR the current version, ask for a version bump
+ before 2.18 is released
+â simplify font directory naming
+â clean up fc5 obsoletes
+â remove technical mes files from doc
+
* Fri May 11 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
⺠2.17-0.3.rc1
â fontconfig setup has stabilized and can be marked noreplace now
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources 11 May 2007 13:11:07 -0000 1.32
+++ sources 13 May 2007 21:25:04 -0000 1.33
@@ -1 +1 @@
-8ac5a2c51a817e1d3480df80a91b9737 dejavu-sfd-20070509-1766.tar.bz2
+829cad0b22bf001df846faff8e6cccf6 dejavu-sfd-2.17.tar.bz2
- Previous message (by thread): rpms/dejavu-fonts import.log,1.101,1.102
- Next message (by thread): rpms/cernlib/devel cernlib-122-fix-cdf-file-syntax-errors.dpatch, NONE, 1.1 cernlib-123-extern-memmove-only-if-not-macro.dpatch, NONE, 1.1 .cvsignore, 1.5, 1.6 cernlib-321-support-gfortran.dpatch, 1.2, 1.3 cernlib-800-implement-shared-library-rules-in-Imake.dpatch, 1.1, 1.2 cernlib-fedora_desktop.patch, 1.1, 1.2 cernlib.spec, 1.50, 1.51 paw-806-bump-mathlib-and-dependents-sonames.dpatch, 1.1, 1.2 sources, 1.6, 1.7 cernlib-fedora_script.patch, 1.1, NONE cernlib-fortify.patch, 1.2, NONE cernlib-soname.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list