From ed2a94729d9d4301beb73d5146973600295a056c Mon Sep 17 00:00:00 2001 From: Nicolas Mailhot Date: Fri, 10 Sep 2010 08:36:23 +0200 Subject: [PATCH] Update to 2.32 --- .gitignore | 1 + Makefile | 21 --------------------- dejavu-fonts.spec | 7 +++++-- import.log | 19 ------------------- sources | 2 +- 5 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.gitignore b/.gitignore index fa1c22b..3f188a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ dejavu-fonts-2.31.tar.bz2 +/dejavu-fonts-2.32.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 7e3144a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: dejavu-fonts -# $Id$ -NAME := dejavu-fonts -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec index 73d87b4..22f1d48 100644 --- a/dejavu-fonts.spec +++ b/dejavu-fonts.spec @@ -19,7 +19,7 @@ original style, using an open collaborative development process. Name: %{fontname}-fonts -Version: 2.31 +Version: 2.32 Release: 1%{?alphatag}%{?dist} Summary: DejaVu fonts @@ -45,7 +45,7 @@ BuildRequires: fontpackages-devel %package common Summary: Common files for the Dejavu font set Requires: fontpackages-filesystem - + Obsoletes: dejavu-fonts-doc < 2.26-6 Obsoletes: %{name}-compat < 2.29-3 Obsoletes: %{name}-lgc-compat < 2.29-3 @@ -204,6 +204,9 @@ rm -fr %{buildroot} %changelog +* Fri Sep 10 2010 Nicolas Mailhot +- 2.32-1 + * Tue Jun 3 2010 Nicolas Mailhot - 2.31-1 — drop Serif Condensed Italic naming patch diff --git a/import.log b/import.log deleted file mode 100644 index bc30de0..0000000 --- a/import.log +++ /dev/null @@ -1,19 +0,0 @@ -dejavu-fonts-2_25-2_fc10:HEAD:dejavu-fonts-2.25-2.fc10.src.rpm:1215806350 -dejavu-fonts-2_26-1_fc10:HEAD:dejavu-fonts-2.26-1.fc10.src.rpm:1217165726 -dejavu-fonts-2_26-2_fc10:HEAD:dejavu-fonts-2.26-2.fc10.src.rpm:1220476598 -dejavu-fonts-2_26-3_fc11:HEAD:dejavu-fonts-2.26-3.fc11.src.rpm:1226169315 -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 -dejavu-fonts-2_28-1_fc11:HEAD:dejavu-fonts-2.28-1.fc11.src.rpm:1229879833 -dejavu-fonts-2_28-2_fc11:HEAD:dejavu-fonts-2.28-2.fc11.src.rpm:1232060001 -dejavu-fonts-2_28-3_fc11:HEAD:dejavu-fonts-2.28-3.fc11.src.rpm:1232147011 -dejavu-fonts-2_28-4_fc11:HEAD:dejavu-fonts-2.28-4.fc11.src.rpm:1234084218 -dejavu-fonts-2_28-5_fc11:HEAD:dejavu-fonts-2.28-5.fc11.src.rpm:1235377773 -dejavu-fonts-2_29-1_fc11:HEAD:dejavu-fonts-2.29-1.fc11.src.rpm:1237057458 -dejavu-fonts-2_29-2_fc11:HEAD:dejavu-fonts-2.29-2.fc11.src.rpm:1237143073 -dejavu-fonts-2_29-3_fc11:HEAD:dejavu-fonts-2.29-3.fc11.src.rpm:1243084445 -dejavu-fonts-2_30-1_fc12:HEAD:dejavu-fonts-2.30-1.fc12.src.rpm:1252259820 -dejavu-fonts-2_30-2_fc12:HEAD:dejavu-fonts-2.30-2.fc12.src.rpm:1252351124 -dejavu-fonts-2_31-1_fc14:HEAD:dejavu-fonts-2.31-1.fc14.src.rpm:1275749659 diff --git a/sources b/sources index 94ddba0..7b17b39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0abc4f0078fd5824936aa1cff9c72ab6 dejavu-fonts-2.31.tar.bz2 +f5aec4721f8b0638ae76361ef376e4f4 dejavu-fonts-2.32.tar.bz2