rpms/apbs/devel .cvsignore, 1.2, 1.3 apbs-configure.ac.patch, 1.1, 1.2 apbs-makefile.am.patch, 1.1, 1.2 apbs.spec, 1.1, 1.2 sources, 1.2, 1.3
Timothy Fenn
timfenn at fedoraproject.org
Wed Nov 25 01:34:32 UTC 2009
Author: timfenn
Update of /cvs/pkgs/rpms/apbs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30068
Modified Files:
.cvsignore apbs-configure.ac.patch apbs-makefile.am.patch
apbs.spec sources
Log Message:
* Thu Nov 04 2009 Tim Fenn <fenn at stanford.edu> - 1.2.0-1
- update to 1.2.0
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 21 Aug 2009 20:50:21 -0000 1.2
+++ .cvsignore 25 Nov 2009 01:34:32 -0000 1.3
@@ -1 +1 @@
-apbs-1.1.0-source.tar.gz
+apbs-1.2.0-1.fc12.src.rpm
apbs-configure.ac.patch:
configure.ac | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
Index: apbs-configure.ac.patch
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/devel/apbs-configure.ac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- apbs-configure.ac.patch 21 Aug 2009 20:50:21 -0000 1.1
+++ apbs-configure.ac.patch 25 Nov 2009 01:34:32 -0000 1.2
@@ -1,5 +1,5 @@
---- configure.ac_orig 2009-07-10 11:37:12.000000000 -0700
-+++ configure.ac 2009-07-10 16:02:33.000000000 -0700
+--- configure.ac_orig 2009-11-05 18:36:35.897587445 -0800
++++ configure.ac 2009-11-05 18:36:42.545586937 -0800
@@ -390,7 +390,7 @@
if test -n "${USE_FETK_LIBRARY}"; then
@@ -9,7 +9,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 +810,7 @@
fi
LDFLAGS=${LDFLAGS_SAVE};
CPPFLAGS=${CPPFLAGS_SAVE};
@@ -18,7 +18,7 @@
dnl # BEGIN FETK LIBRARY/HEADER TEST BLOCK
dnl # -----------------------
-@@ -1028,6 +1028,7 @@
+@@ -1032,6 +1032,7 @@
blas_lib=${contrib_path}/blas/.libs/libapbsblas.a
fi
AC_SUBST(apbs_do_blas)
@@ -26,7 +26,7 @@
dnl # -----------------------
dnl # If using Portland compilers, do not compile
-@@ -1206,7 +1207,9 @@
+@@ -1258,7 +1259,9 @@
else
apbs_build_libraries="${top_apbsdir}/bin/libapbsmainroutines.la \
${top_apbsdir}/src/aaa_lib/libapbs.la \
apbs-makefile.am.patch:
bin/Makefile.am | 20 ++++++++++----------
contrib/opal/Makefile.am | 2 +-
src/aaa_lib/Makefile.am | 4 ++--
tools/arpack/Makefile.am | 2 +-
tools/python/Makefile.am | 3 ++-
tools/python/vgrid/Makefile.am | 3 ++-
6 files changed, 18 insertions(+), 16 deletions(-)
Index: apbs-makefile.am.patch
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/devel/apbs-makefile.am.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- apbs-makefile.am.patch 21 Aug 2009 20:50:21 -0000 1.1
+++ apbs-makefile.am.patch 25 Nov 2009 01:34:32 -0000 1.2
@@ -1,24 +1,33 @@
---- ./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
+--- ./contrib/opal/Makefile.am_orig 2009-11-05 18:40:35.770586544 -0800
++++ ./contrib/opal/Makefile.am 2009-11-05 18:42:37.360586985 -0800
+@@ -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) .
+
+--- ./src/aaa_lib/Makefile.am_orig 2009-11-05 18:40:23.482586423 -0800
++++ ./src/aaa_lib/Makefile.am 2009-11-05 18:42:37.359585990 -0800
+@@ -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@
+--- ./tools/arpack/Makefile.am_orig 2009-11-05 18:39:26.560836859 -0800
++++ ./tools/arpack/Makefile.am 2009-11-05 18:42:37.356586914 -0800
@@ -12,7 +12,7 @@
noinst_PROGRAMS = driver
@@ -27,10 +36,29 @@
+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 @@
+ AM_LDFLAGS = @LDFLAGS@
+--- ./tools/python/vgrid/Makefile.am_orig 2009-11-05 18:39:11.427586298 -0800
++++ ./tools/python/vgrid/Makefile.am 2009-11-05 18:42:37.356586914 -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-05 18:39:02.257587290 -0800
++++ ./tools/python/Makefile.am 2009-11-05 18:42:37.354586041 -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-05 18:39:54.336586267 -0800
++++ ./bin/Makefile.am 2009-11-05 18:44:45.550587035 -0800
+@@ -12,10 +12,10 @@
build_libraries = @apbs_build_libraries@
@@ -41,6 +69,12 @@
-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
+@@ -27,19 +27,19 @@
+ rm.apbs: Makefile
+ -rm -f apbs
+
-libdir = ${prefix}/lib
+# libdir = ${prefix}/lib
lib_LTLIBRARIES = libapbsmainroutines.la
@@ -56,7 +90,7 @@
-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
@@ -66,31 +100,3 @@
+# -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) .
-
Index: apbs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/devel/apbs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- apbs.spec 21 Aug 2009 20:50:21 -0000 1.1
+++ apbs.spec 25 Nov 2009 01:34:32 -0000 1.2
@@ -2,13 +2,13 @@
Name: apbs
Summary: Adaptive Poisson Boltzmann Solver
-Version: 1.1.0
-Release: 7%{?dist}
+Version: 1.2.0
+Release: 1%{?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-source.tar.gz
Source1: LGPL_V2
# adds blas_lib to AC_SUBST so Makefiles are complete
Patch0: apbs-configure.ac.patch
@@ -69,7 +69,7 @@ development using the adaptive poisson b
library.
%prep
-%setup -q -n %{name}-%{version}-source
+%setup -q -n %{name}-1.2-source
%patch0 -p0
%patch1 -p0
libtoolize --automake
@@ -172,6 +172,9 @@ rm -rf %{buildroot}
%doc doc/programmer/
%changelog
+* Thu Nov 04 2009 Tim Fenn <fenn at stanford.edu> - 1.2.0-1
+- update to 1.2.0
+
* Mon Jul 27 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-7
- remove python byte compiled files in bindir
- loop to add tools
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 21 Aug 2009 20:50:21 -0000 1.2
+++ sources 25 Nov 2009 01:34:32 -0000 1.3
@@ -1 +1 @@
-ca31ba09714e4fc9acce91e7961569cd apbs-1.1.0-source.tar.gz
+fdbdff5fe49ba6192a6d77d8afce8f2d apbs-1.2.0-1.fc12.src.rpm
More information about the fedora-extras-commits
mailing list