more cleanups

This commit is contained in:
nim 2007-10-25 18:31:44 +00:00
parent d38c0cc031
commit b2b98c5446
6 changed files with 216 additions and 341 deletions

View File

@ -1 +1 @@
dejavu-sfd-20071017-2019.tar.bz2
dejavu-sfd-20071025-2022.tar.bz2

View File

@ -1,8 +1,17 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- /etc/fonts/conf.d/20-unhint-small-dejavu-lgc.conf -->
<fontconfig>
<!-- Turn off hinting at small sizes -->
<!-- /etc/fonts/conf.d/20-unhint-small-dejavu-lgc.conf
Disable hinting manually at smaller sizes (< 8ppem)
This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
derived from Vera.
The Bistream Vera fonts have GASP entries suggesting that hinting be
disabled below 8 ppem, but FreeType ignores those, preferring to use
the data found in the instructed hints. The initial Vera release
didn't include the right instructions in the 'prep' table.
-->
<match target="font">
<test name="family">
<string>DejaVu LGC Sans</string>

View File

@ -1,8 +1,23 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- /etc/fonts/conf.d/58-dejavu-lgc-fonts.conf -->
<!-- /etc/fonts/conf.d/58-DejaVu LGC.conf
Define aliasing and other fontconfig settings for
DejaVu LGC
© 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
-->
<fontconfig>
<!-- Alias Bitstream Vera -->
<!-- Declare DejaVu LGC Sans a valid substitute for all known Bitstream Vera Sans
derivatives which kept original metrics -->
<match>
<test name="family">
<string>Bitstream Prima Sans</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans</string>
</edit>
</match>
<match>
<test name="family">
<string>Bitstream Vera Sans</string>
@ -11,6 +26,81 @@
<string>DejaVu LGC Sans</string>
</edit>
</match>
<match>
<test name="family">
<string>DejaVu Sans</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans</string>
</edit>
</match>
<match>
<test name="family">
<string>Arev Sans</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans</string>
</edit>
</match>
<match>
<test name="family">
<string>SUSE Sans</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans</string>
</edit>
</match>
<match>
<test name="family">
<string>Hunky Sans</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans</string>
</edit>
</match>
<match>
<test name="family">
<string>Verajja</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans</string>
</edit>
</match>
<!-- In case VerajjaPDA stops declaring itself as Verajja -->
<match>
<test name="family">
<string>VerajjaPDA</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans</string>
</edit>
</match>
<match>
<test name="family">
<string>Bepa</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans</string>
</edit>
</match>
<match>
<test name="family">
<string>Olwen Sans</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans</string>
</edit>
</match>
<!-- Declare DejaVu LGC Serif a valid substitute for all known Bitstream Vera Serif
derivatives which kept the original metrics -->
<match>
<test name="family">
<string>Bitstream Prima Serif</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Serif</string>
</edit>
</match>
<match>
<test name="family">
<string>Bitstream Vera Serif</string>
@ -21,27 +111,61 @@
</match>
<match>
<test name="family">
<string>Bitstream Vera Sans Mono</string>
<string>DejaVu Serif</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Serif</string>
</edit>
</match>
<match>
<test name="family">
<string>SUSE Serif</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Serif</string>
</edit>
</match>
<match>
<test name="family">
<string>Hunky Serif</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Serif</string>
</edit>
</match>
<!-- In case Verajja Serif stops declaring itself as DejaVu LGC Serif -->
<match>
<test name="family">
<string>Verajja Serif</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Serif</string>
</edit>
</match>
<match>
<test name="family">
<string>Olwen Serif</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Serif</string>
</edit>
</match>
<!-- Declare DejaVu LGC Sans Mono a valid substitute for all known Bitstream Vera
Sans Mono derivatives which kept the original metrics -->
<match>
<test name="family">
<string>Bitstream Prima Sans Mono</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans Mono</string>
</edit>
</match>
<!-- Alias DejaVu -->
<match>
<test name="family">
<string>DejaVu Sans</string>
<string>Bitstream Vera Sans Mono</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans</string>
</edit>
</match>
<match>
<test name="family">
<string>DejaVu Serif</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Serif</string>
<string>DejaVu LGC Sans Mono</string>
</edit>
</match>
<match>
@ -54,12 +178,29 @@
</match>
<match>
<test name="family">
<string>DejaVu Sans Light</string>
<string>SUSE Sans Mono</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans Light</string>
<string>DejaVu LGC Sans Mono</string>
</edit>
</match>
<match>
<test name="family">
<string>Bepa Mono</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans Mono</string>
</edit>
</match>
<match>
<test name="family">
<string>Olwen Sans Mono</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans Mono</string>
</edit>
</match>
<!-- Condensed families -->
<match>
<test name="family">
<string>DejaVu Sans Condensed</string>
@ -68,6 +209,14 @@
<string>DejaVu LGC Sans Condensed</string>
</edit>
</match>
<match>
<test name="family">
<string>Toga Sans</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Sans Condensed</string>
</edit>
</match>
<match>
<test name="family">
<string>DejaVu Serif Condensed</string>
@ -76,6 +225,14 @@
<string>DejaVu LGC Serif Condensed</string>
</edit>
</match>
<match>
<test name="family">
<string>Toga Serif</string>
</test>
<edit name="family" mode="append" binding="same">
<string>DejaVu LGC Serif Condensed</string>
</edit>
</match>
<!-- Assign generic name -->
<alias>
<family>DejaVu LGC Sans</family>

View File

@ -1,295 +0,0 @@
diff -uNr dejavu-sfd-20071014-2016.orig/generate.pe dejavu-sfd-20071014-2016/generate.pe
--- dejavu-sfd-20071014-2016.orig/generate.pe 2007-10-14 05:57:03.000000000 +0200
+++ dejavu-sfd-20071014-2016/generate.pe 2007-10-22 19:36:45.000000000 +0200
@@ -37,7 +37,7 @@
if (Strcasestr ($fontname, "ExtraLight") > -1)
gen_flags = exp_gen_flags
endif
- Generate("generated/" + $fontname + ".ttf", "", gen_flags)
+ Generate( $curfont + ".ttf", "", gen_flags)
Close()
i++
endloop
diff -uNr dejavu-sfd-20071014-2016.orig/generate.sh dejavu-sfd-20071014-2016/generate.sh
--- dejavu-sfd-20071014-2016.orig/generate.sh 2007-10-14 05:57:03.000000000 +0200
+++ dejavu-sfd-20071014-2016/generate.sh 2007-10-22 19:35:41.000000000 +0200
@@ -6,4 +6,7 @@
test -d generated || mkdir generated
./generate.pe *.sfd
+for ttf in *.sfd.ttf ; do
+ mv $ttf generated/$(echo $ttf|sed s+"\.sfd\.ttf+.ttf+g")
+done
./ttpostproc.pl generated/*.ttf
diff -uNr dejavu-sfd-20071014-2016.orig/Makefile dejavu-sfd-20071014-2016/Makefile
--- dejavu-sfd-20071014-2016.orig/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ dejavu-sfd-20071014-2016/Makefile 2007-10-22 19:36:45.000000000 +0200
@@ -0,0 +1,255 @@
+.PHONY: all full sans lgc ttf full-ttf sans-ttf lgc-ttf dist src-dist full-dist sans-dist lgc-dist check full-check sans-check lgc-check clean
+
+# Release version
+VERSION = 2.21
+# Snapshot version
+SNAPSHOT =
+# Initial source directory, assumed read-only
+SRCDIR = ./
+# Directory where temporary files live
+TMPDIR = tmp/
+# Directory where final files are created
+BUILDDIR = build/
+# Directory where final archives are created
+DISTDIR = dist/
+
+ifeq "$(SNAPSHOT)" ""
+ARCHIVEVER = $(VERSION)
+else
+ARCHIVEVER = $(VERSION)-$(SNAPSHOT)
+endif
+
+SRCARCHIVE = dejavu-fonts-$(ARCHIVEVER)
+FULLARCHIVE = dejavu-fonts-ttf-$(ARCHIVEVER)
+SANSARCHIVE = dejavu-sans-ttf-$(ARCHIVEVER)
+LGCARCHIVE = dejavu-lgc-fonts-ttf-$(ARCHIVEVER)
+
+
+OLDSTATUS = ./status.txt
+BLOCKS = ./Blocks.txt
+UNICODEDATA = ./UnicodeData.txt
+FC-LANG = ./fc-lang
+
+GENERATE = ./generate.pe
+TTPOSTPROC = ./ttpostproc.pl
+LGC = ./lgc.pe
+UNICOVER = ./unicover.pl
+LANGCOVER = ./langcover.pl
+STATUS = ./status.pl
+PROBLEMS = ./problems.pl
+
+SRC := $(wildcard $(SRCDIR)*.sfd)
+FULLSFD := $(patsubst $(SRCDIR)%.sfd, $(TMPDIR)%.sfd, $(SRC))
+LGCSFD := $(patsubst $(SRCDIR)DejaVu%.sfd, $(TMPDIR)DejaVuLGC%.sfd, $(SRC))
+FULLTTF := $(patsubst $(TMPDIR)%.sfd, $(BUILDDIR)%.ttf, $(FULLSFD))
+LGCTTF := $(patsubst $(TMPDIR)%.sfd, $(BUILDDIR)%.ttf, $(LGCSFD))
+
+all : full sans lgc
+
+$(TMPDIR)%.sfd: $(SRCDIR)%.sfd
+ @echo "[1] $< => $@"
+ install -d $(dir $@)
+ sed "s@\(Version:\? \)\(0\.[0-9]\+\.[0-9]\+\|[1-9][0-9]*\.[0-9]\+\)@\1$(VERSION)@" $< > $@
+ touch -r $< $@
+
+$(TMPDIR)DejaVuLGC%.sfd: $(TMPDIR)DejaVu%.sfd
+ @echo "[2] $< => $@"
+ sed -e 's,FontName: DejaVu,FontName: DejaVuLGC,'\
+ -e 's,FullName: DejaVu,FullName: DejaVu LGC,'\
+ -e 's,FamilyName: DejaVu,FamilyName: DejaVu LGC,'\
+ -e 's,"DejaVu \(\(Sans\|Serif\)*\( Condensed\| Mono\)*\( Bold\)*\( Oblique\|Italic\)*\)","DejaVu LGC \1",g' < $< > $@
+ @echo "Stripping unwanted glyphs from $@"
+ $(LGC) $@
+ touch -r $< $@
+
+$(BUILDDIR)%.ttf: $(TMPDIR)%.sfd
+ @echo "[3] $< => $@"
+ install -d $(dir $@)
+ $(GENERATE) $<
+ mv $<.ttf $@
+ $(TTPOSTPROC) $@
+ $(RM) $@~
+ touch -r $< $@
+
+$(BUILDDIR)status.txt: $(FULLSFD)
+ @echo "[4] => $@"
+ install -d $(dir $@)
+ $(STATUS) $(VERSION) $(OLDSTATUS) $(FULLSFD) > $@
+
+$(BUILDDIR)unicover.txt: $(TMPDIR)DejaVuSans.sfd $(TMPDIR)DejaVuSerif.sfd $(TMPDIR)DejaVuMonoSans.sfd
+ @echo "[5] => $@"
+ install -d $(dir $@)
+ $(UNICOVER) $(UNICODEDATA) $(BLOCKS) \
+ $(TMPDIR)DejaVuSans.sfd "Sans" \
+ $(TMPDIR)DejaVuSerif.sfd "Serif" \
+ $(TMPDIR)DejaVuMonoSans.sfd "Sans Mono" > $@
+
+$(BUILDDIR)unicover-sans.txt: $(TMPDIR)DejaVuSans.sfd
+ @echo "[5] => $@"
+ install -d $(dir $@)
+ $(UNICOVER) $(UNICODEDATA) $(BLOCKS) \
+ $(TMPDIR)DejaVuSans.sfd "Sans" > $@
+
+$(BUILDDIR)unicover-lgc.txt: $(TMPDIR)DejaVuLGCSans.sfd $(TMPDIR)DejaVuLGCSerif.sfd $(TMPDIR)DejaVuLGCMonoSans.sfd
+ @echo "[5] => $@"
+ install -d $(dir $@)
+ $(UNICOVER) $(UNICODEDATA) $(BLOCKS) \
+ $(TMPDIR)DejaVuLGCSans.sfd "Sans" \
+ $(TMPDIR)DejaVuLGCSerif.sfd "Serif" \
+ $(TMPDIR)DejaVuLGCMonoSans.sfd "Sans Mono" > $@
+
+$(BUILDDIR)langcover.txt: $(TMPDIR)DejaVuSans.sfd $(TMPDIR)DejaVuSerif.sfd $(TMPDIR)DejaVuMonoSans.sfd
+ @echo "[6] => $@"
+ install -d $(dir $@)
+ifeq "$(FC-LANG)" ""
+ touch $@
+else
+ $(LANGCOVER) $(FC-LANG) \
+ $(TMPDIR)DejaVuSans.sfd "Sans" \
+ $(TMPDIR)DejaVuSerif.sfd "Serif" \
+ $(TMPDIR)DejaVuMonoSans.sfd "Sans Mono" > $@
+endif
+
+$(BUILDDIR)langcover-sans.txt: $(TMPDIR)DejaVuSans.sfd
+ @echo "[6] => $@"
+ install -d $(dir $@)
+ifeq "$(FC-LANG)" ""
+ touch $@
+else
+ $(LANGCOVER) $(FC-LANG) \
+ $(TMPDIR)DejaVuSans.sfd "Sans" > $@
+endif
+
+$(BUILDDIR)langcover-lgc.txt: $(TMPDIR)DejaVuLGCSans.sfd $(TMPDIR)DejaVuLGCSerif.sfd $(TMPDIR)DejaVuLGCMonoSans.sfd
+ @echo "[6] => $@"
+ install -d $(dir $@)
+ifeq "$(FC-LANG)" ""
+ touch $@
+else
+ $(LANGCOVER) $(FC-LANG) \
+ $(TMPDIR)DejaVuLGCSans.sfd "Sans" \
+ $(TMPDIR)DejaVuLGCSerif.sfd "Serif" \
+ $(TMPDIR)DejaVuLGCMonoSans.sfd "Sans Mono" > $@
+endif
+
+$(BUILDDIR)Makefile: Makefile
+ @echo "[7] => $@"
+ install -d $(dir $@)
+ sed -e "s+^VERSION\([[:space:]]*\)=\(.*\)+VERSION = $(VERSION)+g"\
+ -e "s+^SNAPSHOT\([[:space:]]*\)=\(.*\)+SNAPSHOT = $(SNAPSHOT)+g" < $< > $@
+ touch -r $< $@
+
+$(TMPDIR)$(SRCARCHIVE): $(BUILDDIR)unicover.txt $(BUILDDIR)langcover.txt $(BUILDDIR)Makefile
+ @echo "[8] => $@"
+ install -d -m 0755 $@
+ install -p -m 0755 $(GENERATE) $(TTPOSTPROC) $(LGC) \
+ $(UNICOVER) $(LANGCOVER) $(STATUS) $(PROBLEMS) \
+ $@
+ install -p -m 0644 $(FULLSFD) \
+ $(BUILDDIR)Makefile \
+ $(BUILDDIR)unicover.txt \
+ $(BUILDDIR)langcover.txt \
+ $(BUILDDIR)status.txt \
+ AUTHORS BUGS LICENSE NEWS README \
+ $@
+
+$(TMPDIR)$(FULLARCHIVE): full
+ @echo "[8] => $@"
+ install -d -m 0755 $@/{doc,ttf}
+ install -p -m 0644 $(FULLTTF) $@/ttf
+ install -p -m 0644 $(BUILDDIR)unicover.txt \
+ $(BUILDDIR)langcover.txt \
+ $(BUILDDIR)status.txt \
+ AUTHORS BUGS LICENSE NEWS README \
+ $@/doc
+
+$(TMPDIR)$(SANSARCHIVE): sans
+ @echo "[8] => $@"
+ install -d -m 0755 $@/{doc,ttf}
+ install -p -m 0644 $(BUILDDIR)DejaVuSans.ttf $@/ttf
+ install -p -m 0644 $(BUILDDIR)unicover-sans.txt \
+ $(BUILDDIR)langcover-sans.txt \
+ AUTHORS BUGS LICENSE NEWS README \
+ $@/doc
+
+$(TMPDIR)$(LGCARCHIVE): lgc
+ @echo "[8] => $@"
+ install -d -m 0755 $@/{doc,ttf}
+ install -p -m 0644 $(LGCTTF) $@/ttf
+ install -p -m 0644 $(BUILDDIR)unicover-lgc.txt \
+ $(BUILDDIR)langcover-lgc.txt \
+ AUTHORS BUGS LICENSE NEWS README \
+ $@/doc
+
+$(DISTDIR)%.zip: $(TMPDIR)%
+ @echo "[9] => $@"
+ install -d $(dir $@)
+ (cd $(TMPDIR); zip -rv $(abspath $@) $(notdir $<))
+
+$(DISTDIR)%.tar.bz2: $(TMPDIR)%
+ @echo "[9] => $@"
+ install -d $(dir $@)
+ (cd $(TMPDIR); tar cjvf $(abspath $@) $(notdir $<))
+
+%.md5: %
+ @echo "[10] => $@"
+ (cd $(dir $<); md5sum -b $(notdir $<) > $(abspath $@))
+
+%.sha512: %
+ @echo "[10] => $@"
+ (cd $(dir $<); sha512sum -b $(notdir $<) > $(abspath $@))
+
+full : $(FULLTTF) $(BUILDDIR)unicover.txt $(BUILDDIR)langcover.txt $(BUILDDIR)status.txt
+
+sans : $(BUILDDIR)DejaVuSans.ttf $(BUILDDIR)unicover-sans.txt $(BUILDDIR)langcover-sans.txt
+
+lgc : $(LGCTTF) $(BUILDDIR)unicover-lgc.txt $(BUILDDIR)langcover-lgc.txt
+
+ttf : full-ttf sans-ttf lgc-ttf
+
+full-ttf : $(FULLTTF)
+
+sans-ttf: $(BUILDDIR)DejaVuSans.ttf
+
+lgc-ttf : $(LGCTTF)
+
+dist : src-dist full-dist sans-dist lgc-dist
+
+src-dist : $(DISTDIR)$(SRCARCHIVE).zip \
+ $(DISTDIR)$(SRCARCHIVE).zip.md5 \
+ $(DISTDIR)$(SRCARCHIVE).zip.sha512 \
+ $(DISTDIR)$(SRCARCHIVE).tar.bz2 \
+ $(DISTDIR)$(SRCARCHIVE).tar.bz2.md5 \
+ $(DISTDIR)$(SRCARCHIVE).tar.bz2.sha512
+
+full-dist : $(DISTDIR)$(FULLARCHIVE).zip \
+ $(DISTDIR)$(FULLARCHIVE).zip.md5 \
+ $(DISTDIR)$(FULLARCHIVE).zip.sha512 \
+ $(DISTDIR)$(FULLARCHIVE).tar.bz2 \
+ $(DISTDIR)$(FULLARCHIVE).tar.bz2.md5 \
+ $(DISTDIR)$(FULLARCHIVE).tar.bz2.sha512
+
+sans-dist: $(DISTDIR)$(SANSARCHIVE).zip \
+ $(DISTDIR)$(SANSARCHIVE).zip.md5 \
+ $(DISTDIR)$(SANSARCHIVE).zip.sha512
+
+lgc-dist : $(DISTDIR)$(LGCARCHIVE).zip \
+ $(DISTDIR)$(LGCARCHIVE).zip.md5 \
+ $(DISTDIR)$(LGCARCHIVE).zip.sha512 \
+ $(DISTDIR)$(LGCARCHIVE).tar.bz2 \
+ $(DISTDIR)$(LGCARCHIVE).tar.bz2.md5 \
+ $(DISTDIR)$(LGCARCHIVE).tar.bz2.sha512
+
+check : full-check
+
+full-check : $(FULLSFD)
+ $(PROBLEMS) $<
+
+sans-check : $(TMPDIR)DejaVuSans.sfd
+ $(PROBLEMS) $<
+
+lgc-check : $(LGCSFD)
+ $(PROBLEMS) $<
+
+clean :
+ $(RM) -r $(TMPDIR) $(BUILDDIR) $(DISTDIR)
diff -uNr dejavu-sfd-20071014-2016.orig/makelgc.sh dejavu-sfd-20071014-2016/makelgc.sh
--- dejavu-sfd-20071014-2016.orig/makelgc.sh 2007-10-14 05:57:03.000000000 +0200
+++ dejavu-sfd-20071014-2016/makelgc.sh 2007-10-22 19:35:31.000000000 +0200
@@ -30,6 +30,9 @@
echo "Generating TTF"
mkdir generated
../generate.pe *.sfd
+for ttf in *.sfd.ttf ; do
+ mv $ttf generated/$(echo $ttf|sed s+"\.sfd\.ttf+.ttf+g")
+done
../ttpostproc.pl generated/*.ttf
../unicover.pl ../UnicodeData.txt ../Blocks.txt DejaVuLGCSans.sfd Sans DejaVuLGCSerif.sfd Serif DejaVuLGCMonoSans.sfd 'Sans Mono' > unicover.txt
../langcover.pl ../fc-lang DejaVuLGCSans.sfd Sans DejaVuLGCSerif.sfd Serif DejaVuLGCMonoSans.sfd 'Sans Mono' > langcover.txt

View File

@ -1,13 +1,13 @@
%define fontname dejavu
%define fontdir %{_datadir}/fonts/%{fontname}/
%define fontconfdir %{_sysconfdir}/fonts/conf.d/
%define fontdir %{_datadir}/fonts/%{fontname}
%define fontconfdir %{_sysconfdir}/fonts/conf.d
%define archivename %{fontname}-sfd-%{archiveversion}
%define alphatag .20071017svn2019
%define alphatag .20071025svn2022
#define alphatag .rc1
%define archiveversion 20071017-2019
%define archiveversion 20071025-2022
#define archiveversion %{version}
@ -17,7 +17,7 @@
Name: %{fontname}-fonts
Version: 2.21
Release: 0.2%{?alphatag}%{?dist}
Release: 0.3%{?alphatag}%{?dist}
Summary: DejaVu fonts, mature typefaces
Group: User Interface/X
@ -35,8 +35,6 @@ Source4: %{name}-experimental-fontconfig-unhint-small.conf
Source5: %{name}-lgc-fontconfig.conf
Source6: %{name}-lgc-fontconfig-unhint-small.conf
Patch0: %{name}-makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Older fontforge versions will not work due to sfd format changes
BuildRequires: fontforge > 20070501
@ -87,7 +85,6 @@ Cyrillic glyphs.
%prep
%setup -q -n %{archivename}
%patch0 -p1 -b .make
%build
@ -107,12 +104,12 @@ install -m 0644 -p build/*.ttf %{buildroot}%{fontdir}
# Fontconfig tweaks
install -m 0755 -d %{buildroot}%{fontconfdir}
install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}57-%{fontname}.conf
install -m 0644 -p %{SOURCE2} %{buildroot}%{fontconfdir}20-unhint-small-%{fontname}.conf
install -m 0644 -p %{SOURCE3} %{buildroot}%{fontconfdir}61-%{fontname}-experimental.conf
install -m 0644 -p %{SOURCE4} %{buildroot}%{fontconfdir}20-unhint-small-%{fontname}-experimental.conf
install -m 0644 -p %{SOURCE5} %{buildroot}%{fontconfdir}58-%{fontname}-lgc.conf
install -m 0644 -p %{SOURCE6} %{buildroot}%{fontconfdir}20-unhint-small-%{fontname}-lgc.conf
install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/57-%{fontname}.conf
install -m 0644 -p %{SOURCE2} %{buildroot}%{fontconfdir}/20-unhint-small-%{fontname}.conf
install -m 0644 -p %{SOURCE3} %{buildroot}%{fontconfdir}/61-%{fontname}-experimental.conf
install -m 0644 -p %{SOURCE4} %{buildroot}%{fontconfdir}/20-unhint-small-%{fontname}-experimental.conf
install -m 0644 -p %{SOURCE5} %{buildroot}%{fontconfdir}/58-%{fontname}-lgc.conf
install -m 0644 -p %{SOURCE6} %{buildroot}%{fontconfdir}/20-unhint-small-%{fontname}-lgc.conf
%clean
@ -121,42 +118,42 @@ rm -fr %{buildroot}
%post
if [ -x %{_bindir}/fc-cache ]; then
%{_bindir}/fc-cache %{fontdir}
%{_bindir}/fc-cache -f %{fontdir}
fi
%postun
if [ "$1" = "0" ]; then
if [ -x %{_bindir}/fc-cache ]; then
%{_bindir}/fc-cache %{fontdir}
%{_bindir}/fc-cache -f %{fontdir}
fi
fi
%post experimental
if [ -x %{_bindir}/fc-cache ]; then
%{_bindir}/fc-cache %{fontdir}
%{_bindir}/fc-cache -f %{fontdir}
fi
%postun experimental
if [ "$1" = "0" ]; then
if [ -x %{_bindir}/fc-cache ]; then
%{_bindir}/fc-cache %{fontdir}
%{_bindir}/fc-cache -f %{fontdir}
fi
fi
%post -n %{fontname}-lgc-fonts
if [ -x %{_bindir}/fc-cache ]; then
%{_bindir}/fc-cache %{fontdir}
%{_bindir}/fc-cache -f %{fontdir}
fi
%postun -n %{fontname}-lgc-fonts
if [ "$1" = "0" ]; then
if [ -x %{_bindir}/fc-cache ]; then
%{_bindir}/fc-cache %{fontdir}
%{_bindir}/fc-cache -f %{fontdir}
fi
fi
@ -167,8 +164,8 @@ fi
%doc AUTHORS BUGS LICENSE NEWS README
%doc build/unicover.txt build/langcover.txt build/status.txt
%config(noreplace) %{fontconfdir}20-unhint-small-%{fontname}.conf
%config(noreplace) %{fontconfdir}57-%{fontname}.conf
%config(noreplace) %{fontconfdir}/20-unhint-small-%{fontname}.conf
%config(noreplace) %{fontconfdir}/57-%{fontname}.conf
%dir %{fontdir}
%{fontdir}/*.ttf
@ -181,8 +178,8 @@ fi
%files experimental
%defattr(0644,root,root,0755)
%config(noreplace) %{fontconfdir}20-unhint-small-%{fontname}-experimental.conf
%config(noreplace) %{fontconfdir}61-%{fontname}-experimental.conf
%config(noreplace) %{fontconfdir}/20-unhint-small-%{fontname}-experimental.conf
%config(noreplace) %{fontconfdir}/61-%{fontname}-experimental.conf
%{fontdir}/DejaVu*Condensed*.ttf
%{fontdir}/DejaVu*ExtraLight*.ttf
@ -194,14 +191,21 @@ fi
%doc AUTHORS BUGS LICENSE NEWS README
%doc build/unicover-lgc.txt build/langcover-lgc.txt
%config(noreplace) %{fontconfdir}20-unhint-small-%{fontname}-lgc.conf
%config(noreplace) %{fontconfdir}58-%{fontname}-lgc.conf
%config(noreplace) %{fontconfdir}/20-unhint-small-%{fontname}-lgc.conf
%config(noreplace) %{fontconfdir}/58-%{fontname}-lgc.conf
%dir %{fontdir}
%{fontdir}/DejaVuLGC*.ttf
%changelog
* Wed Oct 25 2007 <nicolas.mailhot at laposte.net>
2.21-0.3.20071025svn2022
Makefile patch dropped upstream
add -f to fc-cache calls
completely align LGC and FULL fontconfig rules
remove / from directory macros
* Sun Oct 21 2007 <nicolas.mailhot at laposte.net>
2.21-0.2.20071017svn2019
Still very experimental version:

View File

@ -1 +1 @@
f4f050827222c3e94d679c97e5e1cb1e dejavu-sfd-20071017-2019.tar.bz2
6461152f93e7a0ea59b423bb343c8154 dejavu-sfd-20071025-2022.tar.bz2