From 9fa6c2e12cb8040d2cdf09f1573d0a27791d502b Mon Sep 17 00:00:00 2001
From: Shawn McCann <smccann@fedoraproject.org>
Date: Fri, 8 Jul 2005 05:23:35 +0000
Subject: [PATCH] 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

---
 .cvsignore        |  2 +-
 pj_gridinfo.patch | 23 +++++++++++++++++++----
 proj.spec         | 10 ++++++----
 sources           |  2 +-
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 19b0324..f6c7090 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-proj-nad27-1.1.tar.gz
 proj-4.4.9.tar.gz
+proj-nad27-1.1.tar.gz
diff --git a/pj_gridinfo.patch b/pj_gridinfo.patch
index 41a6fce..e9379ea 100644
--- a/pj_gridinfo.patch
+++ b/pj_gridinfo.patch
@@ -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 ) {}
diff --git a/proj.spec b/proj.spec
index db5bdeb..3b4b4b9 100644
--- a/proj.spec
+++ b/proj.spec
@@ -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 @@ cd ..
 
 # 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 0644 nad/pj_out27.dist nad/pj_out83.dist nad/td_out.dist $RPM_BUIL
 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 @@ install -p -m 0755 nad/test27 nad/test83 nad/testvarious $RPM_BUILD_ROOT%{_datad
 %{_datadir}/%{name}
 
 %changelog
+* Thu Jul  7 2005 Shawn McCann <mccann0011@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 @@ install -p -m 0755 nad/test27 nad/test83 nad/testvarious $RPM_BUILD_ROOT%{_datad
 - 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.
-
diff --git a/sources b/sources
index 2e164b4..aa803bf 100644
--- a/sources
+++ b/sources
@@ -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