2.17 final + more cleanups

This commit is contained in:
nim 2007-05-13 21:25:04 +00:00
parent e6a6351a94
commit 21ca4ed3f0
3 changed files with 52 additions and 42 deletions

View File

@ -1 +1 @@
dejavu-sfd-20070509-1766.tar.bz2 dejavu-sfd-2.17.tar.bz2

View File

@ -1,26 +1,29 @@
%define archivename dejavu-sfd %define fontname dejavu
%define fontdir %{_datadir}/fonts/%{fontname}
#define alphatag .20070509svn1766
%define alphatag .rc1
# This macro has the same value as %{version}, except when testing pre-release snapshots
%define archiveversion 20070509-1766
#define archiveversion %{version}
%define fontdir %{_datadir}/fonts/%{name}
%define fontconfdir %{_sysconfdir}/fonts %define fontconfdir %{_sysconfdir}/fonts
# Let the perl maintainer worry about Unicode.org data files (updates, licensing…)
#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}
# Let the perl maintainer worry about Unicode.org data files
%define Blocks %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt %define Blocks %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt
%define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
Name: dejavu-fonts Name: %{fontname}-fonts
Version: 2.17 Version: 2.17
Release: 0.3%{?alphatag}%{?dist} Release: 1%{?alphatag}%{?dist}
Summary: DejaVu fonts Summary: DejaVu fonts
Group: User Interface/X Group: User Interface/X
License: Redistributable, with restrictions License: Redistributable, with restrictions
URL: http://dejavu.sf.net/ URL: http://%{fontname}.sf.net/
Source0: http://dejavu.sourceforge.net/%{?alphatag:snapshots/}%{archivename}-%{archiveversion}.tar.bz2 Source0: http://%{fontname}.sourceforge.net/%{?alphatag:snapshots/}%{archivename}-%{archiveversion}.tar.bz2
# DejaVu fontconfig setup # DejaVu fontconfig setup
Source1: %{name}-fontconfig.conf Source1: %{name}-fontconfig.conf
Source2: %{name}-fontconfig-unhint-small.conf Source2: %{name}-fontconfig-unhint-small.conf
@ -28,7 +31,8 @@ Source2: %{name}-fontconfig-unhint-small.conf
Source3: %{name}-experimental-fontconfig.conf Source3: %{name}-experimental-fontconfig.conf
Source4: %{name}-experimental-fontconfig-unhint-small.conf Source4: %{name}-experimental-fontconfig-unhint-small.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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) # The CPAN sources do not declare perl(Font::TTF)
BuildRequires: perl-Font-TTF BuildRequires: perl-Font-TTF
# Needed to compute unicode coverage # Needed to compute unicode coverage
@ -46,13 +50,6 @@ BuildArch: noarch
# found in older Fedora releases # found in older Fedora releases
Conflicts: fontconfig < 2.4.0 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 %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
@ -79,6 +76,7 @@ This package includes the typefaces the DejaVu project considers experimental.
%prep %prep
%setup -q -n %{archivename}-%{archiveversion} %setup -q -n %{archivename}-%{archiveversion}
%build %build
./generate.sh ./generate.sh
./status.pl %{version} status.txt *.sfd > status.txt.new ./status.pl %{version} status.txt *.sfd > status.txt.new
@ -91,6 +89,8 @@ mv status.txt.new status.txt
# but it requires resolution of # but it requires resolution of
# https://bugs.freedesktop.org/show_bug.cgi?id=6316 # https://bugs.freedesktop.org/show_bug.cgi?id=6316
# Remove mes files or they end in %doc
rm mes*.txt
%check %check
# Current upstream files are full of "problems" # Current upstream files are full of "problems"
@ -105,41 +105,42 @@ mv status.txt.new status.txt
install -d -m 0755 %{buildroot}%{fontdir} install -d -m 0755 %{buildroot}%{fontdir}
install -m 0644 generated/*.ttf %{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 -d -m 0755 %{buildroot}%{fontconfdir}/conf.d
install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/57-dejavu.conf install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/57-%{fontname}.conf
install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-dejavu.conf install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-%{fontname}.conf
install -m 0644 %{SOURCE3} %{buildroot}%{fontconfdir}/conf.d/61-dejavu-experimental.conf install -m 0644 %{SOURCE3} %{buildroot}%{fontconfdir}/conf.d/61-%{fontname}-experimental.conf
install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-dejavu-experimental.conf install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-%{fontname}-experimental.conf
%clean %clean
/bin/rm -rf %{buildroot} /bin/rm -fr %{buildroot}
%post %post
if [ -x %{_bindir}/fc-cache ]; then if [ -x /usr/bin/fc-cache ]; then
%{_bindir}/fc-cache %{_datadir}/fonts /usr/bin/fc-cache /usr/share/fonts
fi fi
%postun %postun
if [ "$1" = "0" ]; then if [ "$1" = "0" ]; then
if [ -x %{_bindir}/fc-cache ]; then if [ -x /usr/bin/fc-cache ]; then
%{_bindir}/fc-cache %{_datadir}/fonts /usr/bin/fc-cache /usr/share/fonts
fi fi
fi fi
%post experimental %post experimental
if [ -x %{_bindir}/fc-cache ]; then if [ -x /usr/bin/fc-cache ]; then
%{_bindir}/fc-cache %{_datadir}/fonts /usr/bin/fc-cache /usr/share/fonts
fi fi
%postun experimental %postun experimental
if [ "$1" = "0" ]; then if [ "$1" = "0" ]; then
if [ -x %{_bindir}/fc-cache ]; then if [ -x /usr/bin/fc-cache ]; then
%{_bindir}/fc-cache %{_datadir}/fonts /usr/bin/fc-cache /usr/share/fonts
fi fi
fi fi
@ -148,8 +149,8 @@ fi
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%doc *.txt AUTHORS BUGS LICENSE NEWS README %doc *.txt AUTHORS BUGS LICENSE NEWS README
%config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-dejavu.conf %config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-%{fontname}.conf
%config(noreplace) %{fontconfdir}/conf.d/57-dejavu.conf %config(noreplace) %{fontconfdir}/conf.d/57-%{fontname}.conf
%dir %{fontdir} %dir %{fontdir}
%{fontdir}/DejaVu*.ttf %{fontdir}/DejaVu*.ttf
@ -161,8 +162,8 @@ fi
%files experimental %files experimental
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-dejavu-experimental.conf %config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-%{fontname}-experimental.conf
%config(noreplace) %{fontconfdir}/conf.d/61-dejavu-experimental.conf %config(noreplace) %{fontconfdir}/conf.d/61-%{fontname}-experimental.conf
%{fontdir}/DejaVu*Condensed*.ttf %{fontdir}/DejaVu*Condensed*.ttf
%{fontdir}/DejaVu*ExtraLight*.ttf %{fontdir}/DejaVu*ExtraLight*.ttf
@ -170,6 +171,15 @@ fi
%changelog %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> * Fri May 11 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
2.17-0.3.rc1 2.17-0.3.rc1
fontconfig setup has stabilized and can be marked noreplace now fontconfig setup has stabilized and can be marked noreplace now

View File

@ -1 +1 @@
8ac5a2c51a817e1d3480df80a91b9737 dejavu-sfd-20070509-1766.tar.bz2 829cad0b22bf001df846faff8e6cccf6 dejavu-sfd-2.17.tar.bz2