rpms/proj/EL-5 .cvsignore, 1.5, 1.6 proj.spec, 1.12, 1.13 sources, 1.5, 1.6 pj_gridinfo.patch, 1.2, NONE proj.test_scripts.patch, 1.1, NONE

[Balint Cristian (rezso)]

Author: rezso

Update of /cvs/pkgs/rpms/proj/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv919/EL-5

Modified Files:
	.cvsignore proj.spec sources 
Removed Files:
	pj_gridinfo.patch proj.test_scripts.patch 
Log Message:
- new upstream
- see comment for CVS commit EL-4 for 4.6.0-1
 ----------------------------------------------------------------------
 Modified Files:
 	EL-5/.cvsignore EL-5/proj.spec EL-5/sources 
 Removed Files:
 	EL-5/pj_gridinfo.patch EL-5/proj.test_scripts.patch 
 ----------------------------------------------------------------------



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proj/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Jan 2007 05:16:05 -0000	1.5
+++ .cvsignore	28 May 2008 14:55:26 -0000	1.6
@@ -1,2 +1,2 @@
-proj-4.5.0.tar.gz
 proj-datumgrid-1.3.zip
+proj-4.6.0.tar.gz


Index: proj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proj/EL-5/proj.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- proj.spec	5 Aug 2007 19:49:30 -0000	1.12
+++ proj.spec	28 May 2008 14:55:26 -0000	1.13
@@ -1,6 +1,6 @@
 Name: proj
-Version: 4.5.0
-Release: 3%{?dist}
+Version: 4.6.0
+Release: 1%{?dist}
 Summary: Cartographic projection software (PROJ.4)
 
 Group: Applications/Engineering
@@ -12,6 +12,8 @@
 Patch0: proj.copyright.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: libtool
+
 %package devel
 Summary: Development files for PROJ.4
 Group: Development/Libraries
@@ -22,6 +24,11 @@
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 
+%package epsg
+Summary: EPSG dataset for PROJ.4
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+
 %description
 Proj and invproj perform respective forward and inverse transformation of
 cartographic data to or from cartesian data with a wide range of selectable
@@ -33,6 +40,9 @@
 %description nad
 This package contains additional US and Canadian datum shift grids.
 
+%description epsg
+This package contains additional EPSG dataset.
+
 %prep
 %setup -q
 
@@ -41,12 +51,25 @@
 %patch0 -p0 -b .buildroot
 cp proj.copyright COPYING
 
+# disable internal libtool to avoid hardcoded r-path
+for makefile in `find . -type f -name 'Makefile.in'`; do
+sed -i 's|@LIBTOOL@|%{_bindir}/libtool|g' $makefile
+done
+
 # Prepare nad
 cd nad
 unzip %{SOURCE1}
 cd ..
+# fix shebag header of scripts
+for script in `find nad/ -type f -perm -a+x`; do
+sed -i -e '1,1s|:|#!/bin/bash|' $script
+done
 
 %build
+
+# fix version info to respect new ABI
+sed -i -e 's|5\:4\:5|6\:4\:6|' src/Makefile*
+
 %configure
 make OPTIMIZE="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
@@ -55,6 +78,19 @@
 %makeinstall
 install -p -m 0644 nad/pj_out27.dist nad/pj_out83.dist nad/td_out.dist $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -p -m 0755 nad/test27 nad/test83 nad/testvarious $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 0644 nad/epsg $RPM_BUILD_ROOT%{_datadir}/%{name}
+
+%check
+pushd nad
+# set test enviroment for porj
+export PROJ_LIB=$RPM_BUILD_ROOT%{_datadir}/%{name}
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH%{buildroot}%{_libdir}
+# run tests for proj
+./test27      $RPM_BUILD_ROOT%{_bindir}/%{name} || exit 0
+./test83      $RPM_BUILD_ROOT%{_bindir}/%{name} || exit 0
+./testntv2    $RPM_BUILD_ROOT%{_bindir}/%{name} || exit 0
+./testvarious $RPM_BUILD_ROOT%{_bindir}/%{name} || exit 0
+popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,11 +119,31 @@
 %attr(0755,root,root) %{_datadir}/%{name}/test27
 %attr(0755,root,root) %{_datadir}/%{name}/test83
 %attr(0755,root,root) %{_datadir}/%{name}/testvarious
+%exclude %{_datadir}/%{name}/epsg
 %{_datadir}/%{name}
 
+%files epsg
+%doc nad/README
+%defattr(-,root,root,-)
+%attr(0644,root,root) %{_datadir}/%{name}/epsg
+
 %changelog
-* Sun Aug   5 2007 Shawn McCann <mccann0011 at hotmail.com> - 4.5.0-3
-- Rebuild for EPEL 5
+* Sun Apr 20 2008 Balint Cristian <rezso at rdsor.ro> - 4.6.0-1
+- new branch
+
+* Thu Mar 27 2008 Balint Cristian <rezso at rdsor.ro> - 4.5.0-4
+- BuildRequire: libtool
+
+* Thu Mar 27 2008 Balint Cristian <rezso at rdsor.ro> - 4.5.0-3
+- enable EPSG dataset to be packed GRASS really needs it
+- no more license issue over epsg dataset, proj didnt altered
+  EPSG dataset in any way, so its fully EPSG license compliant
+- add support for tests during buildtime
+- disable hardcoded r-path from libs
+- fix shebag for nad scripts
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.5.0-2
+- Autorebuild for GCC 4.3
 
 * Tue Jan   2 2007 Shawn McCann <mccann0011 at hotmail.com> - 4.5.0-1
 - Updated to proj-4.5.0 and datumgrid-1.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proj/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Jan 2007 05:16:06 -0000	1.5
+++ sources	28 May 2008 14:55:26 -0000	1.6
@@ -1,2 +1,2 @@
-336fc8a12abbc4709e0bc1fb88a77436  proj-4.5.0.tar.gz
 23a7ef9cd079c774f13d62375a4fe1e6  proj-datumgrid-1.3.zip
+975d9b5954869e53523726a9c0e0e070  proj-4.6.0.tar.gz


--- pj_gridinfo.patch DELETED ---


--- proj.test_scripts.patch DELETED ---