rpms/proj/FC-4 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/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21384/FC-4

Modified Files:
	.cvsignore proj.spec sources 
Added Files:
	pj_gridinfo.patch 
Log Message:
auto-import proj-4.4.9-1 on branch FC-4 from proj-4.4.9-1.src.rpm
Updated to proj-4.4.9 and to address bug 150013

pj_gridinfo.patch:

--- NEW FILE pj_gridinfo.patch ---
*** 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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proj/FC-4/.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	12 Jul 2005 03:39:57 -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/FC-4/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	12 Jul 2005 03:39:57 -0000	1.5
@@ -1,16 +1,17 @@
 Name: proj
-Version: 4.4.8
-Release: 6
+Version: 4.4.9
+Release: 1%{?dist}
 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} ./
+%patch2 -p0 -b .buildroot
+
 %build
 %configure
 make OPTIMIZE="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -88,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
 
@@ -120,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/FC-4/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	12 Jul 2005 03:39:57 -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