rpms/apbs/devel .cvsignore, 1.4, 1.5 apbs-configure.ac.patch, 1.2, 1.3 apbs-makefile.am.patch, 1.2, 1.3 apbs.spec, 1.3, 1.4 sources, 1.4, 1.5
Timothy Fenn
timfenn at fedoraproject.org
Mon Nov 30 07:24:43 UTC 2009
Author: timfenn
Update of /cvs/pkgs/rpms/apbs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30101
Modified Files:
.cvsignore apbs-configure.ac.patch apbs-makefile.am.patch
apbs.spec sources
Log Message:
* Wed Nov 25 2009 Tim Fenn <fenn at stanford.edu> - 1.2.1-1
- update to 1.2.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 25 Nov 2009 01:41:02 -0000 1.4
+++ .cvsignore 30 Nov 2009 07:24:41 -0000 1.5
@@ -1 +1 @@
-apbs-1.2-source.tar.gz
+apbs-1.2.1-source.tar.gz
apbs-configure.ac.patch:
configure.ac | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
Index: apbs-configure.ac.patch
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/devel/apbs-configure.ac.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- apbs-configure.ac.patch 25 Nov 2009 01:34:32 -0000 1.2
+++ apbs-configure.ac.patch 30 Nov 2009 07:24:42 -0000 1.3
@@ -1,6 +1,37 @@
---- 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 @@
+--- 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
-@@ -810,7 +810,7 @@
+@@ -810,7 +812,7 @@
fi
LDFLAGS=${LDFLAGS_SAVE};
CPPFLAGS=${CPPFLAGS_SAVE};
@@ -18,7 +49,7 @@
dnl # BEGIN FETK LIBRARY/HEADER TEST BLOCK
dnl # -----------------------
-@@ -1032,6 +1032,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
-@@ -1258,7 +1259,9 @@
+@@ -1258,7 +1261,9 @@
else
apbs_build_libraries="${top_apbsdir}/bin/libapbsmainroutines.la \
${top_apbsdir}/src/aaa_lib/libapbs.la \
apbs-makefile.am.patch:
bin/Makefile.am | 27 ++++++++++++++-------------
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, 22 insertions(+), 19 deletions(-)
Index: apbs-makefile.am.patch
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/devel/apbs-makefile.am.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- apbs-makefile.am.patch 25 Nov 2009 01:34:32 -0000 1.2
+++ apbs-makefile.am.patch 30 Nov 2009 07:24:42 -0000 1.3
@@ -1,5 +1,5 @@
---- ./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
+--- ./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
@@ -9,8 +9,8 @@
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
+--- ./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@
@@ -26,8 +26,8 @@
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
+--- ./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 @@
noinst_PROGRAMS = driver
@@ -37,8 +37,8 @@
INCLUDES = @inc_list@
AM_CFLAGS = @CFLAGS@
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
+--- ./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
@@ -47,8 +47,8 @@
+ _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
+--- ./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
@@ -56,9 +56,9 @@
-_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 @@
+--- ./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 @@
build_libraries = @apbs_build_libraries@
@@ -71,11 +71,19 @@
# 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
+ # 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
Index: apbs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/devel/apbs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- apbs.spec 25 Nov 2009 01:41:02 -0000 1.3
+++ apbs.spec 30 Nov 2009 07:24:42 -0000 1.4
@@ -2,13 +2,13 @@
Name: apbs
Summary: Adaptive Poisson Boltzmann Solver
-Version: 1.2.0
-Release: 2%{?dist}
+Version: 1.2.1
+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}-1.2-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 b
library.
%prep
-%setup -q -n %{name}-1.2-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="-I/usr/include/atlas" CFLAGS="-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,9 @@ rm -rf %{buildroot}
%doc doc/programmer/
%changelog
+* Wed Nov 25 2009 Tim Fenn <fenn at stanford.edu> - 1.2.1-1
+- update to 1.2.1
+
* Tue Nov 24 2009 Tim Fenn <fenn at stanford.edu> - 1.2.0-2
- fix broken source
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 25 Nov 2009 01:41:02 -0000 1.4
+++ sources 30 Nov 2009 07:24:42 -0000 1.5
@@ -1 +1 @@
-ba32bb323b25307204436eaac1ff877b apbs-1.2-source.tar.gz
+831d85e90083ec639451657195ff90da apbs-1.2.1-source.tar.gz
More information about the scm-commits
mailing list