From f85b005b622b378cc054cc916a9a9b8a05ba23bf Mon Sep 17 00:00:00 2001
From: Shawn McCann <smccann@fedoraproject.org>
Date: Thu, 7 Jul 2005 04:52:35 +0000
Subject: [PATCH] auto-import proj-4.4.9-0 on branch devel from
 proj-4.4.9-0.src.rpm Update     to fix bugzilla reports 161726 and 150013

---
 .cvsignore        |  2 +-
 pj_gridinfo.patch |  4 ++++
 proj.spec         | 13 +++++++++----
 sources           |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 pj_gridinfo.patch

diff --git a/.cvsignore b/.cvsignore
index 15c9b2e..19b0324 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-proj-4.4.8.tar.gz
 proj-nad27-1.1.tar.gz
+proj-4.4.9.tar.gz
diff --git a/pj_gridinfo.patch b/pj_gridinfo.patch
new file mode 100644
index 0000000..41a6fce
--- /dev/null
+++ b/pj_gridinfo.patch
@@ -0,0 +1,4 @@
+493c493
+<                              "failed to find parent %8.8s for %.\n", 
+---
+>                              "failed to find parent %8.8s for %s\n", 
diff --git a/proj.spec b/proj.spec
index bd46cf6..db5bdeb 100644
--- a/proj.spec
+++ b/proj.spec
@@ -1,16 +1,17 @@
 Name: proj
-Version: 4.4.8
-Release: 6
+Version: 4.4.9
+Release: 0
 Summary: Cartographic projection software (PROJ.4)
 
 Group: Applications/Engineering
 License: MIT
 URL: http://www.remotesensing.org/proj/
-Source0: ftp://ftp.remotesensing.org/pub/proj/proj-4.4.8.tar.gz
+Source0: ftp://ftp.remotesensing.org/pub/proj/proj-%{version}.tar.gz
 Source1: ftp://ftp.remotesensing.org/pub/proj/proj-nad27-1.1.tar.gz
 Source2: http://packages.debian.org/changelogs/pool/main/p/proj/proj_4.4.8-3/proj.copyright
 Patch0: proj.copyright.patch
 Patch1: proj.test_scripts.patch
+Patch2: pj_gridinfo.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %package devel
@@ -48,6 +49,10 @@ cd nad
 gzip -dc %{SOURCE1} | tar -xvvf -
 cd ..
 
+# Patch for Bug 150013
+cp %{PATCH2} ./
+patch src/pj_gridinfo.c pj_gridinfo.patch
+
 %build
 %configure
 make OPTIMIZE="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -59,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
diff --git a/sources b/sources
index 0abe297..2e164b4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1bdfb7bf5df081d029828ed47b780519  proj-4.4.8.tar.gz
 66537aa24ad729d43db383abe2bf7707  proj-nad27-1.1.tar.gz
+3cc5c2407c213aadfd154c8df80efd6c  proj-4.4.9.tar.gz