rpms/proj/EL-4 .cvsignore, 1.2, 1.3 proj.spec, 1.3, 1.4 sources, 1.2, 1.3 proj.test_scripts.patch, 1.1, NONE
Balint Cristian (rezso)
fedora-extras-commits at redhat.com
Wed May 28 14:48:55 UTC 2008
Author: rezso
Update of /cvs/pkgs/rpms/proj/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32719/EL-4
Modified Files:
.cvsignore proj.spec sources
Removed Files:
proj.test_scripts.patch
Log Message:
- new releas
- this will _NOT_ break API !
- however we need get rid of old proj.
- new proj now is under osgeo
----------------------------------------------------------------------
Modified Files:
EL-4/.cvsignore EL-4/proj.spec EL-4/sources
Removed Files:
EL-4/proj.test_scripts.patch
----------------------------------------------------------------------
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proj/EL-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 28 May 2008 14:46:08 -0000 1.3
@@ -1,2 +1,2 @@
-proj-4.4.8.tar.gz
-proj-nad27-1.1.tar.gz
+proj-4.6.0.tar.gz
+proj-datumgrid-1.3.zip
Index: proj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proj/EL-4/proj.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- proj.spec 5 Aug 2007 20:29:10 -0000 1.3
+++ proj.spec 28 May 2008 14:46:08 -0000 1.4
@@ -1,32 +1,37 @@
Name: proj
-Version: 4.4.8
-Release: 7
-Epoch: 0
+Version: 4.6.0
+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
-Source1: ftp://ftp.remotesensing.org/pub/proj/proj-nad27-1.1.tar.gz
+Source0: ftp://ftp.remotesensing.org/pub/proj/proj-%{version}.tar.gz
+Source1: ftp://ftp.remotesensing.org/pub/proj/proj-datumgrid-1.3.zip
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: libtool
+
%package devel
-Summary: Development files for PROJ.4
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary: Development files for PROJ.4
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
%package nad
-Summary: US and Canadian datum shift grids for PROJ.4
-Group: Applications/Engineering
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary: US and Canadian datum shift grids for PROJ.4
+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
+Proj and invproj perform respective forward and inverse transformation of
+cartographic data to or from cartesian data with a wide range of selectable
projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/
%description devel
@@ -35,21 +40,36 @@
%description nad
This package contains additional US and Canadian datum shift grids.
+%description epsg
+This package contains additional EPSG dataset.
+
%prep
%setup -q
# Prepare copyright
cp %{SOURCE2} ./
%patch0 -p0 -b .buildroot
-%patch1 -p1 -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
-gzip -dc %{SOURCE1} | tar -xvvf -
+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}
@@ -58,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
@@ -86,11 +119,52 @@
%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 4 2007 Shawn McCann <mccann0011 at hotmail.com> - 0:4.4.8-7
-- Rebuild for EPEL 4
+* 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
+
+* Sat Sep 16 2006 Shawn McCann <mccann0011 at hotmail.com> - 4.4.9-4
+- Rebuild for Fedora Extras 6
+
+* Sat Mar 4 2006 Shawn McCann <mccann0011 at hotmail.com> - 4.4.9-3
+- Rebuild for Fedora Extras 5
+
+* Sat Mar 4 2006 Shawn McCann <mccann0011 at hotmail.com> - 4.4.9-2
+- Rebuild for Fedora Extras 5
+
+* 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
+
+* Thu Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 4.4.8-5
+- rebuilt
* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-4
- Added testvarious to nad distribution
@@ -118,4 +192,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/pkgs/rpms/proj/EL-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 28 May 2008 14:46:08 -0000 1.3
@@ -1,2 +1,2 @@
-1bdfb7bf5df081d029828ed47b780519 proj-4.4.8.tar.gz
-66537aa24ad729d43db383abe2bf7707 proj-nad27-1.1.tar.gz
+975d9b5954869e53523726a9c0e0e070 proj-4.6.0.tar.gz
+23a7ef9cd079c774f13d62375a4fe1e6 proj-datumgrid-1.3.zip
--- proj.test_scripts.patch DELETED ---
More information about the fedora-extras-commits
mailing list