From 6f668c918bdf1a4b9501db497c2388b1a75347f0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 21 Aug 2009 18:24:15 +0000 Subject: [PATCH 01/10] Initialize branch EL-5 for apbs --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 4e0394a358112533479354e8cb28e7383d752c3b Mon Sep 17 00:00:00 2001 From: Timothy Fenn Date: Fri, 21 Aug 2009 20:52:12 +0000 Subject: [PATCH 02/10] - initial CVS commit --- .cvsignore | 1 + LGPL_V2 | 482 ++++++++++++++++++++++++++++++++++++++++ apbs-configure.ac.patch | 39 ++++ apbs-makefile.am.patch | 96 ++++++++ apbs.spec | 205 +++++++++++++++++ import.log | 1 + sources | 1 + 7 files changed, 825 insertions(+) create mode 100644 LGPL_V2 create mode 100644 apbs-configure.ac.patch create mode 100644 apbs-makefile.am.patch create mode 100644 apbs.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..dad4ed2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +apbs-1.1.0-source.tar.gz diff --git a/LGPL_V2 b/LGPL_V2 new file mode 100644 index 0000000..a96b573 --- /dev/null +++ b/LGPL_V2 @@ -0,0 +1,482 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor + Boston, MA 02110-1301, USA. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/apbs-configure.ac.patch b/apbs-configure.ac.patch new file mode 100644 index 0000000..162d141 --- /dev/null +++ b/apbs-configure.ac.patch @@ -0,0 +1,39 @@ +--- configure.ac_orig 2009-07-10 11:37:12.000000000 -0700 ++++ configure.ac 2009-07-10 16:02:33.000000000 -0700 +@@ -390,7 +390,7 @@ + + if test -n "${USE_FETK_LIBRARY}"; then + maloc_lib_path="${fetk_library_path}" +- AC_CHECK_FILE(${maloc_lib_path}/libmaloc.a,[maloc_lib="yes"],[maloc_lib=""]) ++ AC_CHECK_FILE(${maloc_lib_path}/libmaloc.so,[maloc_lib="yes"],[maloc_lib=""]) + if test -z "${maloc_lib}"; then + AC_MSG_ERROR([Error... Couldn't find FETK library files in the location you specified]) + fi +@@ -806,7 +806,7 @@ + fi + LDFLAGS=${LDFLAGS_SAVE}; + CPPFLAGS=${CPPFLAGS_SAVE}; +-AC_SUBST(rl_lib) ++# AC_SUBST(rl_lib) + + dnl # BEGIN FETK LIBRARY/HEADER TEST BLOCK + dnl # ----------------------- +@@ -1028,6 +1028,7 @@ + blas_lib=${contrib_path}/blas/.libs/libapbsblas.a + fi + AC_SUBST(apbs_do_blas) ++AC_SUBST(blas_lib) + + dnl # ----------------------- + dnl # If using Portland compilers, do not compile +@@ -1206,7 +1207,9 @@ + else + apbs_build_libraries="${top_apbsdir}/bin/libapbsmainroutines.la \ + ${top_apbsdir}/src/aaa_lib/libapbs.la \ +- ${maloc_lib} ${lib_list}" ++ ${top_apbsdir}/contrib/pmgZ/libapbspmgz.la \ ++ ${top_apbsdir}/contrib/aqua/libapbsaqua.la \ ++ ${maloc_lib} ${blas_lib} ${lib_list}" + fi + AC_SUBST(apbs_build_libraries) + diff --git a/apbs-makefile.am.patch b/apbs-makefile.am.patch new file mode 100644 index 0000000..9f8bda0 --- /dev/null +++ b/apbs-makefile.am.patch @@ -0,0 +1,96 @@ +--- ./tools/python/Makefile.am_orig 2009-07-23 12:08:49.000000000 -0700 ++++ ./tools/python/Makefile.am 2009-07-23 13:20:16.000000000 -0700 +@@ -16,4 +16,5 @@ + noinst_PROGRAMS = _apbslib.so + _apbslib_so_SOURCES = apbslib.c + _apbslib_so_LINK = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED) +-_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a ${top_builddir}/contrib/blas/.libs/libapbsblas.a $(PY_LDFLAGS) ++_apbslib_so_LDFLAGS = @maloc_lib@ @blas_lib@ $(PY_LDFLAGS) ++_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.so ${top_builddir}/src/aaa_lib/.libs/libapbs.so +--- ./tools/python/vgrid/Makefile.am_orig 2009-03-05 12:30:03.000000000 -0800 ++++ ./tools/python/vgrid/Makefile.am 2009-07-23 13:20:08.000000000 -0700 +@@ -16,5 +16,6 @@ + noinst_PROGRAMS = _vgrid.so + _vgrid_so_SOURCES = vgridlib.c + _vgrid_so_LINK = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED) +- _vgrid_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a $(PY_LDFLAGS) ${top_builddir}/contrib/lib/libmaloc.a @lib_list@ ++ _vgrid_so_LDFLAGS = $(PY_LDFLAGS) @maloc_lib@ @lib_list@ ++ _vgrid_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.so ${top_builddir}/src/aaa_lib/.libs/libapbs.so + endif +--- ./tools/arpack/Makefile.am_orig 2009-07-23 13:20:45.000000000 -0700 ++++ ./tools/arpack/Makefile.am 2009-07-23 13:20:47.000000000 -0700 +@@ -12,7 +12,7 @@ + + noinst_PROGRAMS = driver + driver_SOURCES = driver.c readhb.f ardriv.f +-driver_LDADD = ../../src/aaa_lib/libapbs.la @arpack_lib@ @apbs_build_libraries@ ++driver_LDADD = ../../src/aaa_lib/libapbs.la @arpack_lib@ @apbs_build_libraries@ -latlas + INCLUDES = @inc_list@ + AM_CFLAGS = @CFLAGS@ + AM_LDFLAGS = @LDFLAGS@ @FFLAGS@ +--- ./bin/Makefile.am_orig 2009-07-22 22:08:44.000000000 -0700 ++++ ./bin/Makefile.am 2009-07-22 22:11:07.000000000 -0700 +@@ -12,24 +12,24 @@ + + build_libraries = @apbs_build_libraries@ + +-bindir = ${prefix}/bin ++# bindir = ${prefix}/bin + bin_PROGRAMS = apbs + apbs_SOURCES = main.c +-apbs_LDADD = ${build_libraries} ++apbs_LDADD = ${build_libraries} ./libapbsmainroutines.la + +-libdir = ${prefix}/lib ++# libdir = ${prefix}/lib + lib_LTLIBRARIES = libapbsmainroutines.la + libapbsmainroutines_la_SOURCES = routines.c +-libapbsmainroutines_la_LDFLAGS = -version-info ${APBS_VERSION} ++libapbsmainroutines_la_LDFLAGS = @maloc_lib@ ../src/aaa_lib/libapbs.la -version-info ${APBS_VERSION} + + INCLUDES = @inc_list@ + AM_CFLAGS= @wall_pedantic@ + AM_LDFLAGS = @LDFLAGS@ @FFLAGS@ + +-includedir = ${prefix}/include/apbs +-include_HEADERS = routines.h ++# includedir = ${prefix}/include/apbs ++# include_HEADERS = routines.h + +-install-data-local: +- -cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin +- -chmod 755 ${prefix}/bin/ApbsClient.py +- -rm -f ${prefix}/bin/wsdl2py +\ No newline at end of file ++#install-data-local: ++# -cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin ++# -chmod 755 ${prefix}/bin/ApbsClient.py ++# -rm -f ${prefix}/bin/wsdl2py +--- ./src/aaa_lib/Makefile.am_orig 2009-07-22 22:08:57.000000000 -0700 ++++ ./src/aaa_lib/Makefile.am 2009-07-22 22:12:12.000000000 -0700 +@@ -18,12 +18,12 @@ + AQUA_LIBS = ${top_builddir}/contrib/aqua/libapbsaqua.la + BLAS_LIBS = @blas_lib@ + +-libdir = ${prefix}/lib ++# libdir = ${prefix}/lib + lib_LTLIBRARIES = libapbs.la + + libapbs_la_SOURCES = apbs_link.c + libapbs_la_LIBADD = ${GEN_LIBS} ${FEM_LIBS} ${MG_LIBS} ${PMGZ_LIBS} ${AQUA_LIBS} ${BLAS_LIBS} +-libapbs_la_LDFLAGS = -version-info ${APBS_VERSION} ++libapbs_la_LDFLAGS = @maloc_lib@ -version-info ${APBS_VERSION} + + INCLUDES = -I${top_srcdir}/src/generic -I${top_srcdir}/src/mg -I${top_srcdir}/src/fem @inc_list@ + AM_CFLAGS = @wall_pedantic@ +--- ./contrib/opal/Makefile.am_orig 2009-07-23 17:40:40.000000000 -0700 ++++ ./contrib/opal/Makefile.am 2009-07-23 17:40:08.000000000 -0700 +@@ -9,7 +9,7 @@ + AUTOMAKE_OPTIONS = no-dependencies + SUFFIXES = .H .h .C .c .f .o + +-always_built_SUBDIRS = ZSI ++# always_built_SUBDIRS = ZSI + + SUBDIRS = $(always_built_SUBDIRS) . + diff --git a/apbs.spec b/apbs.spec new file mode 100644 index 0000000..46a0a17 --- /dev/null +++ b/apbs.spec @@ -0,0 +1,205 @@ +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + +Name: apbs +Summary: Adaptive Poisson Boltzmann Solver +Version: 1.1.0 +Release: 7%{?dist} +# License of pmgZ, aqua and contrib/blas/mblasd.f is LGPLv2+, the rest is BSD. +License: LGPLv2+ and BSD +Group: Applications/Engineering +URL: http://apbs.sourceforge.net/ +Source0: http://downloads.sourceforge.net/apbs/%{name}-%{version}-source.tar.gz +Source1: LGPL_V2 +# adds blas_lib to AC_SUBST so Makefiles are complete +Patch0: apbs-configure.ac.patch +# removes hardcoded prefix setting so DESTDIR works +Patch1: apbs-makefile.am.patch +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: arpack-devel +BuildRequires: atlas-devel +BuildRequires: blas-devel +BuildRequires: maloc-devel +BuildRequires: python-devel +Requires: python-ZSI + +%description +APBS is a software package for the numerical solution of the +Poisson-Boltzmann equation (PBE), one of the most popular continuum +models for describing electrostatic interactions between molecular +solutes in salty, aqueous media. APBS was designed to efficiently +evaluate electrostatic properties for such simulations for a wide +range of length scales to enable the investigation of molecules with +tens to millions of atoms. It is also widely used in molecular +visualization (in such applications as PyMOL). + +%package tools +Summary: utility programs that utilize the APBS package +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} + +%description tools + +The apbs-tools package contains several utility programs for +conversion, analysis and preparation of files that use the adaptive +poisson boltzmann solver library. + +%package devel +Summary: Libraries and header files for the APBS package +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel + +The apbs-devel package contains the header files and libraries +necessary for developing programs using the adaptive poisson boltzmann +(APBS) solver library. + +%package doc +Summary: Documentation for the APBS package +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} + +%description doc + +The apbs-doc package contains API reference inforemation for +development using the adaptive poisson boltzmann (APBS) solver +library. + +%prep +%setup -q -n %{name}-%{version}-source +%patch0 -p0 +%patch1 -p0 +libtoolize --automake +aclocal +autoheader +automake --gnu +autoconf + +install -p -m 644 %{SOURCE1} . + +# ensure maloc isn't built +rm -rf contrib/maloc + +rm doc/programmer/cooc-filter.sh +rm doc/programmer/apbs.css +rm doc/programmer/html/apbs.css +rm doc/programmer/html/vcap_8h__incl.map +rm doc/programmer/html/vpee_8h__incl.map +rm doc/programmer/html/dummy_8c__incl.map + +%build +%configure --with-blas='-L%{_libdir}/atlas -lf77blas -latlas -lblas' --with-fetk-include=%{_includedir} --with-fetk-library=%{_libdir} --with-arpack=%{_libdir}/atlas --enable-python --enable-shared --disable-static FFLAGS="-I/usr/include/atlas" +# die, rpath, die. +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +sed -i 's|\"/usr/local/apbs-1.1.0\"|\"%{python_sitelib}/apbs\"|g' bin/ApbsClient.py + +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} + +make install DESTDIR=%{buildroot} INSTALL='install -p' CPPROG="cp -p" + +install -p -m 755 bin/ApbsClient.py %{buildroot}%{_bindir}/ + +mkdir -p ${RPM_BUILD_ROOT}%{python_sitelib}/apbs +cp -p contrib/opal/opal-py-1.9.3/wsdl/*.py ${RPM_BUILD_ROOT}%{python_sitelib}/apbs/ + +mkdir -p %{buildroot}%{_includedir}/apbs +install -p -m 644 src/aaa_inc/apbs/*.h %{buildroot}%{_includedir}/apbs/ + +# tools +for bin in tools/manip/{psize.py,coulomb,born} tools/mesh/{mgmesh,dxmath,mergedx2,mergedx,value,uhbd_asc2bin,smooth,dx2mol,dx2uhbd,similarity,multivalue,benchmark,analysis} tools/arpack/driver; do + install -p -m 755 $bin %{buildroot}%{_bindir}/apbs-`basename $bin` +done + +# remove unpackaged files from buildroot +rm -f %{buildroot}%{_libdir}/*.la + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING LGPL_V2 README ChangeLog +%{_bindir}/apbs +%{_bindir}/ApbsClient.py +%if 0%{?fedora}<11 || 0%{?rhel} == 4 || 0%{?rhel} == 5 +%exclude %{_bindir}/*.pyc +%exclude %{_bindir}/*.pyo +%endif +%{_libdir}/libapbs.so.* +%{_libdir}/libapbsmainroutines.so.* +%{python_sitelib}/apbs/ + +%files tools +%defattr(-,root,root,-) +%{_bindir}/apbs-psize.py +%{_bindir}/apbs-coulomb +%{_bindir}/apbs-born +%{_bindir}/apbs-mgmesh +%{_bindir}/apbs-dxmath +%{_bindir}/apbs-mergedx2 +%{_bindir}/apbs-mergedx +%{_bindir}/apbs-value +%{_bindir}/apbs-uhbd_asc2bin +%{_bindir}/apbs-smooth +%{_bindir}/apbs-dx2mol +%{_bindir}/apbs-dx2uhbd +%{_bindir}/apbs-similarity +%{_bindir}/apbs-multivalue +%{_bindir}/apbs-benchmark +%{_bindir}/apbs-analysis +%{_bindir}/apbs-driver + +%files devel +%defattr(-,root,root,-) +%{_libdir}/libapbs.so +%{_libdir}/libapbsmainroutines.so +%{_includedir}/apbs + +%files doc +%defattr(-,root,root,-) +%doc doc/programmer/ + +%changelog +* Mon Jul 27 2009 Tim Fenn - 1.1.0-7 +- remove python byte compiled files in bindir +- loop to add tools + +* Sun Jul 26 2009 Tim Fenn - 1.1.0-6 +- remove check macro + +* Fri Jul 24 2009 Tim Fenn - 1.1.0-5 +- enable and add arpack, python to buildrequires, fix files section accordingly +- add check macro +- move tools to a subpackage +- move doc into subpackage +- spec cleanup + +* Thu Jul 23 2009 Tim Fenn - 1.1.0-4 +- merge aqua and pmgZ into libapbs + +* Fri Jul 10 2009 Tim Fenn - 1.1.0-3 +- separate aqua and pmgZ into separate libraries/packages +- add maloc BuildRequires + +* Mon May 04 2009 Tim Fenn - 1.1.0-2 +- fix RPM_BUILD_ROOT +- rename patches +- add "-q" to setup +- add README to doc +- edit description +- edit license + +* Fri Apr 24 2009 Tim Fenn - 1.1.0-1 +- initial build diff --git a/import.log b/import.log new file mode 100644 index 0000000..cf5a334 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +apbs-1_1_0-7_fc10:EL-5:apbs-1.1.0-7.fc10.src.rpm:1250887920 diff --git a/sources b/sources index e69de29..ca113f8 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +ca31ba09714e4fc9acce91e7961569cd apbs-1.1.0-source.tar.gz From 83e161292bee450b6b83c2d56c7d41cab1174ff4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:28:13 +0000 Subject: [PATCH 03/10] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 623b8bf..a10ea52 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: apbs -# $Id$ +# $Id: Makefile,v 1.1 2009/08/21 18:24:12 ausil Exp $ NAME := apbs 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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From 63a0b4f60a911a35c3736254139dfa0e4b06bb9a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:28:14 +0000 Subject: [PATCH 04/10] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 623b8bf..a10ea52 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: apbs -# $Id$ +# $Id: Makefile,v 1.1 2009/08/21 18:24:12 ausil Exp $ NAME := apbs 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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From 4daad0a9c52f59928d69250f655567e6a6eb72a4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:42:52 +0000 Subject: [PATCH 05/10] Initialize branch EL-6 for apbs --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 8a856cc3b8274e2fa32c0988f436bfe4b326334d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:04:18 +0000 Subject: [PATCH 06/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 a10ea52..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: apbs -# $Id: Makefile,v 1.1 2009/08/21 18:24:12 ausil Exp $ -NAME := apbs -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 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 diff --git a/import.log b/import.log deleted file mode 100644 index cf5a334..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -apbs-1_1_0-7_fc10:EL-5:apbs-1.1.0-7.fc10.src.rpm:1250887920 From a6e6310216a8fe0b4ae2c7c98c748181e108974a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:04:19 +0000 Subject: [PATCH 07/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 a10ea52..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: apbs -# $Id: Makefile,v 1.1 2009/08/21 18:24:12 ausil Exp $ -NAME := apbs -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 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index 4304fcb..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -apbs-1_1_0-7_fc10:HEAD:apbs-1.1.0-7.fc10.src.rpm:1250887770 From 7de5b913893874060648b14ef0c5343ef2f90aa4 Mon Sep 17 00:00:00 2001 From: Tim Fenn Date: Thu, 26 Aug 2010 13:36:49 -0700 Subject: [PATCH 08/10] update to 1.2.1 --- .gitignore | 1 + apbs-configure.ac.patch | 43 +++++++++-- apbs-makefile.am.patch | 164 ++++++++++++++++++++++------------------ apbs.spec | 23 ++++-- sources | 2 +- 5 files changed, 146 insertions(+), 87 deletions(-) diff --git a/.gitignore b/.gitignore index dad4ed2..fe06b17 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ apbs-1.1.0-source.tar.gz +/apbs-1.2.1-source.tar.gz diff --git a/apbs-configure.ac.patch b/apbs-configure.ac.patch index 162d141..7f882f7 100644 --- a/apbs-configure.ac.patch +++ b/apbs-configure.ac.patch @@ -1,6 +1,37 @@ ---- configure.ac_orig 2009-07-10 11:37:12.000000000 -0700 -+++ configure.ac 2009-07-10 16:02:33.000000000 -0700 -@@ -390,7 +390,7 @@ +--- configure.ac_orig 2009-11-25 12:23:02.275659561 -0800 ++++ configure.ac 2009-11-29 23:16:42.319661207 -0800 +@@ -230,14 +230,16 @@ + CXXFLAGS=`echo ${CXXFLAGS} | sed 's/-g//g'`; + fi + fi +-AC_F77_NOFORMAIN ++# AC_F77_NOFORMAIN + FFLAGS="${FLIBS} ${FFLAGS}" +-if test "${CC}" != "icl"; then +- AC_F77_FCN_MANGLE() +-fi ++# this macro is broken, so be sure to set -DVF77_ONEUNDERSCORE ++# if test "${CC}" != "icl"; then ++# AC_F77_FCN_MANGLE() ++# fi + AC_LANG_C + AC_PROG_CPP +-AC_DISABLE_SHARED ++# AC_DISABLE_SHARED ++AC_DISABLE_STATIC + AM_PROG_LIBTOOL + + dnl ########################################################################## +@@ -308,7 +310,7 @@ + dnl # HANDLE COMPILER FLOATING POINT ERROR + dnl # ------------------------------------ + +-AC_FPERROR ++# AC_FPERROR + + dnl ########################################################################## + dnl 8. checks for library functions +@@ -390,7 +392,7 @@ if test -n "${USE_FETK_LIBRARY}"; then maloc_lib_path="${fetk_library_path}" @@ -9,7 +40,7 @@ if test -z "${maloc_lib}"; then AC_MSG_ERROR([Error... Couldn't find FETK library files in the location you specified]) fi -@@ -806,7 +806,7 @@ +@@ -810,7 +812,7 @@ fi LDFLAGS=${LDFLAGS_SAVE}; CPPFLAGS=${CPPFLAGS_SAVE}; @@ -18,7 +49,7 @@ dnl # BEGIN FETK LIBRARY/HEADER TEST BLOCK dnl # ----------------------- -@@ -1028,6 +1028,7 @@ +@@ -1032,6 +1034,7 @@ blas_lib=${contrib_path}/blas/.libs/libapbsblas.a fi AC_SUBST(apbs_do_blas) @@ -26,7 +57,7 @@ dnl # ----------------------- dnl # If using Portland compilers, do not compile -@@ -1206,7 +1207,9 @@ +@@ -1258,7 +1261,9 @@ else apbs_build_libraries="${top_apbsdir}/bin/libapbsmainroutines.la \ ${top_apbsdir}/src/aaa_lib/libapbs.la \ diff --git a/apbs-makefile.am.patch b/apbs-makefile.am.patch index 9f8bda0..16463fc 100644 --- a/apbs-makefile.am.patch +++ b/apbs-makefile.am.patch @@ -1,73 +1,16 @@ ---- ./tools/python/Makefile.am_orig 2009-07-23 12:08:49.000000000 -0700 -+++ ./tools/python/Makefile.am 2009-07-23 13:20:16.000000000 -0700 -@@ -16,4 +16,5 @@ - noinst_PROGRAMS = _apbslib.so - _apbslib_so_SOURCES = apbslib.c - _apbslib_so_LINK = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED) --_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a ${top_builddir}/contrib/blas/.libs/libapbsblas.a $(PY_LDFLAGS) -+_apbslib_so_LDFLAGS = @maloc_lib@ @blas_lib@ $(PY_LDFLAGS) -+_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.so ${top_builddir}/src/aaa_lib/.libs/libapbs.so ---- ./tools/python/vgrid/Makefile.am_orig 2009-03-05 12:30:03.000000000 -0800 -+++ ./tools/python/vgrid/Makefile.am 2009-07-23 13:20:08.000000000 -0700 -@@ -16,5 +16,6 @@ - noinst_PROGRAMS = _vgrid.so - _vgrid_so_SOURCES = vgridlib.c - _vgrid_so_LINK = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED) -- _vgrid_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a $(PY_LDFLAGS) ${top_builddir}/contrib/lib/libmaloc.a @lib_list@ -+ _vgrid_so_LDFLAGS = $(PY_LDFLAGS) @maloc_lib@ @lib_list@ -+ _vgrid_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.so ${top_builddir}/src/aaa_lib/.libs/libapbs.so - endif ---- ./tools/arpack/Makefile.am_orig 2009-07-23 13:20:45.000000000 -0700 -+++ ./tools/arpack/Makefile.am 2009-07-23 13:20:47.000000000 -0700 -@@ -12,7 +12,7 @@ +--- ./contrib/opal/Makefile.am_orig 2009-11-24 18:56:20.564534299 -0800 ++++ ./contrib/opal/Makefile.am 2009-11-24 18:59:57.836534326 -0800 +@@ -9,7 +9,7 @@ + AUTOMAKE_OPTIONS = no-dependencies + SUFFIXES = .H .h .C .c .f .o - noinst_PROGRAMS = driver - driver_SOURCES = driver.c readhb.f ardriv.f --driver_LDADD = ../../src/aaa_lib/libapbs.la @arpack_lib@ @apbs_build_libraries@ -+driver_LDADD = ../../src/aaa_lib/libapbs.la @arpack_lib@ @apbs_build_libraries@ -latlas - INCLUDES = @inc_list@ - AM_CFLAGS = @CFLAGS@ - AM_LDFLAGS = @LDFLAGS@ @FFLAGS@ ---- ./bin/Makefile.am_orig 2009-07-22 22:08:44.000000000 -0700 -+++ ./bin/Makefile.am 2009-07-22 22:11:07.000000000 -0700 -@@ -12,24 +12,24 @@ +-always_built_SUBDIRS = ZSI ++# always_built_SUBDIRS = ZSI - build_libraries = @apbs_build_libraries@ + SUBDIRS = $(always_built_SUBDIRS) . --bindir = ${prefix}/bin -+# bindir = ${prefix}/bin - bin_PROGRAMS = apbs - apbs_SOURCES = main.c --apbs_LDADD = ${build_libraries} -+apbs_LDADD = ${build_libraries} ./libapbsmainroutines.la - --libdir = ${prefix}/lib -+# libdir = ${prefix}/lib - lib_LTLIBRARIES = libapbsmainroutines.la - libapbsmainroutines_la_SOURCES = routines.c --libapbsmainroutines_la_LDFLAGS = -version-info ${APBS_VERSION} -+libapbsmainroutines_la_LDFLAGS = @maloc_lib@ ../src/aaa_lib/libapbs.la -version-info ${APBS_VERSION} - - INCLUDES = @inc_list@ - AM_CFLAGS= @wall_pedantic@ - AM_LDFLAGS = @LDFLAGS@ @FFLAGS@ - --includedir = ${prefix}/include/apbs --include_HEADERS = routines.h -+# includedir = ${prefix}/include/apbs -+# include_HEADERS = routines.h - --install-data-local: -- -cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin -- -chmod 755 ${prefix}/bin/ApbsClient.py -- -rm -f ${prefix}/bin/wsdl2py -\ No newline at end of file -+#install-data-local: -+# -cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin -+# -chmod 755 ${prefix}/bin/ApbsClient.py -+# -rm -f ${prefix}/bin/wsdl2py ---- ./src/aaa_lib/Makefile.am_orig 2009-07-22 22:08:57.000000000 -0700 -+++ ./src/aaa_lib/Makefile.am 2009-07-22 22:12:12.000000000 -0700 +--- ./src/aaa_lib/Makefile.am_orig 2009-11-24 18:57:31.108534078 -0800 ++++ ./src/aaa_lib/Makefile.am 2009-11-29 22:09:14.931662428 -0800 @@ -18,12 +18,12 @@ AQUA_LIBS = ${top_builddir}/contrib/aqua/libapbsaqua.la BLAS_LIBS = @blas_lib@ @@ -83,14 +26,85 @@ INCLUDES = -I${top_srcdir}/src/generic -I${top_srcdir}/src/mg -I${top_srcdir}/src/fem @inc_list@ AM_CFLAGS = @wall_pedantic@ ---- ./contrib/opal/Makefile.am_orig 2009-07-23 17:40:40.000000000 -0700 -+++ ./contrib/opal/Makefile.am 2009-07-23 17:40:08.000000000 -0700 -@@ -9,7 +9,7 @@ - AUTOMAKE_OPTIONS = no-dependencies - SUFFIXES = .H .h .C .c .f .o +--- ./tools/arpack/Makefile.am_orig 2009-11-24 18:57:41.564534258 -0800 ++++ ./tools/arpack/Makefile.am 2009-11-24 18:59:57.837534477 -0800 +@@ -12,7 +12,7 @@ --always_built_SUBDIRS = ZSI -+# always_built_SUBDIRS = ZSI + noinst_PROGRAMS = driver + driver_SOURCES = driver.c readhb.f ardriv.f +-driver_LDADD = ../../src/aaa_lib/libapbs.la @arpack_lib@ @apbs_build_libraries@ ++driver_LDADD = ../../src/aaa_lib/libapbs.la @arpack_lib@ @apbs_build_libraries@ -latlas + INCLUDES = @inc_list@ + AM_CFLAGS = @CFLAGS@ + AM_LDFLAGS = @LDFLAGS@ +--- ./tools/python/vgrid/Makefile.am_orig 2009-11-24 18:57:54.604534072 -0800 ++++ ./tools/python/vgrid/Makefile.am 2009-11-24 18:59:57.837534477 -0800 +@@ -16,5 +16,6 @@ + noinst_PROGRAMS = _vgrid.so + _vgrid_so_SOURCES = vgridlib.c + _vgrid_so_LINK = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED) +- _vgrid_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a $(PY_LDFLAGS) ${top_builddir}/contrib/lib/libmaloc.a @lib_list@ ++ _vgrid_so_LDFLAGS = $(PY_LDFLAGS) @maloc_lib@ @lib_list@ ++ _vgrid_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.so ${top_builddir}/src/aaa_lib/.libs/libapbs.so + endif +--- ./tools/python/Makefile.am_orig 2009-11-24 18:58:01.740534012 -0800 ++++ ./tools/python/Makefile.am 2009-11-24 18:59:57.838534348 -0800 +@@ -16,4 +16,5 @@ + noinst_PROGRAMS = _apbslib.so + _apbslib_so_SOURCES = apbslib.c + _apbslib_so_LINK = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED) +-_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a ${top_builddir}/contrib/blas/.libs/libapbsblas.a $(PY_LDFLAGS) ++_apbslib_so_LDFLAGS = @maloc_lib@ @blas_lib@ $(PY_LDFLAGS) ++_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.so ${top_builddir}/src/aaa_lib/.libs/libapbs.so +--- ./bin/Makefile.am_orig 2009-11-24 18:58:07.772534219 -0800 ++++ ./bin/Makefile.am 2009-11-24 19:09:09.452534035 -0800 +@@ -12,34 +12,35 @@ - SUBDIRS = $(always_built_SUBDIRS) . + build_libraries = @apbs_build_libraries@ +-bindir = ${prefix}/bin ++# bindir = ${prefix}/bin + bin_PROGRAMS = apbs + apbs_SOURCES = main.c +-apbs_LDADD = ${build_libraries} ++apbs_LDADD = ${build_libraries} ./libapbsmainroutines.la + + # This is a hack I suspect, but needed to force apbs to be + # rebuilt anytime the make command is issued + # Problem before is that there is no dependency between source file + # recompilation and relinking the binary. There is probably + # a cleaner way to do this, I can't find it, however. +-BUILT_SOURCES = rm.apbs + +-rm.apbs: Makefile +- -rm -f apbs ++# BUILT_SOURCES = rm.apbs + +-libdir = ${prefix}/lib ++# rm.apbs: Makefile ++# -rm -f apbs ++ ++# libdir = ${prefix}/lib + lib_LTLIBRARIES = libapbsmainroutines.la + libapbsmainroutines_la_SOURCES = routines.c +-libapbsmainroutines_la_LDFLAGS = -version-info ${APBS_VERSION} ++libapbsmainroutines_la_LDFLAGS = @maloc_lib@ ../src/aaa_lib/libapbs.la -version-info ${APBS_VERSION} + + INCLUDES = @inc_list@ + AM_CFLAGS= @wall_pedantic@ + AM_LDFLAGS = @LDFLAGS@ @FFLAGS@ + +-includedir = ${prefix}/include/apbs +-include_HEADERS = routines.h ++# includedir = ${prefix}/include/apbs ++# include_HEADERS = routines.h + +-install-data-local: +- -cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin +- -chmod 755 ${prefix}/bin/ApbsClient.py +- -rm -f ${prefix}/bin/wsdl2py +\ No newline at end of file ++#install-data-local: ++# -cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin ++# -chmod 755 ${prefix}/bin/ApbsClient.py ++# -rm -f ${prefix}/bin/wsdl2py diff --git a/apbs.spec b/apbs.spec index 46a0a17..c3cf1d7 100644 --- a/apbs.spec +++ b/apbs.spec @@ -2,13 +2,13 @@ Name: apbs Summary: Adaptive Poisson Boltzmann Solver -Version: 1.1.0 -Release: 7%{?dist} +Version: 1.2.1 +Release: 2%{?dist} # License of pmgZ, aqua and contrib/blas/mblasd.f is LGPLv2+, the rest is BSD. License: LGPLv2+ and BSD Group: Applications/Engineering URL: http://apbs.sourceforge.net/ -Source0: http://downloads.sourceforge.net/apbs/%{name}-%{version}-source.tar.gz +Source0: http://downloads.sourceforge.net/apbs/%{name}-1.2.1-source.tar.gz Source1: LGPL_V2 # adds blas_lib to AC_SUBST so Makefiles are complete Patch0: apbs-configure.ac.patch @@ -69,9 +69,10 @@ development using the adaptive poisson boltzmann (APBS) solver library. %prep -%setup -q -n %{name}-%{version}-source +%setup -q -n %{name}-1.2.1-source %patch0 -p0 %patch1 -p0 +rm acinclude.m4 libtoolize --automake aclocal autoheader @@ -91,7 +92,7 @@ rm doc/programmer/html/vpee_8h__incl.map rm doc/programmer/html/dummy_8c__incl.map %build -%configure --with-blas='-L%{_libdir}/atlas -lf77blas -latlas -lblas' --with-fetk-include=%{_includedir} --with-fetk-library=%{_libdir} --with-arpack=%{_libdir}/atlas --enable-python --enable-shared --disable-static FFLAGS="-I/usr/include/atlas" +%configure --with-blas='-L%{_libdir}/atlas -lf77blas -latlas -lblas' --with-fetk-include=%{_includedir} --with-fetk-library=%{_libdir} --with-arpack=%{_libdir}/atlas --enable-python --enable-shared FFLAGS="${RPM_OPT_FLAGS} -I/usr/include/atlas" CFLAGS="${RPM_OPT_FLAGS} -DVF77_ONEUNDERSCORE" # die, rpath, die. sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -172,6 +173,18 @@ rm -rf %{buildroot} %doc doc/programmer/ %changelog +* Tue Dec 01 2009 Tim Fenn - 1.2.1-2 +- add RPM_OPT_FLAGS + +* Wed Nov 25 2009 Tim Fenn - 1.2.1-1 +- update to 1.2.1 + +* Tue Nov 24 2009 Tim Fenn - 1.2.0-2 +- fix broken source + +* Thu Nov 04 2009 Tim Fenn - 1.2.0-1 +- update to 1.2.0 + * Mon Jul 27 2009 Tim Fenn - 1.1.0-7 - remove python byte compiled files in bindir - loop to add tools diff --git a/sources b/sources index ca113f8..a83d832 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca31ba09714e4fc9acce91e7961569cd apbs-1.1.0-source.tar.gz +831d85e90083ec639451657195ff90da apbs-1.2.1-source.tar.gz From b5662b32b568da77245439ccf32ce8ae2ad86ba4 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Wed, 16 Mar 2011 16:22:30 +0100 Subject: [PATCH 09/10] - fix build on EL-5 (add missing BR: gcc-gfortran, run libtoolize with --force) - link only to atlas-provided blas for performance --- apbs.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/apbs.spec b/apbs.spec index 7c82072..276724c 100644 --- a/apbs.spec +++ b/apbs.spec @@ -3,7 +3,7 @@ Name: apbs Summary: Adaptive Poisson Boltzmann Solver Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} # License of pmgZ, aqua and contrib/blas/mblasd.f is LGPLv2+, the rest is BSD. License: LGPLv2+ and BSD Group: Applications/Engineering @@ -15,12 +15,10 @@ Patch0: apbs-configure.ac.patch # removes hardcoded prefix setting so DESTDIR works Patch1: apbs-makefile.am.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: gcc-gfotran BuildRequires: libtool BuildRequires: arpack-devel BuildRequires: atlas-devel -BuildRequires: blas-devel BuildRequires: maloc-devel BuildRequires: python-devel Requires: python-ZSI @@ -72,7 +70,7 @@ library. %setup -q -n %{name}-%{version}-source %patch0 -p0 %patch1 -p0 -libtoolize --automake +libtoolize --automake --force aclocal autoheader automake --gnu @@ -91,7 +89,7 @@ rm doc/programmer/html/vpee_8h__incl.map rm doc/programmer/html/dummy_8c__incl.map %build -%configure --with-blas='-L%{_libdir}/atlas -lf77blas -latlas -lblas' --with-fetk-include=%{_includedir} --with-fetk-library=%{_libdir} --with-arpack=%{_libdir}/atlas --enable-python --enable-shared FFLAGS="${RPM_OPT_FLAGS} -I/usr/include/atlas" CFLAGS="${RPM_OPT_FLAGS} -DVF77_ONEUNDERSCORE" +%configure --with-blas-name=cblas --with-blas='-L%{_libdir}/atlas -lf77blas -latlas -lcblas' --with-fetk-include=%{_includedir} --with-fetk-library=%{_libdir} --with-arpack=%{_libdir}/atlas --enable-python --enable-shared FFLAGS="${RPM_OPT_FLAGS} -I/usr/include/atlas" CFLAGS="${RPM_OPT_FLAGS} -DVF77_ONEUNDERSCORE" # die, rpath, die. sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -172,6 +170,10 @@ rm -rf %{buildroot} %doc doc/programmer/ %changelog +* Wed Mar 16 2011 Dominik Mierzejewski - 1.2.1-3 +- fix build on EL-5 (add missing BR: gcc-gfortran, run libtoolize with --force) +- link only to atlas-provided blas for performance + * Tue Dec 01 2009 Tim Fenn - 1.2.1-2 - add RPM_OPT_FLAGS From 05f576f1a2f6cc5140c83db92abffe3439b4724d Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 17 Mar 2011 07:54:13 +0100 Subject: [PATCH 10/10] Fix typo in BR: gcc-gfortran. --- apbs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apbs.spec b/apbs.spec index 276724c..2da13b4 100644 --- a/apbs.spec +++ b/apbs.spec @@ -15,7 +15,7 @@ Patch0: apbs-configure.ac.patch # removes hardcoded prefix setting so DESTDIR works Patch1: apbs-makefile.am.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gcc-gfotran +BuildRequires: gcc-gfortran BuildRequires: libtool BuildRequires: arpack-devel BuildRequires: atlas-devel