From 259bff7f98e6c57091f86a2e700ba601025049e6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 08:10:52 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for agg --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From df42d91af9dd1e8b07636c7fe5ba16547f0c89cd Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:31 +0000 Subject: [PATCH 2/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 872abda..718755b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: agg -# $Id: Makefile,v 1.1 2005/11/24 11:57:42 caolanm Exp $ +# $Id: Makefile,v 1.2 2007/10/15 16:54:47 scop Exp $ NAME := agg 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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From 197685e86d63203db1d66fb82a59ddd9fb9c038b Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Fri, 29 Jan 2010 05:59:20 +0000 Subject: [PATCH 3/4] Sync from devel: Fri Jan 29 2010 Kevin Kofler - 2.5-9 - also remove include/agg_conv_gpc.h as it also carries a copy of the non-Free GPC license (upstream also recommends removing that file under http://www.antigrain.com/license/index.html#toc0005) (#559611) --- agg-generate-tarball.sh | 2 ++ agg.spec | 7 ++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/agg-generate-tarball.sh b/agg-generate-tarball.sh index 9b13619..c6f2ebd 100644 --- a/agg-generate-tarball.sh +++ b/agg-generate-tarball.sh @@ -13,5 +13,7 @@ tar xzf $file for file in copying.txt VERSIONS.TXT gpc.c gpc.h; do rm agg-${version}/gpc/$file done +rm agg-${version}/include/agg_conv_gpc.h +sed -i -e 's/agg_conv_gpc\.h/ /g' agg-${version}/include/Makefile.am rm -f $result tar czf $result $dir diff --git a/agg.spec b/agg.spec index a91fbcb..ba0a144 100644 --- a/agg.spec +++ b/agg.spec @@ -1,7 +1,7 @@ Summary: Anti-Grain Geometry graphical rendering engine Name: agg Version: 2.5 -Release: 8%{?dist} +Release: 9%{?dist} Group: System Environment/Libraries URL: http://www.antigrain.com License: GPLv2+ @@ -83,6 +83,11 @@ mv __clean_examples __dist_examples/examples rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 29 2010 Kevin Kofler - 2.5-9 +- also remove include/agg_conv_gpc.h as it also carries a copy of the non-Free + GPC license (upstream also recommends removing that file under + http://www.antigrain.com/license/index.html#toc0005) (#559611) + * Fri Jul 24 2009 Fedora Release Engineering - 2.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 555ff79..a2e7017 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ecb9b5e3ba333157265fb0b308dc857 agg-free-2.5.tar.gz +6fa25317a3024a186d9a93d1513ca9fa agg-free-2.5.tar.gz From d56dcb9122ece2cd985ecf724c70369ce0f153fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:38:04 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 718755b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: agg -# $Id: Makefile,v 1.2 2007/10/15 16:54:47 scop Exp $ -NAME := agg -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),) -# attempt 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/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12