From 5f423f49584ef891caaf2851bc1c509378df853b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:31:45 +0000 Subject: [PATCH 1/9] 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 f9d9dca..4053d23 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: potrace -# $Id$ +# $Id: Makefile,v 1.1 2009/08/07 19:56:53 kevin Exp $ NAME := potrace 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 e920fe7e1174376a0a5aae0d3bd1c59e024f369c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 09:41:15 +0000 Subject: [PATCH 2/9] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log 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 4053d23..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: potrace -# $Id: Makefile,v 1.1 2009/08/07 19:56:53 kevin Exp $ -NAME := potrace -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/import.log b/import.log deleted file mode 100644 index ca32cd9..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -potrace-1_8-4_fc11:HEAD:potrace-1.8-4.fc11.src.rpm:1249676109 From fd47bce15844c7e713a889d40bbed8f9710c56a3 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Thu, 30 Dec 2010 14:20:35 +0200 Subject: [PATCH 3/9] Update to 1.9. --- .gitignore | 3 +++ potrace-1.8-buildlib.patch | 22 ---------------------- potrace.spec | 29 ++++++++++++----------------- sources | 6 +++--- 4 files changed, 18 insertions(+), 42 deletions(-) delete mode 100644 potrace-1.8-buildlib.patch diff --git a/.gitignore b/.gitignore index 6fa9885..0f51bae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ potrace-1.8.tar.gz potrace.pdf potracelib.pdf +/potrace-1.9.tar.gz +/potracelib.pdf +/potrace.pdf diff --git a/potrace-1.8-buildlib.patch b/potrace-1.8-buildlib.patch deleted file mode 100644 index 6c3deed..0000000 --- a/potrace-1.8-buildlib.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up potrace-1.8/src/Makefile.am.orig potrace-1.8/src/Makefile.am ---- potrace-1.8/src/Makefile.am.orig 2007-04-09 03:36:44.000000000 +0300 -+++ potrace-1.8/src/Makefile.am 2009-08-03 13:47:54.318147056 +0300 -@@ -7,8 +7,7 @@ - #---------------------------------------------------------------------- - # programs: - --bin_PROGRAMS = potrace mkbitmap --noinst_PROGRAMS = potracelib_demo -+bin_PROGRAMS = potrace mkbitmap potracelib_demo - - potrace_SOURCES = main.c main.h bitmap_io.c bitmap_io.h backend_eps.c \ - backend_eps.h flate.c flate.h lists.h greymap.c greymap.h render.c \ -@@ -31,7 +30,7 @@ potracelib_demo_DEPENDENCIES = libpotrac - #---------------------------------------------------------------------- - # static libraries: - --noinst_LIBRARIES = libpotrace.a -+lib_LIBRARIES = libpotrace.a - libpotrace_a_SOURCES = curve.c curve.h trace.c trace.h decompose.c \ - decompose.h potracelib.c potracelib.h lists.h auxiliary.h bitmap.h \ - progress.h diff --git a/potrace.spec b/potrace.spec index 5a31492..2996840 100644 --- a/potrace.spec +++ b/potrace.spec @@ -1,22 +1,18 @@ Name: potrace -Version: 1.8 -Release: 4%{?dist} +Version: 1.9 +Release: 1%{?dist} Summary: Transform bitmaps into vector graphics Group: Applications/Multimedia # README defines license as GPLv2+ License: GPLv2+ URL: http://potrace.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz - # Documentation Source1: http://potrace.sourceforge.net/potrace.pdf Source2: http://potrace.sourceforge.net/potracelib.pdf -# Patch to build library -Patch0: potrace-1.8-buildlib.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: automake BuildRequires: zlib-devel %description @@ -36,13 +32,12 @@ the input for better tracing behavior on greyscale and color images. %package devel -Summary: Potrace development library & library demo +Summary: Potrace development library and headers Group: Applications/Multimedia -Provides: %{name}-static = %{version}-%{release} Requires: %{name} = %{version}-%{release} %description devel -This package contains the potrace development library & library demo. +This package contains the potrace development library and headers. %package doc @@ -58,37 +53,34 @@ library. %prep %setup -q -%patch0 -p 1 -b .orig -autoreconf cp -a %{SOURCE1} . cp -a %{SOURCE2} . %build -%configure --enable-metric +%configure --enable-shared --disable-static \ + --enable-metric --with-libpotrace --with-pic make %{?_smp_mflags} - %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -install -D -p -m 644 src/potracelib.h %{buildroot}%{_includedir}/potracelib.h +find %{buildroot} -name *.la -exec rm -rf {} \; %clean rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/potrace %{_bindir}/mkbitmap +%{_libdir}/libpotrace.so.* %{_mandir}/man1/potrace.1.* %{_mandir}/man1/mkbitmap.1.* %files devel %defattr(-,root,root,-) -%{_bindir}/potracelib_demo -%{_libdir}/libpotrace.a +%{_libdir}/libpotrace.so %{_includedir}/potracelib.h %files doc @@ -96,6 +88,9 @@ rm -rf %{buildroot} %doc potrace.pdf potracelib.pdf %changelog +* Thu Dec 30 2010 Jussi Lehtola - 1.9-1 +- Update to 1.9. + * Thu Aug 06 2009 Jussi Lehtola - 1.8-4 - Corrected license tag. diff --git a/sources b/sources index 6f69cc9..f676666 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -e73b45565737d64011612704dd4d9f86 potrace-1.8.tar.gz -ead28818fe860068c9147be752be0f41 potrace.pdf -0d68f90f965f9bbe5761ec5daab826cd potracelib.pdf +ef973e7ec9c2e5b3e19e8dfeaa7524c3 potrace-1.9.tar.gz +60f251c0da51dc66dbb2b1bfe1e5b83c potracelib.pdf +4f0906cd4e589005677e54a106afe674 potrace.pdf From 84ec132035cd63c33c38bc1dbc3e4c5f0737c723 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 10:19:04 -0600 Subject: [PATCH 4/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- potrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/potrace.spec b/potrace.spec index 2996840..e209920 100644 --- a/potrace.spec +++ b/potrace.spec @@ -1,6 +1,6 @@ Name: potrace Version: 1.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Transform bitmaps into vector graphics Group: Applications/Multimedia # README defines license as GPLv2+ @@ -88,6 +88,9 @@ rm -rf %{buildroot} %doc potrace.pdf potracelib.pdf %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 1.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Dec 30 2010 Jussi Lehtola - 1.9-1 - Update to 1.9. From 43b584ec983da4297201d8e91f08b37171d14db6 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Sun, 21 Aug 2011 18:15:13 +0300 Subject: [PATCH 5/9] Update to 1.10. --- .gitignore | 1 + potrace.spec | 12 +++++++++--- sources | 6 +++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0f51bae..5e48f2c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ potracelib.pdf /potrace-1.9.tar.gz /potracelib.pdf /potrace.pdf +/potrace-1.10.tar.gz diff --git a/potrace.spec b/potrace.spec index e209920..5b34eb1 100644 --- a/potrace.spec +++ b/potrace.spec @@ -1,6 +1,6 @@ Name: potrace -Version: 1.9 -Release: 2%{?dist} +Version: 1.10 +Release: 1%{?dist} Summary: Transform bitmaps into vector graphics Group: Applications/Multimedia # README defines license as GPLv2+ @@ -66,12 +66,15 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} find %{buildroot} -name *.la -exec rm -rf {} \; +# Get rid of installed copy of placement.pdf +rm -rf %{buildroot}%{_docdir}/%{name} + %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS ChangeLog COPYING NEWS README doc/placement.pdf %{_bindir}/potrace %{_bindir}/mkbitmap %{_libdir}/libpotrace.so.* @@ -88,6 +91,9 @@ rm -rf %{buildroot} %doc potrace.pdf potracelib.pdf %changelog +* Sun Aug 21 2011 Jussi Lehtola - 1.10-1 +- Update to 1.10. + * Wed Feb 09 2011 Fedora Release Engineering - 1.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index f676666..b29865f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -ef973e7ec9c2e5b3e19e8dfeaa7524c3 potrace-1.9.tar.gz -60f251c0da51dc66dbb2b1bfe1e5b83c potracelib.pdf -4f0906cd4e589005677e54a106afe674 potrace.pdf +a6cebad4f00a7ddceedcf8cc5fcd978f potracelib.pdf +a58c3d99e0213daa0a9f7d1cd253f75e potrace.pdf +c6a7227ed0a6291a95f38c7d4352ba53 potrace-1.10.tar.gz From 708050c6c0e38286e6332bc44c957308a1eda182 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 19:10:45 -0600 Subject: [PATCH 6/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- potrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/potrace.spec b/potrace.spec index 5b34eb1..6043dee 100644 --- a/potrace.spec +++ b/potrace.spec @@ -1,6 +1,6 @@ Name: potrace Version: 1.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Transform bitmaps into vector graphics Group: Applications/Multimedia # README defines license as GPLv2+ @@ -91,6 +91,9 @@ rm -rf %{buildroot} %doc potrace.pdf potracelib.pdf %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sun Aug 21 2011 Jussi Lehtola - 1.10-1 - Update to 1.10. From 55c653c8051b7b0d46c72bd0ba973e2f469124b5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 20 Jul 2012 21:52:17 -0500 Subject: [PATCH 7/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- potrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/potrace.spec b/potrace.spec index 6043dee..b5aed0a 100644 --- a/potrace.spec +++ b/potrace.spec @@ -1,6 +1,6 @@ Name: potrace Version: 1.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Transform bitmaps into vector graphics Group: Applications/Multimedia # README defines license as GPLv2+ @@ -91,6 +91,9 @@ rm -rf %{buildroot} %doc potrace.pdf potracelib.pdf %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 1.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 1.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 08d1b89df245006e26bf5934b501d7e3b916f084 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 12:15:58 -0600 Subject: [PATCH 8/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- potrace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/potrace.spec b/potrace.spec index b5aed0a..7516bf7 100644 --- a/potrace.spec +++ b/potrace.spec @@ -1,6 +1,6 @@ Name: potrace Version: 1.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Transform bitmaps into vector graphics Group: Applications/Multimedia # README defines license as GPLv2+ @@ -91,6 +91,9 @@ rm -rf %{buildroot} %doc potrace.pdf potracelib.pdf %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Jul 21 2012 Fedora Release Engineering - 1.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 7f995a1153005a32b94f6e8ce367d05bb5d96ec6 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Wed, 20 Feb 2013 13:45:39 +0200 Subject: [PATCH 9/9] Update to 1.11. --- .gitignore | 1 + potrace.spec | 7 +++++-- sources | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5e48f2c..a73d815 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ potracelib.pdf /potracelib.pdf /potrace.pdf /potrace-1.10.tar.gz +/potrace-1.11.tar.gz diff --git a/potrace.spec b/potrace.spec index 7516bf7..f5b3180 100644 --- a/potrace.spec +++ b/potrace.spec @@ -1,6 +1,6 @@ Name: potrace -Version: 1.10 -Release: 4%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: Transform bitmaps into vector graphics Group: Applications/Multimedia # README defines license as GPLv2+ @@ -91,6 +91,9 @@ rm -rf %{buildroot} %doc potrace.pdf potracelib.pdf %changelog +* Wed Feb 20 2013 Susi Lehtola - 1.11-1 +- Update to 1.11. + * Thu Feb 14 2013 Fedora Release Engineering - 1.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index b29865f..a73eee2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -a6cebad4f00a7ddceedcf8cc5fcd978f potracelib.pdf -a58c3d99e0213daa0a9f7d1cd253f75e potrace.pdf -c6a7227ed0a6291a95f38c7d4352ba53 potrace-1.10.tar.gz +1d76e350ff277959e1f6b580d818d48f potrace-1.11.tar.gz +b8ab0af2e21cbc9a9f1444cca10df87b potracelib.pdf +88f7389f04155e496a80b1a6e4a90706 potrace.pdf