rpms/proj/devel proj.copyright, NONE, 1.1 proj.copyright.patch, NONE, 1.1 proj.spec, NONE, 1.1 proj.test_scripts.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Michael Schwendt (mschwendt) fedora-extras-commits at redhat.com
Fri Jan 14 09:45:23 UTC 2005


Author: mschwendt

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

Modified Files:
	.cvsignore sources 
Added Files:
	proj.copyright proj.copyright.patch proj.spec 
	proj.test_scripts.patch 
Log Message:
auto-import proj-4.4.8-4 on branch devel from proj-4.4.8-4.src.rpm


--- NEW FILE proj.copyright ---
This package was debianized by Peter S Galbraith psg at 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 at kai.er.usgs.gov   gevenden at 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 at 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.


proj.copyright.patch:

--- NEW FILE proj.copyright.patch ---
--- 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 at 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 at debian.org on
 Sun, 24 Oct 1999 14:13:26 -0400.
 


--- NEW FILE proj.spec ---
Name: proj
Version: 4.4.8
Release: 4
Epoch: 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
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%package devel
Summary:	Development files for PROJ.4
Group:		Development/Libraries
Requires:	%{name} = %{epoch}:%{version}-%{release}

%package nad
Summary:	US and Canadian datum shift grids for PROJ.4
Group:		Applications/Engineering
Requires:	%{name} = %{epoch}:%{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 
projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/

%description devel
This package contains libproj and the appropriate header files and man pages.

%description nad
This package contains additional US and Canadian datum shift grids.

%prep
%setup -q

# Prepare copyright
cp %{SOURCE2} ./
%patch0 -p0 -b .buildroot
%patch1 -p1 -b .buildroot
cp proj.copyright COPYING

# Prepare nad
cd nad
gzip -dc %{SOURCE1} | tar -xvvf -
cd ..

%build
%configure
make OPTIMIZE="$RPM_OPT_FLAGS" %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%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}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc NEWS AUTHORS COPYING README ChangeLog
%{_bindir}/*
%{_mandir}/man1/*.1*
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_mandir}/man3/*.3*
%{_includedir}/*.h
%{_libdir}/*.so
%{_libdir}/*.a
%exclude %{_libdir}/libproj.la

%files nad
%defattr(-,root,root,-)
%doc nad/README
%attr(0755,root,root) %{_datadir}/%{name}/test27
%attr(0755,root,root) %{_datadir}/%{name}/test83
%attr(0755,root,root) %{_datadir}/%{name}/testvarious
%{_datadir}/%{name}

%changelog
* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-4
- Added testvarious to nad distribution

* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-0.fdr.3
- Added patch for test scripts so that they will work in installed rpm

* Wed Dec 29 2004 David Kaplan <dmk at erizo.ucdavis.edu> - 0:4.4.8-0.fdr.2
- Fixed permissions on nad27 and nad83
- Included test27 and test83 in the nad rpm and made them executable

* Fri Aug 13 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:4.4.8-0.fdr.1
- Updated to version 4.4.8 of library.
- Changed license file so that it agrees with Debian version.
- Updated web addresses of packages.

* Wed Aug 11 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:4.4.7-0.fdr.3
- Removed the "Requires(post,postun)"

* Tue Dec 30 2003 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:4.4.7-0.fdr.2
- proj-nad now owns %{_datadir}/%{name}

* Wed Oct 29 2003 Steve Arnold <sarnold at arnolds.dhs.org>
- Basically re-wrote previous spec file from scratch so as
- 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.


proj.test_scripts.patch:

--- NEW FILE proj.test_scripts.patch ---
diff -Naur proj-4.4.8.orig/nad/test27 proj-4.4.8/nad/test27
--- proj-4.4.8.orig/nad/test27	2004-12-29 13:00:31.428068481 -0800
+++ proj-4.4.8/nad/test27	2004-12-29 13:00:55.742384745 -0800
@@ -8,7 +8,7 @@
 #   Mercator due to greater precision of meridinal distance function.
 #
 OUT=proj_out27
-EXE=../src/proj
+EXE=proj
 INIT_FILE=./nad27
 #
 echo "doing tests into file ${OUT}, please wait"
diff -Naur proj-4.4.8.orig/nad/test83 proj-4.4.8/nad/test83
--- proj-4.4.8.orig/nad/test83	2004-12-29 13:00:31.421069541 -0800
+++ proj-4.4.8/nad/test83	2004-12-29 13:01:04.976985631 -0800
@@ -8,7 +8,7 @@
 #   Mercator due to greater precision of meridinal distance function.
 #
 OUT=proj_out83
-EXE=../src/proj
+EXE=proj
 INIT_FILE=./nad83
 #
 echo "doing tests into file ${OUT}, please wait"
diff -Naur proj-4.4.8.orig/nad/testvarious proj-4.4.8/nad/testvarious
--- proj-4.4.8.orig/nad/testvarious	2004-12-29 13:00:31.420069693 -0800
+++ proj-4.4.8/nad/testvarious	2004-12-29 13:35:39.314658254 -0800
@@ -3,7 +3,7 @@
 #
 #
 OUT=td_out
-EXE=../src/cs2cs
+EXE=cs2cs
 #
 echo "doing tests into file ${OUT}, please wait"
 rm -f ${OUT}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proj/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2005 09:42:08 -0000	1.1
+++ .cvsignore	14 Jan 2005 09:45:21 -0000	1.2
@@ -0,0 +1,2 @@
+proj-4.4.8.tar.gz
+proj-nad27-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proj/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2005 09:42:08 -0000	1.1
+++ sources	14 Jan 2005 09:45:21 -0000	1.2
@@ -0,0 +1,2 @@
+1bdfb7bf5df081d029828ed47b780519  proj-4.4.8.tar.gz
+66537aa24ad729d43db383abe2bf7707  proj-nad27-1.1.tar.gz




More information about the fedora-extras-commits mailing list