rpms/shapelib/devel shapelib-build-id.patch, NONE, 1.1 shapelib.spec, 1.10, 1.11

Shawn McCann (smccann) fedora-extras-commits at redhat.com
Mon Oct 22 04:27:00 UTC 2007


Author: smccann

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

Modified Files:
	shapelib.spec 
Added Files:
	shapelib-build-id.patch 
Log Message:
Update for bug 339931


shapelib-build-id.patch:

--- NEW FILE shapelib-build-id.patch ---
diff -up shapelib-1.2.10/Makefile.old shapelib-1.2.10/Makefile
--- shapelib-1.2.10/Makefile.old	2007-10-19 07:30:30.000000000 -0400
+++ shapelib-1.2.10/Makefile	2007-10-19 07:30:55.000000000 -0400
@@ -1,5 +1,6 @@
 INSTALL = /usr/bin/install
 LD = /usr/bin/ld
+LDFLAGS = --build-id
 
 bindir = /usr/local/bin
 libdir = /usr/local/lib
@@ -123,7 +124,7 @@ lib:
 	rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.*
 	rm -fr .libs/libshp.lax
 	mkdir .libs/libshp.lax
-	$(LD) -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION)  shpopen.lo shptree.lo dbfopen.lo  -lc
+	$(LD) $(LDFLAGS) -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION)  shpopen.lo shptree.lo dbfopen.lo  -lc
 
 	(cd .libs && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1)
 	(cd .libs && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so)


Index: shapelib.spec
===================================================================
RCS file: /cvs/extras/rpms/shapelib/devel/shapelib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- shapelib.spec	16 Sep 2006 15:44:13 -0000	1.10
+++ shapelib.spec	22 Oct 2007 04:26:26 -0000	1.11
@@ -2,12 +2,13 @@
 Summary: API in "C" for Shapefile handling
 Name: shapelib
 Version: 1.2.10
-Release: 12.20060304cvs
+Release: 15.20060304cvs
 URL: http://shapelib.maptools.org/
 Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz
 Patch0: shapelib-1.2.10-Makefile.patch
 Patch1: shapelib-1.2.10-endian.patch
 Patch2: shapelib-1.2.10-Makefile2.patch
+Patch3: shapelib-build-id.patch
 License: LGPL/MIT
 Group: Development/Libraries
 BuildRequires: proj-devel >= 4.4.1
@@ -32,6 +33,7 @@
 %patch -p1 -b .buildroot
 %patch1 -p1 -b .endian
 %patch2 -p1 -b .buildroot
+%patch3 -p1 -b .buildroot
 
 %build
 make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" lib
@@ -72,6 +74,9 @@
 %exclude %{_libdir}/libshp.la
 
 %changelog
+* Sun Oct  21 2007 Shawn McCann <mccann0011 at hotmail.com> - 1.2.10-15.20060304cvs
+- Fix for bug 339931
+
 * Sat Sep  16 2006 Shawn McCann <mccann0011 at hotmail.com> - 1.2.10-12.20060304cvs
 - Rebuild for FC6
 




More information about the fedora-extras-commits mailing list