rpms/arpack/F-13 RiceBSD.txt, 1.1, 1.2 arpack.spec, 1.6, 1.7 RiceBSD.doc, 1.1, NONE clarification-note-by-authors.txt, 1.1, NONE

Wed Apr 7 17:38:23 UTC 2010

Author: athimm

Update of /cvs/pkgs/rpms/arpack/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22240/F-13

Modified Files:
	RiceBSD.txt arpack.spec 
Removed Files:
	RiceBSD.doc clarification-note-by-authors.txt 
Log Message:
License is now BSD.


Index: RiceBSD.txt
===================================================================
RCS file: /cvs/pkgs/rpms/arpack/F-13/RiceBSD.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2

--- RiceBSD.txt	26 Jan 2008 07:27:51 -0000	1.1
+++ RiceBSD.txt	7 Apr 2010 17:38:23 -0000	1.2
@@ -1,43 +1,37 @@
-Rice BSD Software License
 
-Permits source and binary redistribution of the software ARPACK and
-P_ARPACK for both non-commercial and commercial use.
+BSD Software License
 
- Copyright (©) 2001, Rice University
- Developed by D.C. Sorensen, R.B. Lehoucq, C. Yang, and K. Maschhoff.
- All rights reserved.
+Pertains to ARPACK and P_ARPACK
+
+Copyright (c) 1996-2008 Rice University.  
+Developed by D.C. Sorensen, R.B. Lehoucq, C. Yang, and K. Maschhoff.
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-o Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-
-o Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-o If you modify the source for these routines we ask that you change
-  the name of the routine and comment the changes made to the
-  original.
-
-o Written notification is provided to the developers of intent to use
-  this software.  Also, we ask that use of ARPACK is properly cited in
-  any resulting publications or software documentation.
-
-o Neither the name of Rice University (RICE) nor the names of its
+- Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer. 
+  
+- Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer listed
+  in this license in the documentation and/or other materials
+  provided with the distribution.
+  
+- Neither the name of the copyright holders nor the names of its
   contributors may be used to endorse or promote products derived from
   this software without specific prior written permission.
+  
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT  
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT  
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
-THIS SOFTWARE IS PROVIDED BY RICE AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL RICE OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


Index: arpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arpack/F-13/arpack.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- arpack.spec	24 Jul 2009 17:07:38 -0000	1.6
+++ arpack.spec	7 Apr 2010 17:38:23 -0000	1.7
@@ -3,16 +3,13 @@
 Summary: Fortran77 subroutines for solving large scale eigenvalue problems
 Name: arpack
 Version: 2.1
-Release: 12%{?dist}
-License: RiceBSD
+Release: 11%{?dist}
+License: BSD
 Group: Development/Libraries
 URL: http://www.caam.rice.edu/software/ARPACK/
 Source0: http://www.caam.rice.edu/software/ARPACK/SRC/arpack96.tar.gz
 Source1: http://www.caam.rice.edu/software/ARPACK/SRC/patch.tar.gz
-Source2: http://www.caam.rice.edu/software/ARPACK/RiceBSD.doc
-Source3: RiceBSD.txt
-# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=148107
-Source4: clarification-note-by-authors.txt
+Source2: http://www.caam.rice.edu/software/ARPACK/RiceBSD.txt
 Patch0: arpack-2.1-redhat.patch
 # see http://www.ann.jussieu.fr/pipermail/freefempp/2006/000213.html
 Patch1: arpack-second-bug.patch
@@ -88,7 +85,7 @@ install -p -m644 static/libarpack.a %{bu
 install -p -m755 shared/libarpack.so.2.1 %{buildroot}%{_libdir}
 ln -s libarpack.so.2.1 %{buildroot}%{_libdir}/libarpack.so.2
 ln -s libarpack.so.2 %{buildroot}%{_libdir}/libarpack.so
-cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} .
+cp -p %{SOURCE2} .
 
 %clean
 rm -rf %{buildroot}
@@ -99,7 +96,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc RiceBSD.doc clarification-note-by-authors.txt
+%doc RiceBSD.txt
 %{_libdir}/libarpack.so.*
 
 %files devel
@@ -111,11 +108,8 @@ rm -rf %{buildroot}
 %{_libdir}/libarpack.a
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr  7 2010 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.1-11
+- Change license to BSD (see RH bugs #234191 and #578873).
 
 * Wed Sep 24 2008 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 2.1-10
 - fix libarpack.so: undefined reference to `etime_' with recent gfortran


--- RiceBSD.doc DELETED ---


--- clarification-note-by-authors.txt DELETED ---

