rpms/dejavu-fonts/devel dejavu-fonts-lgc-fontconfig-unhint-small.conf, NONE, 1.1 .cvsignore, 1.39, 1.40 dejavu-fonts-lgc-fontconfig.conf, 1.1, 1.2 dejavu-fonts-makefile.patch, 1.1, 1.2 dejavu-fonts.spec, 1.69, 1.70 sources, 1.39, 1.40

Nicolas Mailhot (nim) fedora-extras-commits at redhat.com
Mon Oct 22 19:17:10 UTC 2007


Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18475/devel

Modified Files:
	.cvsignore dejavu-fonts-lgc-fontconfig.conf 
	dejavu-fonts-makefile.patch dejavu-fonts.spec sources 
Added Files:
	dejavu-fonts-lgc-fontconfig-unhint-small.conf 
Log Message:
more lgc cleanups


--- NEW FILE dejavu-fonts-lgc-fontconfig-unhint-small.conf ---
<?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 -->
  <match target="font">
    <test name="family">
      <string>DejaVu LGC Sans</string>
    </test>
    <test name="pixelsize" compare="less">
      <double>7.5</double>
    </test>
    <edit name="hinting">
      <bool>false</bool>
    </edit>
  </match>
  <match target="font">
    <test name="family">
      <string>DejaVu LGC Serif</string>
    </test>
    <test name="pixelsize" compare="less">
      <double>7.5</double>
    </test>
    <edit name="hinting">
      <bool>false</bool>
    </edit>
  </match>
  <match target="font">
    <test name="family">
      <string>DejaVu LGC Sans Mono</string>
    </test>
    <test name="pixelsize" compare="less">
      <double>7.5</double>
    </test>
    <edit name="hinting">
      <bool>false</bool>
    </edit>
  </match>
  <match target="font">
    <test name="family">
      <string>DejaVu LGC Sans Condensed</string>
    </test>
    <test name="pixelsize" compare="less">
      <double>7.5</double>
    </test>
    <edit name="hinting">
      <bool>false</bool>
    </edit>
  </match>
  <match target="font">
    <test name="family">
      <string>DejaVu LGC Serif Condensed</string>
    </test>
    <test name="pixelsize" compare="less">
      <double>7.5</double>
    </test>
    <edit name="hinting">
      <bool>false</bool>
    </edit>
  </match>
</fontconfig>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	21 Oct 2007 20:55:29 -0000	1.39
+++ .cvsignore	22 Oct 2007 19:16:34 -0000	1.40
@@ -1 +1 @@
-dejavu-sfd-20071014-2016.tar.bz2
+dejavu-sfd-20071017-2019.tar.bz2


Index: dejavu-fonts-lgc-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts-lgc-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dejavu-fonts-lgc-fontconfig.conf	21 Oct 2007 20:55:29 -0000	1.1
+++ dejavu-fonts-lgc-fontconfig.conf	22 Oct 2007 19:16:34 -0000	1.2
@@ -1,180 +1,119 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/25-dejavu-lgc-fonts.conf -->
+<!-- /etc/fonts/conf.d/58-dejavu-lgc-fonts.conf -->
 <fontconfig>
-
-<!-- Alias Bitstream Vera -->
-	<match>
-		<test name="family">
-			<string>Bitstream Vera Sans</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>DejaVu LGC Sans</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Bitstream Vera Serif</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>DejaVu LGC Serif</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Bitstream Vera 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>
-		</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>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>DejaVu Sans Mono</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>DejaVu LGC Sans Mono</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>DejaVu Sans Light</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>DejaVu LGC Sans Light</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>DejaVu Sans Condensed</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>
-		</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>
-		<family>DejaVu LGC Sans Condensed</family>
-		<default>
-			<family>sans-serif</family>
-		</default>
-	</alias>
-	<alias>
-		<family>DejaVu LGC Serif</family>
-		<family>DejaVu LGC Serif Condensed</family>
-		<default>
-			<family>serif</family>
-		</default>
-	</alias>
-	<alias>
-		<family>DejaVu LGC Sans Mono</family>
-		<default>
-			<family>monospace</family>
-		</default>
-	</alias>
-
-<!-- Alias generic names -->
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>DejaVu LGC Sans</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>DejaVu LGC Serif</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>DejaVu LGC Sans Mono</family>
-		</prefer>
-	</alias>
-
-<!-- Turn off hinting at small sizes -->
-	<match target="font">
-		<test name="family">
-			<string>DejaVu LGC Sans</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family">
-			<string>DejaVu LGC Serif</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family">
-			<string>DejaVu LGC Sans Mono</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family">
-			<string>DejaVu LGC Sans Condensed</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-	<match target="font">
-		<test name="family">
-			<string>DejaVu LGC Serif Condensed</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
+  <!-- Alias Bitstream Vera -->
+  <match>
+    <test name="family">
+      <string>Bitstream Vera Sans</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu LGC Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>Bitstream Vera Serif</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu LGC Serif</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>Bitstream Vera 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>
+    </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>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>DejaVu Sans Mono</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu LGC Sans Mono</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>DejaVu Sans Light</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu LGC Sans Light</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>DejaVu Sans Condensed</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>
+    </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>
+    <family>DejaVu LGC Sans Condensed</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+  <alias>
+    <family>DejaVu LGC Serif</family>
+    <family>DejaVu LGC Serif Condensed</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+  <alias>
+    <family>DejaVu LGC Sans Mono</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+  <!-- Alias generic names -->
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>DejaVu LGC Sans</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>DejaVu LGC Serif</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>DejaVu LGC Sans Mono</family>
+    </prefer>
+  </alias>
 </fontconfig>

dejavu-fonts-makefile.patch:

Index: dejavu-fonts-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dejavu-fonts-makefile.patch	21 Oct 2007 20:55:29 -0000	1.1
+++ dejavu-fonts-makefile.patch	22 Oct 2007 19:16:34 -0000	1.2
@@ -1,6 +1,6 @@
 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-21 22:36:13.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
@@ -10,14 +10,27 @@
    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-21 22:35:52.000000000 +0200
-@@ -0,0 +1,230 @@
++++ 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
@@ -27,6 +40,18 @@
 +# 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
@@ -49,34 +74,37 @@
 +all : full sans lgc
 +
 +$(TMPDIR)%.sfd: $(SRCDIR)%.sfd
-+	@echo "➊ $< ❱❱❱ $@"
++	@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 "➋ $< ❱❱❱ $@"
++	@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 "➌ $< ❱❱❱ $@"
++	@echo "[3] $< => $@"
 +	install -d $(dir $@)
 +	$(GENERATE) $<
 +	mv $<.ttf $@
 +	$(TTPOSTPROC) $@
 +	$(RM) $@~
++	touch -r $< $@
 +
 +$(BUILDDIR)status.txt: $(FULLSFD)
-+	@echo "➍ ❱❱❱ $@"
++	@echo "[4] => $@"
 +	install -d $(dir $@)
 +	$(STATUS) $(VERSION) $(OLDSTATUS) $(FULLSFD) > $@
 +
 +$(BUILDDIR)unicover.txt: $(TMPDIR)DejaVuSans.sfd $(TMPDIR)DejaVuSerif.sfd $(TMPDIR)DejaVuMonoSans.sfd
-+	@echo "➎ ❱❱❱ $@"
++	@echo "[5] => $@"
 +	install -d $(dir $@)
 +	$(UNICOVER) $(UNICODEDATA) $(BLOCKS) \
 +	            $(TMPDIR)DejaVuSans.sfd "Sans" \
@@ -84,13 +112,13 @@
 +	            $(TMPDIR)DejaVuMonoSans.sfd "Sans Mono" > $@
 +
 +$(BUILDDIR)unicover-sans.txt: $(TMPDIR)DejaVuSans.sfd
-+	@echo "➎ ❱❱❱ $@"
++	@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 "➎ ❱❱❱ $@"
++	@echo "[5] => $@"
 +	install -d $(dir $@)
 +	$(UNICOVER) $(UNICODEDATA) $(BLOCKS) \
 +	            $(TMPDIR)DejaVuLGCSans.sfd "Sans" \
@@ -98,7 +126,7 @@
 +	            $(TMPDIR)DejaVuLGCMonoSans.sfd "Sans Mono" > $@
 +
 +$(BUILDDIR)langcover.txt: $(TMPDIR)DejaVuSans.sfd $(TMPDIR)DejaVuSerif.sfd $(TMPDIR)DejaVuMonoSans.sfd
-+	@echo "➏ ❱❱❱ $@"
++	@echo "[6] => $@"
 +	install -d $(dir $@)
 +ifeq "$(FC-LANG)" ""
 +	touch $@
@@ -110,7 +138,7 @@
 +endif
 +
 +$(BUILDDIR)langcover-sans.txt: $(TMPDIR)DejaVuSans.sfd
-+	@echo "➏ ❱❱❱ $@"
++	@echo "[6] => $@"
 +	install -d $(dir $@)
 +ifeq "$(FC-LANG)" ""
 +	touch $@
@@ -120,7 +148,7 @@
 +endif
 +
 +$(BUILDDIR)langcover-lgc.txt: $(TMPDIR)DejaVuLGCSans.sfd $(TMPDIR)DejaVuLGCSerif.sfd $(TMPDIR)DejaVuLGCMonoSans.sfd
-+	@echo "➏ ❱❱❱ $@"
++	@echo "[6] => $@"
 +	install -d $(dir $@)
 +ifeq "$(FC-LANG)" ""
 +	touch $@
@@ -131,21 +159,29 @@
 +	             $(TMPDIR)DejaVuLGCMonoSans.sfd "Sans Mono" > $@
 +endif
 +
-+$(TMPDIR)dejavu-fonts-$(VERSION)/: $(BUILDDIR)unicover.txt $(BUILDDIR)langcover.txt
-+	@echo "➐ ❱❱❱ $@"
++$(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 Makefile $(FULLSFD) \
++	install -p -m 0644 $(FULLSFD) \
++	                   $(BUILDDIR)Makefile \
 +	                   $(BUILDDIR)unicover.txt \
 +                           $(BUILDDIR)langcover.txt \
 +	                   $(BUILDDIR)status.txt \
 +	                   AUTHORS BUGS LICENSE NEWS README \
 +	                   $@
 +
-+$(TMPDIR)dejavu-fonts-ttf-$(VERSION)/: full
-+	@echo "➐ ❱❱❱ $@"
++$(TMPDIR)$(FULLARCHIVE): full
++	@echo "[8] => $@"
 +	install -d -m 0755 $@/{doc,ttf}
 +	install -p -m 0644 $(FULLTTF) $@/ttf
 +	install -p -m 0644 $(BUILDDIR)unicover.txt \
@@ -154,8 +190,8 @@
 +	                   AUTHORS BUGS LICENSE NEWS README \
 +	                   $@/doc
 +
-+$(TMPDIR)dejavu-sans-ttf-$(VERSION)/: sans
-+	@echo "➐ ❱❱❱ $@"
++$(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 \
@@ -163,8 +199,8 @@
 +	                   AUTHORS BUGS LICENSE NEWS README \
 +	                   $@/doc
 +
-+$(TMPDIR)dejavu-lgc-fonts-ttf-$(VERSION)/: lgc
-+	@echo "➐ ❱❱❱ $@"
++$(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 \
@@ -173,21 +209,21 @@
 +	                   $@/doc
 +
 +$(DISTDIR)%.zip: $(TMPDIR)%
-+	@echo "➑ ❱❱❱ $@"
++	@echo "[9] => $@"
 +	install -d $(dir $@)
 +	(cd $(TMPDIR); zip -rv $(abspath $@) $(notdir $<))
 +
 +$(DISTDIR)%.tar.bz2: $(TMPDIR)%
-+	@echo "➑ ❱❱❱ $@"
++	@echo "[9] => $@"
 +	install -d $(dir $@)
 +	(cd $(TMPDIR); tar cjvf $(abspath $@) $(notdir $<))
 +
 +%.md5: %
-+	@echo "➒ ❱❱❱ $@"
++	@echo "[10] => $@"
 +	(cd $(dir $<); md5sum -b $(notdir $<) > $(abspath $@))
 +
 +%.sha512: %
-+	@echo "➒ ❱❱❱ $@"
++	@echo "[10] => $@"
 +	(cd $(dir $<); sha512sum -b $(notdir $<) > $(abspath $@))
 +
 +full : $(FULLTTF) $(BUILDDIR)unicover.txt $(BUILDDIR)langcover.txt $(BUILDDIR)status.txt
@@ -206,30 +242,30 @@
 +
 +dist : src-dist full-dist sans-dist lgc-dist
 +
-+src-dist : $(DISTDIR)dejavu-fonts-$(VERSION).zip \
-+           $(DISTDIR)dejavu-fonts-$(VERSION).zip.md5 \
-+           $(DISTDIR)dejavu-fonts-$(VERSION).zip.sha512 \
-+           $(DISTDIR)dejavu-fonts-$(VERSION).tar.bz2 \
-+           $(DISTDIR)dejavu-fonts-$(VERSION).tar.bz2.md5 \
-+           $(DISTDIR)dejavu-fonts-$(VERSION).tar.bz2.sha512
-+
-+full-dist : $(DISTDIR)dejavu-fonts-ttf-$(VERSION).zip \
-+            $(DISTDIR)dejavu-fonts-ttf-$(VERSION).zip.md5 \
-+            $(DISTDIR)dejavu-fonts-ttf-$(VERSION).zip.sha512 \
-+            $(DISTDIR)dejavu-fonts-ttf-$(VERSION).tar.bz2 \
-+            $(DISTDIR)dejavu-fonts-ttf-$(VERSION).tar.bz2.md5 \
-+            $(DISTDIR)dejavu-fonts-ttf-$(VERSION).tar.bz2.sha512
-+
-+sans-dist: $(DISTDIR)dejavu-sans-ttf-$(VERSION).zip \
-+           $(DISTDIR)dejavu-sans-ttf-$(VERSION).zip.md5 \
-+           $(DISTDIR)dejavu-sans-ttf-$(VERSION).zip.sha512
-+
-+lgc-dist : $(DISTDIR)dejavu-lgc-fonts-ttf-$(VERSION).zip \
-+           $(DISTDIR)dejavu-lgc-fonts-ttf-$(VERSION).zip.md5 \
-+           $(DISTDIR)dejavu-lgc-fonts-ttf-$(VERSION).zip.sha512 \
-+           $(DISTDIR)dejavu-lgc-fonts-ttf-$(VERSION).tar.bz2 \
-+           $(DISTDIR)dejavu-lgc-fonts-ttf-$(VERSION).tar.bz2.md5 \
-+           $(DISTDIR)dejavu-lgc-fonts-ttf-$(VERSION).tar.bz2.sha512
++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
 +
@@ -244,3 +280,16 @@
 +
 +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


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- dejavu-fonts.spec	21 Oct 2007 20:55:29 -0000	1.69
+++ dejavu-fonts.spec	22 Oct 2007 19:16:34 -0000	1.70
@@ -4,10 +4,10 @@
 
 %define archivename     %{fontname}-sfd-%{archiveversion}
 
-%define alphatag        .20071014svn2016
+%define alphatag        .20071017svn2019
 #define alphatag        .rc1
 
-%define archiveversion  20071014-2016
+%define archiveversion  20071017-2019
 #define archiveversion  %{version}
 
 
@@ -17,7 +17,7 @@
 
 Name:      %{fontname}-fonts
 Version:   2.21
-Release:   0.1%{?alphatag}%{?dist}
+Release:   0.2%{?alphatag}%{?dist}
 Summary:   DejaVu fonts, mature typefaces
 
 Group:     User Interface/X
@@ -33,6 +33,7 @@
 Source4:   %{name}-experimental-fontconfig-unhint-small.conf
 # DejaVu LGC setup
 Source5:   %{name}-lgc-fontconfig.conf
+Source6:   %{name}-lgc-fontconfig-unhint-small.conf
 
 Patch0:    %{name}-makefile.patch
 
@@ -110,7 +111,8 @@
 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}59-%{fontname}-lgc.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
@@ -192,7 +194,8 @@
 %doc AUTHORS BUGS LICENSE NEWS README
 %doc build/unicover-lgc.txt build/langcover-lgc.txt
 
-%config(noreplace) %{fontconfdir}59-%{fontname}-lgc.conf
+%config(noreplace) %{fontconfdir}20-unhint-small-%{fontname}-lgc.conf
+%config(noreplace) %{fontconfdir}58-%{fontname}-lgc.conf
 
 %dir %{fontdir}
 %{fontdir}/DejaVuLGC*.ttf
@@ -200,6 +203,13 @@
 
 %changelog
 * Sun Oct 21 2007 <nicolas.mailhot at laposte.net>
+☢ 2.21-0.2.20071017svn2019
+âš  Still very experimental version:
+  ✓ update makefile patch
+  ✓ split lgc hinting file like in the other packages
+  ✓ move lgc to prio 58 as should have been done when liberation was added
+
+* Sun Oct 21 2007 <nicolas.mailhot at laposte.net>
 ☢ 2.21-0.1.20071014svn2016
 âš  Very experimental version to test major changes:
   ✓ new fontforge version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	21 Oct 2007 20:55:29 -0000	1.39
+++ sources	22 Oct 2007 19:16:34 -0000	1.40
@@ -1 +1 @@
-c4c2b5a8f61af0ac9385575226aa40c1  dejavu-sfd-20071014-2016.tar.bz2
+f4f050827222c3e94d679c97e5e1cb1e  dejavu-sfd-20071017-2019.tar.bz2




More information about the fedora-extras-commits mailing list