rpms/proj/devel .cvsignore, 1.3, 1.4 pj_gridinfo.patch, 1.1, 1.2 proj.spec, 1.5, 1.6 sources, 1.3, 1.4

[Shawn McCann (smccann)]

Author: smccann

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

Modified Files:
	.cvsignore pj_gridinfo.patch proj.spec sources 
Log Message:
auto-import proj-4.4.9-1 on branch devel from proj-4.4.9-1.src.rpm
Update to address review comments in bug 150013


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proj/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jul 2005 04:52:35 -0000	1.3
+++ .cvsignore	8 Jul 2005 05:23:35 -0000	1.4
@@ -1,2 +1,2 @@
-proj-nad27-1.1.tar.gz
 proj-4.4.9.tar.gz
+proj-nad27-1.1.tar.gz

pj_gridinfo.patch:

Index: pj_gridinfo.patch
===================================================================
RCS file: /cvs/extras/rpms/proj/devel/pj_gridinfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pj_gridinfo.patch	7 Jul 2005 04:52:35 -0000	1.1
+++ pj_gridinfo.patch	8 Jul 2005 05:23:35 -0000	1.2
@@ -1,4 +1,19 @@
-493c493
-<                              "failed to find parent %8.8s for %.\n", 
----
->                              "failed to find parent %8.8s for %s\n", 
+*** src/pj_gridinfo.c	2004-10-29 21:03:03.000000000 -0700
+--- src/pj_gridinfo.c.new	2005-07-07 21:48:25.000000000 -0700
+***************
+*** 490,496 ****
+              {
+                  if( getenv("PROJ_DEBUG") != NULL )
+                      fprintf( stderr, "pj_gridinfo_init_ntv2(): "
+!                              "failed to find parent %8.8s for %.\n", 
+                               (const char *) header+24, gi->ct->id );
+  
+                  for( lnk = gp; lnk->next != NULL; lnk = lnk->next ) {}
+--- 490,496 ----
+              {
+                  if( getenv("PROJ_DEBUG") != NULL )
+                      fprintf( stderr, "pj_gridinfo_init_ntv2(): "
+!                              "failed to find parent %8.8s for %s\n", 
+                               (const char *) header+24, gi->ct->id );
+  
+                  for( lnk = gp; lnk->next != NULL; lnk = lnk->next ) {}


Index: proj.spec
===================================================================
RCS file: /cvs/extras/rpms/proj/devel/proj.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- proj.spec	7 Jul 2005 04:52:35 -0000	1.5
+++ proj.spec	8 Jul 2005 05:23:35 -0000	1.6
@@ -1,6 +1,6 @@
 Name: proj
 Version: 4.4.9
-Release: 0
+Release: 1%{?dist}
 Summary: Cartographic projection software (PROJ.4)
 
 Group: Applications/Engineering
@@ -51,7 +51,7 @@
 
 # Patch for Bug 150013
 cp %{PATCH2} ./
-patch src/pj_gridinfo.c pj_gridinfo.patch
+%patch2 -p0 -b .buildroot
 
 %build
 %configure
@@ -64,7 +64,7 @@
 install -p -m 0755 nad/test27 nad/test83 nad/testvarious $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %clean
-#rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -93,6 +93,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Jul  7 2005 Shawn McCann <mccann0011 at hotmail.com> - 4.4.9-1
+- Updated to proj-4.4.9 and to fix bugzilla reports 150013 and 161726. Patch2 can be removed once this package is upgraded to the next release of the source.
+
 * Sun May 22 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 4.4.8-6
 - rebuilt
 
@@ -125,4 +128,3 @@
 - to comply with both Fedora and RedHat 9 packaging guidelines.
 - Split files into proj, proj-devel, and proj-nad (additional grids)
 - and adjusted the EXE path in the test scripts.
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proj/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jul 2005 04:52:35 -0000	1.3
+++ sources	8 Jul 2005 05:23:35 -0000	1.4
@@ -1,2 +1,2 @@
-66537aa24ad729d43db383abe2bf7707  proj-nad27-1.1.tar.gz
 3cc5c2407c213aadfd154c8df80efd6c  proj-4.4.9.tar.gz
+66537aa24ad729d43db383abe2bf7707  proj-nad27-1.1.tar.gz