rpms/shapelib/devel shapelib-1.2.10-Makefile2.patch, 1.1, 1.2 shapelib.spec, 1.8, 1.9

[Shawn McCann (smccann)]

Author: smccann

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

Modified Files:
	shapelib-1.2.10-Makefile2.patch shapelib.spec 
Log Message:
Updated makefile bug that affected parallel builds


shapelib-1.2.10-Makefile2.patch:

Index: shapelib-1.2.10-Makefile2.patch
===================================================================
RCS file: /cvs/extras/rpms/shapelib/devel/shapelib-1.2.10-Makefile2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shapelib-1.2.10-Makefile2.patch	5 Mar 2006 16:53:38 -0000	1.1
+++ shapelib-1.2.10-Makefile2.patch	6 Mar 2006 04:18:17 -0000	1.2
@@ -1,5 +1,5 @@
 --- shapelib-1.2.11-orig/contrib/Makefile	2006-01-07 12:34:14.000000000 -0800
-+++ shapelib-1.2.11/contrib/Makefile	2006-03-04 20:11:01.000000000 -0800
++++ shapelib-1.2.11/contrib/Makefile	2006-03-05 20:09:06.000000000 -0800
 @@ -1,9 +1,10 @@
 +bindir = /usr/local/bin
  
@@ -12,6 +12,15 @@
  
  CFLAGS	=	-g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
  
+@@ -32,7 +33,7 @@
+ shpdata:	shpdata.c $(SHPGOBJ)
+ 	$(CC) $(CFLAGS) shpdata.c ${SHPOBJ} $(LINKOPT) $(GEOOBJ) -o shpdata
+ 
+-shpinfo:	shpinfo.c $(SHPOBJ)
++shpinfo:	shpinfo.c $(SHPGOBJ)
+ 	$(CC) $(CFLAGS) shpinfo.c ${SHPOBJ} $(LINKOPT) $(GEOOBJ) -o shpinfo
+ 
+ shpfix:		shpfix.c $(SHPOBJ)
 @@ -64,3 +65,7 @@
  
  testproj: 


Index: shapelib.spec
===================================================================
RCS file: /cvs/extras/rpms/shapelib/devel/shapelib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- shapelib.spec	5 Mar 2006 16:53:38 -0000	1.8
+++ shapelib.spec	6 Mar 2006 04:18:17 -0000	1.9
@@ -2,7 +2,7 @@
 Summary: API in "C" for Shapefile handling
 Name: shapelib
 Version: 1.2.10
-Release: 10.20060304cvs
+Release: 11.20060304cvs
 URL: http://shapelib.maptools.org/
 Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz
 Patch0: shapelib-1.2.10-Makefile.patch
@@ -72,6 +72,9 @@
 %exclude %{_libdir}/libshp.la
 
 %changelog
+* Sun Mar  5 2006 Shawn McCann <mccann0011 at hotmail.com> - 1.2.10-11.20060304cvs
+- Fixed a makefile bug that messed up parallel builds
+
 * Sat Mar  4 2006 Shawn McCann <mccann0011 at hotmail.com> - 1.2.10-10.20060304cvs
 - Upgraded to cvs snapshot taken on March 4, 2006