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

[Shawn McCann (smccann)]

Author: smccann

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

Modified Files:
	.cvsignore proj.spec sources 
Added Files:
	pj_gridinfo.patch 
Log Message:
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

pj_gridinfo.patch:

--- NEW FILE pj_gridinfo.patch ---
493c493
<                              "failed to find parent %8.8s for %.\n", 
---
>                              "failed to find parent %8.8s for %s\n", 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proj/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jan 2005 09:45:21 -0000	1.2
+++ .cvsignore	7 Jul 2005 04:52:35 -0000	1.3
@@ -1,2 +1,2 @@
-proj-4.4.8.tar.gz
 proj-nad27-1.1.tar.gz
+proj-4.4.9.tar.gz


Index: proj.spec
===================================================================
RCS file: /cvs/extras/rpms/proj/devel/proj.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- proj.spec	22 May 2005 16:33:49 -0000	1.4
+++ proj.spec	7 Jul 2005 04:52:35 -0000	1.5
@@ -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 @@
 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 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proj/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jan 2005 09:45:21 -0000	1.2
+++ sources	7 Jul 2005 04:52:35 -0000	1.3
@@ -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