rpms/agg/devel agg-generate-tarball.sh, NONE, 1.1 .cvsignore, 1.4, 1.5 agg-2.4-depends.patch, 1.3, 1.4 agg.spec, 1.19, 1.20 sources, 1.6, 1.7

Patrice Dumas (pertusus) fedora-extras-commits at redhat.com
Tue Feb 5 21:14:31 UTC 2008 

Author: pertusus

Update of /cvs/extras/rpms/agg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19366

Modified Files:
	.cvsignore agg-2.4-depends.patch agg.spec sources 
Added Files:
	agg-generate-tarball.sh 
Log Message:
* Tue Feb  5 2008 Patrice Dumas <pertusus at free.fr> - 2.5-5
- remove non free files
- minor cleanups



--- NEW FILE agg-generate-tarball.sh ---
#! /bin/sh

version=$1

[ -z $version ] && exit 1

dir=agg-${version}
file=agg-${version}.tar.gz
result=agg-free-${version}.tar.gz

rm -rf agg-${version}
tar xzf $file
for file in copying.txt VERSIONS.TXT gpc.c gpc.h; do
   rm agg-${version}/gpc/$file
done
rm -f $result
tar czf $result $dir


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/agg/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Jan 2007 16:19:28 -0000	1.4
+++ .cvsignore	5 Feb 2008 21:13:07 -0000	1.5
@@ -1,3 +1 @@
-agg23.tar.gz
-agg-2.4.tar.gz
-agg-2.5.tar.gz
+agg-free-2.5.tar.gz

agg-2.4-depends.patch:

Index: agg-2.4-depends.patch
===================================================================
RCS file: /cvs/extras/rpms/agg/devel/agg-2.4-depends.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- agg-2.4-depends.patch	23 Apr 2007 15:39:12 -0000	1.3
+++ agg-2.4-depends.patch	5 Feb 2008 21:13:07 -0000	1.4
@@ -1,4 +1,3 @@
-diff -ru agg-2.4.orig/font_freetype/Makefile.am agg-2.4/font_freetype/Makefile.am
 --- agg-2.4.orig/font_freetype/Makefile.am	2005-10-18 11:45:40.000000000 +0100
 +++ agg-2.4/font_freetype/Makefile.am	2006-07-10 15:11:55.000000000 +0100
 @@ -4,8 +4,9 @@
@@ -6,13 +5,12 @@
  lib_LTLIBRARIES = libaggfontfreetype.la
  
 -libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@ 
-+libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@
++libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
  libaggfontfreetype_la_SOURCES = agg_font_freetype.cpp
  libaggfontfreetype_la_CXXFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@ 
-+libaggfontfreetype_la_LIBADD = ../src/libagg.la
++libaggfontfreetype_la_LIBADD = ../src/libagg.la @FREETYPE_LIBS@
  endif
  
-diff -ru agg-2.4.orig/src/platform/sdl/Makefile.am agg-2.4/src/platform/sdl/Makefile.am
 --- agg-2.4.orig/src/platform/sdl/Makefile.am	2005-10-17 23:49:35.000000000 +0100
 +++ agg-2.4/src/platform/sdl/Makefile.am	2006-07-10 15:11:55.000000000 +0100
 @@ -5,6 +5,6 @@
@@ -20,16 +18,31 @@
  libaggplatformsdl_la_SOURCES = agg_platform_support.cpp
  libaggplatformsdl_la_CXXFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@
 -libaggplatformsdl_la_LIBADD = @SDL_LIBS@
-+libaggplatformsdl_la_LIBADD = @SDL_LIBS@ ../../libagg.la
++libaggplatformsdl_la_LIBADD = ../../libagg.la @SDL_LIBS@
  endif
  
-diff -ru agg-2.4.orig/src/platform/X11/Makefile.am agg-2.4/src/platform/X11/Makefile.am
---- agg-2.4.orig/src/platform/X11/Makefile.am	2005-10-19 19:11:35.000000000 +0100
-+++ agg-2.4/src/platform/X11/Makefile.am	2006-07-10 15:11:55.000000000 +0100
-@@ -4,5 +4,5 @@
- libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@  -L at x_libraries@
+--- agg-2.5.orig/configure.in	2006-10-09 05:06:36.000000000 +0100
++++ agg-2.5/configure.in	2007-01-07 14:07:39.000000000 +0000
+@@ -122,7 +122,8 @@
+ fi
+ AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes])
+ AC_SUBST(x_includes)
+-AC_SUBST(x_libraries)
++test -n "$x_libraries" && X_LDFLAGS="-L$x_libraries"
++AC_SUBST(X_LDFLAGS)
+ dnl ###############################################
+ 
+ dnl Settung up library version
+--- agg-2.5.orig/src/platform/X11/Makefile.am	2006-12-11 00:59:45.000000000 +0000
++++ agg-2.5/src/platform/X11/Makefile.am	2007-01-07 14:07:39.000000000 +0000
+@@ -1,8 +1,8 @@
+ if ENABLE_X11
+ lib_LTLIBRARIES = libaggplatformX11.la
+ 
+-libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@  -L at x_libraries@
++libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @X_LDFLAGS@
  libaggplatformX11_la_SOURCES = agg_platform_support.cpp
  libaggplatformX11_la_CXXFLAGS =  -I$(top_srcdir)/include -I at x_includes@
 -libaggplatformX11_la_LIBADD = -lX11
-+libaggplatformX11_la_LIBADD = -lX11 ../../libagg.la
++libaggplatformX11_la_LIBADD = ../../libagg.la -lX11
  endif


Index: agg.spec
===================================================================
RCS file: /cvs/extras/rpms/agg/devel/agg.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- agg.spec	22 Aug 2007 07:33:11 -0000	1.19
+++ agg.spec	5 Feb 2008 21:13:07 -0000	1.20
@@ -1,11 +1,19 @@
-Summary: Anti-Grain Geometry
+Summary: Anti-Grain Geometry graphical rendering engine
 Name:    agg
 Version: 2.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group:   System Environment/Libraries
 URL:     http://www.antigrain.com
 License: GPLv2+
-Source:  http://www.antigrain.com/%{name}-%{version}.tar.gz
+#Source0:  http://www.antigrain.com/%{name}-%{version}.tar.gz
+Source0: %{name}-free-%{version}.tar.gz
+# agg contains gpc.c, 'free for non-commercial use', we cannot ship.
+# We use this script to remove the patented code before shipping it.
+# Download the upstream tarball and invoke this script while in the
+# tarball's directory:
+# sh agg-generate-tarball.sh 2.5
+Source1: agg-generate-tarball.sh
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: automake, libtool, libX11-devel, freetype-devel, SDL-devel
 
@@ -19,43 +27,64 @@
 Summary: Support files necessary to compile applications with agg
 Group: Development/Libraries
 Requires: agg = %{version}-%{release}, freetype-devel
+# for _datadir/automake ownership
+Requires: automake
 
 %description devel
-Libraries, headers, and support files necessary to compile applications using agg.
+Libraries, headers, and support files necessary to compile applications 
+using agg.
 
 %prep
 %setup -q
-%patch0 -p1 -b .agg-2.4-depends
-%patch1 -p1 -b .agg-2.5-pkgconfig.patch
-sh ./autogen.sh
+%patch0 -p1 -b .depends
+%patch1 -p1 -b .pkgconfig
+aclocal
+autoheader
+autoconf
+libtoolize --force
+automake --foreign --add-missing --ignore-deps
 
 %build
 %configure --disable-static --disable-gpc
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install INSTALL='install -p'
 rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
+rm -rf __dist_examples __clean_examples
+cp -a examples __clean_examples
+make -C __clean_examples distclean
+rm -rf __clean_examples/Makefile.am __clean_examples/{win32*,macosx*,BeOS}
+mkdir __dist_examples
+mv __clean_examples __dist_examples/examples
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc authors copying readme
+%defattr(-,root,root,-)
+%doc authors copying readme news
 %{_libdir}/lib*.so.*
 
 %files devel
+%defattr(-,root,root,-)
+%doc __dist_examples/examples
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libagg.pc
 %{_includedir}/agg2/
 %{_datadir}/aclocal/libagg.m4
 
 %clean
-rm -r $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb  5 2008 Patrice Dumas <pertusus at free.fr> - 2.5-5
+- remove non free files
+- minor cleanups
+
 * Fri Aug 03 2007 Caolan McNamara <caolanm at redhat.com> - 2.5-4
 - clarify license
 - source upstream silently changed even though version remained


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/agg/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Aug 2007 07:33:11 -0000	1.6
+++ sources	5 Feb 2008 21:13:07 -0000	1.7
@@ -1 +1 @@
-0229a488bc47be10a2fee6cf0b2febd6  agg-2.5.tar.gz
+2ecb9b5e3ba333157265fb0b308dc857  agg-free-2.5.tar.gz

More information about the fedora-extras-commits mailing list