rpms/shapelib/devel shapelib-1.3.0b1-Makefile.patch, 1.1, 1.2 shapelib.spec, 1.18, 1.19

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/shapelib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1568

Modified Files:
	shapelib-1.3.0b1-Makefile.patch shapelib.spec 
Log Message:
do not package static libfiles (#556094)

shapelib-1.3.0b1-Makefile.patch:
 Makefile |   65 ++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 27 deletions(-)

Index: shapelib-1.3.0b1-Makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/shapelib/devel/shapelib-1.3.0b1-Makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- shapelib-1.3.0b1-Makefile.patch	7 Jan 2010 08:40:20 -0000	1.1
+++ shapelib-1.3.0b1-Makefile.patch	4 Feb 2010 20:35:33 -0000	1.2
@@ -52,7 +52,7 @@ diff -Naur shapelib-1.3.0b1/Makefile sha
 +	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c  -fPIC -DPIC dbfopen.c -o .libs/dbfopen.lo
 +	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c dbfopen.c -o dbfopen.o >/dev/null 2>&1
  	mv -f .libs/dbfopen.lo dbfopen.lo
--	/bin/sh ./libtool --mode=link gcc  -g -O2  -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo  
+-	/bin/sh ./libtool --mode=link gcc  -g -O2  -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo safileio.lo
 +	/bin/sh ./libtool --mode=link $(CC) $(CFLAGS) $(LINKOPTS) -o libshp.la -rpath $(libdir) -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo
  	rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.*
  	rm -fr .libs/libshp.lax


Index: shapelib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shapelib/devel/shapelib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- shapelib.spec	7 Jan 2010 18:29:56 -0000	1.18
+++ shapelib.spec	4 Feb 2010 20:35:33 -0000	1.19
@@ -2,7 +2,7 @@
 Summary: API in "C" for Shapefile handling
 Name: shapelib
 Version: 1.3.0b1
-Release: 2%{?dist}
+Release: 3%{?dist}
 # No version of the LGPL is given.
 License: LGPLv2+ or MIT
 URL: http://shapelib.maptools.org/
@@ -49,6 +49,8 @@ make %{?_smp_mflags} libdir=%{_libdir} E
 rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
+find %{buildroot} -name \*\.a -print | xargs rm -f
+find %{buildroot} -name \*\.la -print | xargs rm -f
 
 cd contrib
 %makeinstall
@@ -74,10 +76,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE.LGPL README
 %{_includedir}/*
 %{_libdir}/*.so
-%{_libdir}/*.a
-%exclude %{_libdir}/libshp.la
 
 %changelog
+* Thu Feb 04 2010 Lucian Langa <cooly at gnome.eu.org> - 1.3.0b1-3
+- do not package static libfiles (#556094)
+
 * Thu Jan 07 2010 Lucian Langa <cooly at gnome.eu.org> - 1.3.0b1-2
 - fix patch2 - no not depend on gdal