- new stable upstream
- new nad datumgrids
- drop debian license patch
- change homepage URLs
----------------------------------------------------------------------
Modified Files: devel/.cvsignore devel/proj.spec devel/sources Added
Files: devel/import.log Removed Files: devel/proj.copyright
devel/proj.copyright.patch
----------------------------------------------------------------------
This commit is contained in:
parent
29da86c3f2
commit
b54fac86e8
@ -1,2 +1,2 @@
|
||||
proj-datumgrid-1.3.zip
|
||||
proj-4.6.0.tar.gz
|
||||
proj-4.6.1.tar.gz
|
||||
proj-datumgrid-1.4.zip
|
||||
|
||||
1
import.log
Normal file
1
import.log
Normal file
@ -0,0 +1 @@
|
||||
proj-4_6_1-1_fc10:HEAD:proj-4.6.1-1.fc10.src.rpm:1220960846
|
||||
@ -1,60 +0,0 @@
|
||||
This package was debianized by Peter S Galbraith psg@debian.org on
|
||||
Sun, 24 Oct 1999 14:13:26 -0400.
|
||||
|
||||
It was downloaded from ftp://ftp.remotesensing.org/pub/proj/proj-4.4.5.tar.gz
|
||||
|
||||
Web page: http://www.remotesensing.org/proj
|
||||
Old Web pages: http://kai.er.usgs.gov/ftp/mapgenproj.html
|
||||
http://www.vectaport.com/ivmaps/projinfo.html
|
||||
|
||||
Version 4.3.3 was authored by:
|
||||
Gerald (Jerry) Ian Evenden
|
||||
email: gie@kai.er.usgs.gov gevenden@capecod.net
|
||||
phone: (508)563-6766
|
||||
P.O. Box 1027
|
||||
N.Falmouth, MA 02556-1027
|
||||
|
||||
Proj is a U.S. Government work and is not eligible for U.S. copyright
|
||||
protection. This is free software.
|
||||
|
||||
Here's what Jerry replied when I asked what the license was:
|
||||
|
||||
`The software was developed by the USGS and has no copyright
|
||||
nor license. Do with it what you will. :-)'
|
||||
|
||||
Maintenance of proj has been taken up by Frank Warmerdam <warmerda@home.com>
|
||||
under the following license:
|
||||
|
||||
All source, data files and other contents of the PROJ.4 package are
|
||||
available under the following terms. Note that the PROJ 4.3 and earlier
|
||||
was "public domain" as is common with US government work, but apparently
|
||||
this is not a well defined legal term in many countries. I am placing
|
||||
everything under the following MIT style license because I believe it is
|
||||
effectively the same as public domain, allowing anyone to use the code as
|
||||
they wish, including making proprietary derivatives.
|
||||
|
||||
Though I have put my own name as copyright holder, I don't mean to imply
|
||||
I did the work. Essentially all work was done by Gerald Evenden.
|
||||
|
||||
--------------
|
||||
|
||||
Copyright (c) 2000, Frank Warmerdam
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the "Software"),
|
||||
to deal in the Software without restriction, including without limitation
|
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
and/or sell copies of the Software, and to permit persons to whom the
|
||||
Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included
|
||||
in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
--- proj.copyright 2004-08-13 10:28:21.000000000 -0700
|
||||
+++ proj.copyright.fedora 2004-08-13 10:39:08.000000000 -0700
|
||||
@@ -1,3 +1,15 @@
|
||||
+This package was created for Fedora by David M. Kaplan dmkaplan@ucdavis.edu on
|
||||
+Fri Aug 13 10:31:34 PDT 2004.
|
||||
+
|
||||
+It was downloaded from ftp://ftp.remotesensing.org/pub/proj/proj-4.4.8.tar.gz
|
||||
+
|
||||
+Below is the version of the copyright that appeared with the Debian
|
||||
+version of this package. It explains the complete history of this
|
||||
+package, including the transfer of the license from a governmental
|
||||
+"public domain" license to an MIT-style license.
|
||||
+
|
||||
+==================Original Debian copyright file below======================
|
||||
+
|
||||
This package was debianized by Peter S Galbraith psg@debian.org on
|
||||
Sun, 24 Oct 1999 14:13:26 -0400.
|
||||
|
||||
32
proj.spec
32
proj.spec
@ -1,15 +1,13 @@
|
||||
Name: proj
|
||||
Version: 4.6.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Cartographic projection software (PROJ.4)
|
||||
Name: proj
|
||||
Version: 4.6.1
|
||||
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-%{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
|
||||
Group: Applications/Engineering
|
||||
License: MIT
|
||||
URL: http://proj.osgeo.org
|
||||
Source0: http://download.osgeo.org/proj/proj-%{version}.tar.gz
|
||||
Source1: http://download.osgeo.org/proj/proj-datumgrid-1.4.zip
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: libtool
|
||||
@ -46,11 +44,6 @@ This package contains additional EPSG dataset.
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
# Prepare copyright
|
||||
cp %{SOURCE2} ./
|
||||
%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
|
||||
@ -88,6 +81,7 @@ 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
|
||||
./testIGNF $RPM_BUILD_ROOT%{_bindir}/%{name} || exit 0
|
||||
./testntv2 $RPM_BUILD_ROOT%{_bindir}/%{name} || exit 0
|
||||
./testvarious $RPM_BUILD_ROOT%{_bindir}/%{name} || exit 0
|
||||
popd
|
||||
@ -128,6 +122,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%attr(0644,root,root) %{_datadir}/%{name}/epsg
|
||||
|
||||
%changelog
|
||||
* Fri Sep 05 2008 Balint Cristian <rezso@rdsor.ro> - 4.6.1-1
|
||||
- new stable upstream
|
||||
- new nad datumgrids
|
||||
- drop debian license patch
|
||||
- change homepage URLs
|
||||
|
||||
* Sun Apr 20 2008 Balint Cristian <rezso@rdsor.ro> - 4.6.0-1
|
||||
- new branch
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user