From a00ead6e9f78a8213bb4996f8bdb6d0a9ac95e06 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:53:16 +0000 Subject: [PATCH 1/5] Initialize branch F-13 for arpack --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 6f9fa26401615d521634b636b4f1e43700366b29 Mon Sep 17 00:00:00 2001 From: athimm Date: Wed, 7 Apr 2010 17:38:23 +0000 Subject: [PATCH 2/5] License is now BSD. --- RiceBSD.doc | Bin 21504 -> 0 bytes RiceBSD.txt | 60 ++++++++---------- arpack.spec | 20 ++---- clarification-note-by-authors.txt | 102 ------------------------------ 4 files changed, 34 insertions(+), 148 deletions(-) delete mode 100644 RiceBSD.doc delete mode 100644 clarification-note-by-authors.txt diff --git a/RiceBSD.doc b/RiceBSD.doc deleted file mode 100644 index 1215d9a266c88488094837f0e8beb944915a3e5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21504 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

(?R(jl`(KCn?3VHQb!|#7qHFRmz##VJ z?9U9=qZTdVE}cD0X04pAbg-=(Tm)PMTm)PMTm)PMTm)PMTm)PMTm)PMTm(Mt2yp+( zoh|pve0R@%Ja@Q!U(a{-e6P)S^W4Alf1bG4=DT?A`?;6rKA-0SxSwY^|EY$1dhYwV zZ{G~!-uem<%dZ0GF8XSa1YHB_1zihb`NyDbcAROF8~%3)@C>Gb0}E0FaURUVxv*KF zUw`Pq=@G{|`cQKly{Y_c2W&_s?5~rted?ca`jDQp^KKMLoMxNAX-?hFIX~73?{)N( z*VCHMn3VH^IcM=}e+f{J9M;()ydGXNjt%v;+Qe#mn>eq2u&+~195)#?1Fx$@Ac}xl8SBp9{gT`r+}wL6kc$U zCFd0`g?`RqoU`iHPX&&qvR3~3!on{kcrD~uTzBZf)5CN1-|>5g*Dbuxis#aQHZjD` zonxyJ{Cved82tt;@a%Q%+|Bj7=FD2a{v#%JPcV|;IW}aei - 2.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Feb 23 2009 Fedora Release Engineering - 2.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Wed Apr 7 2010 Axel Thimm - 2.1-11 +- Change license to BSD (see RH bugs #234191 and #578873). * Wed Sep 24 2008 Dominik 'Rathann' Mierzejewski 2.1-10 - fix libarpack.so: undefined reference to `etime_' with recent gfortran diff --git a/clarification-note-by-authors.txt b/clarification-note-by-authors.txt deleted file mode 100644 index 796373a..0000000 --- a/clarification-note-by-authors.txt +++ /dev/null @@ -1,102 +0,0 @@ -X-Mozilla-Status: 0011 -X-Mozilla-Status2: 00000000 -Received: from zuk35exm65.ds.mot.com ([10.178.1.44]) by zuk35exm62.ds.mot.com with Microsoft SMTPSVC(6.0.3790.2709); - Tue, 13 Feb 2007 19:53:15 +0000 -Received: from az33exr02.mot.com ([10.64.251.232]) by zuk35exm65.ds.mot.com with Microsoft SMTPSVC(6.0.3790.2709); - Tue, 13 Feb 2007 19:53:14 +0000 -Received: from motgate3.mot.com (motgate3.mot.com [144.189.100.103]) - by az33exr02.mot.com (8.13.1/8.13.0) with ESMTP id l1DJrDDS020683 - for ; Tue, 13 Feb 2007 13:53:13 -0600 (CST) -Received: from mail128.messagelabs.com (mail128.messagelabs.com [216.82.250.131]) - by motgate3.mot.com (8.12.11/Motorola) with SMTP id l1DJr8gl023906 - for ; Tue, 13 Feb 2007 12:53:11 -0700 (MST) -X-VirusChecked: Checked -X-Env-Sender: sorensen@rice.edu -X-Msg-Ref: server-6.tower-128.messagelabs.com!1171396385!13383447!1 -X-StarScan-Version: 5.5.10.7.1; banners=-,-,- -X-Originating-IP: [128.42.17.10] -X-SpamReason: No, hits=0.0 required=7.0 tests= -Received: (qmail 3872 invoked from network); 13 Feb 2007 19:53:05 -0000 -Received: from caam.rice.edu (HELO caam.rice.edu) (128.42.17.10) - by server-6.tower-128.messagelabs.com with SMTP; 13 Feb 2007 19:53:05 -0000 -Received: from localhost (localhost [127.0.0.1]) - by caam.rice.edu (Postfix) with ESMTP id 64341153A7 - for ; Tue, 13 Feb 2007 13:53:04 -0600 (CST) -Received: from caam.rice.edu ([127.0.0.1]) - by localhost (caam.rice.edu [127.0.0.1]) (amavisd-new, port 10024) with LMTP - id 23777-01-16 for ; - Tue, 13 Feb 2007 13:52:59 -0600 (CST) -Received: from [128.42.21.177] (sorensenl400.caam.rice.edu [128.42.21.177]) - by caam.rice.edu (Postfix) with ESMTP id 494E81539F - for ; Tue, 13 Feb 2007 13:52:59 -0600 (CST) -Message-ID: <45D2171B.8030109@rice.edu> -Date: Tue, 13 Feb 2007 13:52:59 -0600 -From: Dan Sorensen -User-Agent: Thunderbird 1.5.0.9 (Windows/20061207) -MIME-Version: 1.0 -To: David Bateman -Subject: Re: ARPACK License Question -References: <457EE5B3.70402@ieee.org> <20070105114426.GI4860@neu.nirvana> <45B8CB2F.9030904@motorola.com> -In-Reply-To: <45B8CB2F.9030904@motorola.com> -Content-Type: text/plain; charset=ISO-8859-1; format=flowed -Content-Transfer-Encoding: 7bit -X-Virus-Scanned: by amavis-2.2.1 at caam.rice.edu -Return-Path: sorensen@rice.edu -X-OriginalArrivalTime: 13 Feb 2007 19:53:14.0831 (UTC) FILETIME=[994B7DF0:01C74FA8] - -Dear Mr. Bateman - -I apologize for not responding to this previously. - -The clarification we discussed is the following - - -The clause in the license statement that states - ->>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. - -has the following intension in your case. - -We are asking for acknowledgment in FEDORA that ARPACK is -the software that underlies what corresponds to the "eigs" command. -There is no intention to pass on a requirement of notification of use -from users of FEDORA. - -This is the understanding we have with MATLAB for example. - -If the above note or a slight modification of it is not acceptable -for the purposes of using ARPACK in FEDORA, I will have to refer -you to the tech transfer department of Rice University as I explained -during our phone conversation. - -Once again my apologies for the delay and I thank you for your -interest in ARPACK. - -Best Regards -Dan Sorensen - - - - - - - -David Bateman wrote: -> Dear Professor Sorensen, -> -> Perhaps you have not yet seen the e-mail below, and so I draw it to your -> attention. Can you please examine the request to modify the license of -> ARPACK in this mail belong to allow its inclusion in FEDORA and other -> similar open source linux distributions? -> -> As the author of the eigs function for Octave (www.octave.org) that uses -> ARPACK for its functionality, I'd hate to see my work not included in -> Octave due to this question not being resolved. -> -> Best Regards -> David -> -> - From 57baa5929adffb25fe6c1472a951bbe46793e8ca Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Wed, 7 Jul 2010 17:47:54 +0000 Subject: [PATCH 3/5] Clean up buildrequires, fix update path. --- arpack.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/arpack.spec b/arpack.spec index e7bfee8..71a5cdf 100644 --- a/arpack.spec +++ b/arpack.spec @@ -1,9 +1,7 @@ -%bcond_without gfortran - Summary: Fortran77 subroutines for solving large scale eigenvalue problems Name: arpack Version: 2.1 -Release: 11%{?dist} +Release: 13%{?dist} License: BSD Group: Development/Libraries URL: http://www.caam.rice.edu/software/ARPACK/ @@ -15,10 +13,8 @@ Patch0: arpack-2.1-redhat.patch Patch1: arpack-second-bug.patch Patch2: arpack-etime.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: %{?with_gfortran:gcc-gfortran}%{!?with_gfortran:/usr/bin/f77} -# The correct dependency would be the following, but it doesn't exist on RHEL4/3 -#BuildRequires: lapack-devel -BuildRequires: %{_libdir}/liblapack.so +BuildRequires: gcc-gfortran +BuildRequires: lapack-devel %description ARPACK is a collection of Fortran77 subroutines designed to solve large @@ -63,7 +59,7 @@ mkdir static shared cd shared for dir in ../SRC ../UTIL; do make -f $dir/Makefile VPATH=$dir srcdir=$dir \ - %{?with_gfortran:FC=gfortran} FFLAGS="%{optflags} -fPIC" \ + FC=gfortran FFLAGS="%{optflags} -fPIC" \ single double complex complex16 done gcc -shared -llapack -Wl,-soname,libarpack.so.2 -o libarpack.so.2.1 *.o @@ -71,7 +67,7 @@ cd .. cd static for dir in ../SRC ../UTIL; do make -f $dir/Makefile VPATH=$dir srcdir=$dir \ - %{?with_gfortran:FC=gfortran} FFLAGS="%{optflags}" LDFLAGS="-s" \ + FC=gfortran FFLAGS="%{optflags}" LDFLAGS="-s" \ all done ar rv libarpack.a *.o @@ -108,6 +104,11 @@ rm -rf %{buildroot} %{_libdir}/libarpack.a %changelog +* Wed Jul 7 2010 Jussi Lehtola - 2.1-13 +- Get rid of build conditionals related to EPEL 3/4 for which have not been + branched. +- Bump spec to fix update path. + * Wed Apr 7 2010 Axel Thimm - 2.1-11 - Change license to BSD (see RH bugs #234191 and #578873). From 6e290ad2f84a42c8387a9edcc588e05786a195a8 Mon Sep 17 00:00:00 2001 From: athimm Date: Thu, 8 Jul 2010 16:05:15 +0000 Subject: [PATCH 4/5] Undo "clean up". --- arpack.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/arpack.spec b/arpack.spec index 71a5cdf..1f11751 100644 --- a/arpack.spec +++ b/arpack.spec @@ -1,7 +1,9 @@ +%bcond_without gfortran + Summary: Fortran77 subroutines for solving large scale eigenvalue problems Name: arpack Version: 2.1 -Release: 13%{?dist} +Release: 12%{?dist} License: BSD Group: Development/Libraries URL: http://www.caam.rice.edu/software/ARPACK/ @@ -13,8 +15,10 @@ Patch0: arpack-2.1-redhat.patch Patch1: arpack-second-bug.patch Patch2: arpack-etime.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: gcc-gfortran -BuildRequires: lapack-devel +BuildRequires: %{?with_gfortran:gcc-gfortran}%{!?with_gfortran:/usr/bin/f77} +# The correct dependency would be the following, but it doesn't exist on RHEL4/3 +#BuildRequires: lapack-devel +BuildRequires: %{_libdir}/liblapack.so %description ARPACK is a collection of Fortran77 subroutines designed to solve large @@ -59,7 +63,7 @@ mkdir static shared cd shared for dir in ../SRC ../UTIL; do make -f $dir/Makefile VPATH=$dir srcdir=$dir \ - FC=gfortran FFLAGS="%{optflags} -fPIC" \ + %{?with_gfortran:FC=gfortran} FFLAGS="%{optflags} -fPIC" \ single double complex complex16 done gcc -shared -llapack -Wl,-soname,libarpack.so.2 -o libarpack.so.2.1 *.o @@ -67,7 +71,7 @@ cd .. cd static for dir in ../SRC ../UTIL; do make -f $dir/Makefile VPATH=$dir srcdir=$dir \ - FC=gfortran FFLAGS="%{optflags}" LDFLAGS="-s" \ + %{?with_gfortran:FC=gfortran} FFLAGS="%{optflags}" LDFLAGS="-s" \ all done ar rv libarpack.a *.o @@ -104,9 +108,7 @@ rm -rf %{buildroot} %{_libdir}/libarpack.a %changelog -* Wed Jul 7 2010 Jussi Lehtola - 2.1-13 -- Get rid of build conditionals related to EPEL 3/4 for which have not been - branched. +* Wed Jul 7 2010 Jussi Lehtola - 2.1-12 - Bump spec to fix update path. * Wed Apr 7 2010 Axel Thimm - 2.1-11 From 79ff9d066e495d4a61f570a16dc39ef63300700c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:12:34 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0947960..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: arpack -# $Id$ -NAME := arpack -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13