[ssm] update to 1.4

Mon Jan 19 04:08:20 UTC 2015

commit a8be6a6eb159d6ef2cc6663188806607e02a1c23
Author: Tim Fenn <tim.fenn at gmail.com>
Date:   Sun Jan 18 23:08:45 2015 -0500

    update to 1.4

 .gitignore             |    1 +
 sources                |    2 +-
 ssm-configure.ac.patch |   42 ++++++++++++++++++++----------------------
 ssm-makefile.am.patch  |   35 ++++++++++-------------------------
 ssm.spec               |   21 ++++++++++-----------
 5 files changed, 42 insertions(+), 59 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 6178a3c..6ca0048 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ ssm-makefile.am.patch
 ssm-ssm.pc.in.patch
 /ssm-1.1.tar.gz
 /ssm-1.3.tar.bz2
+/ssm-1.4.tar.gz
diff --git a/sources b/sources
index 7dc95ee..e86b3a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a7f4eee0ccb4831d2d5d0e06f9327041  ssm-1.3.tar.bz2
+dcde2198255005605a6f69de6cb06318  ssm-1.4.tar.gz
diff --git a/ssm-configure.ac.patch b/ssm-configure.ac.patch
index 5beece0..c2cce6e 100644
--- a/ssm-configure.ac.patch
+++ b/ssm-configure.ac.patch
@@ -1,32 +1,30 @@
---- configure.ac_orig	2013-07-07 12:42:29.284908451 -0700
-+++ configure.ac	2013-07-07 12:59:43.970008464 -0700
-@@ -19,18 +19,20 @@
+--- configure.ac_orig	2015-01-18 22:42:06.490663452 -0500
++++ configure.ac	2015-01-18 22:43:44.945591427 -0500
+@@ -21,17 +21,19 @@
  AC_SEARCH_LIBS([cos], [m], [], [AC_MSG_ERROR([need math library])])
  
  AC_LANG_PUSH([C++])
--AC_CHECK_LIB(mmdb, MMDB_CCIF_Init, [dummy=yes],
--             AC_MSG_WARN([mmdb library not found.]))
--AC_CHECK_HEADER(mmdb/mmdb_manager.h, [dummy=yes],
--                AC_MSG_ERROR([mmdb headers not found.]))
-+PKG_CHECK_MODULES(MMDB, mmdb >= 1.12)
-+#AC_CHECK_LIB(mmdb, MMDB_CCIF_Init, [dummy=yes],
-+#             AC_MSG_WARN([mmdb library not found.]))
-+#AC_CHECK_HEADER(mmdb/mmdb_manager.h, [dummy=yes],
-+#                AC_MSG_ERROR([mmdb headers not found.]))
+-AC_CHECK_LIB(mmdb2, MMDB_CCIF_Init, :,
+-             AC_MSG_ERROR([mmdb2 library not found.]))
+-AC_CHECK_HEADER(mmdb2/mmdb_manager.h, :,
+-                AC_MSG_ERROR([mmdb2 headers not found.]))
++PKG_CHECK_MODULES(MMDB2, mmdb2 >= 2.0)
++#AC_CHECK_LIB(mmdb2, MMDB_CCIF_Init, :,
++#             AC_MSG_ERROR([mmdb2 library not found.]))
++#AC_CHECK_HEADER(mmdb2/mmdb_manager.h, :,
++#                AC_MSG_ERROR([mmdb2 headers not found.]))
  AC_LANG_POP([C++])
  
- if test "x$enable_ccp4" = "xyes"; then
+ if test "x$enable_superpose" != xno && test "x$enable_ccp4" = xyes; then
 -  AC_CHECK_LIB(ccp4c, ccp4_banner, :,
--               AC_MSG_WARN([ccp4c library not found.]))
+-               AC_MSG_ERROR([ccp4c library not found.]))
 -  AC_CHECK_HEADER(ccp4/ccp4_general.h, :,
 -                  AC_MSG_ERROR([libccp4 headers not found.]))
-+   PKG_CHECK_MODULES(CCP4, libccp4c > 6.3)
-+  #AC_CHECK_LIB(ccp4c, ccp4_banner, :,
-+  #             AC_MSG_WARN([ccp4c library not found.]))
-+  #AC_CHECK_HEADER(ccp4/ccp4_general.h, :,
-+  #                AC_MSG_ERROR([libccp4 headers not found.]))
++  PKG_CHECK_MODULES(CCP4, libccp4c > 6.4)
++  # AC_CHECK_LIB(ccp4c, ccp4_banner, :,
++  #              AC_MSG_ERROR([ccp4c library not found.]))
++  # AC_CHECK_HEADER(ccp4/ccp4_general.h, :,
++  #                 AC_MSG_ERROR([libccp4 headers not found.]))
  fi
- AM_CONDITIONAL([USE_LIBCCP4], [test "x$enable_ccp4" = "xyes"])
  
--AC_OUTPUT([Makefile])
-+AC_OUTPUT([Makefile ssm.pc])
+ AM_CONDITIONAL([BUILD_SUPERPOSE], [test "x$enable_ccp4" != xno])
diff --git a/ssm-makefile.am.patch b/ssm-makefile.am.patch
index 8229182..3a73703 100644
--- a/ssm-makefile.am.patch
+++ b/ssm-makefile.am.patch
@@ -1,29 +1,14 @@
---- Makefile.am_orig	2013-07-07 12:50:49.698886451 -0700
-+++ Makefile.am	2013-07-07 12:57:30.271384925 -0700
-@@ -1,19 +1,23 @@
+--- Makefile.am_orig	2015-01-18 22:46:06.274787907 -0500
++++ Makefile.am	2015-01-18 22:46:48.497048962 -0500
+@@ -1,9 +1,10 @@
  ACLOCAL_AMFLAGS = -I m4
  
-+INCLUDES = $(MMDB_CFLAGS)
++INCLUDES = $(MMDB2_CFLAGS)
  lib_LTLIBRARIES = libssm.la
- libssm_la_SOURCES = ssm_superpose.cpp ssm_csia.cpp ssm_vxedge.cpp \
- 		    ssm_align.cpp ssm_malign.cpp ssm_graph.cpp
--libssm_la_LIBADD = -lmmdb
-+libssm_la_LIBADD = $(MMDB_LIBS)
- libssm_la_LDFLAGS = -no-undefined -version-info 1:0:0
+ libssm_la_SOURCES = ssm/ssm_superpose.cpp ssm/ssm_csia.cpp ssm/ssm_vxedge.cpp \
+ 		    ssm/ssm_align.cpp ssm/ssm_malign.cpp ssm/ssm_graph.cpp
+-libssm_la_LIBADD = -lmmdb2
++libssm_la_LIBADD = $(MMDB2_LIBS)
+ libssm_la_LDFLAGS = -no-undefined -version-info 2:0:0
  
- pkginclude_HEADERS = ssm_graph.h ssm_superpose.h ssm_csia.h ssm_vxedge.h \
-                      ssm_align.h ssm_malign.h ssm_defs.h
- 
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = ssm.pc
-+
- bin_PROGRAMS = superpose
- superpose_SOURCES = superpose.cpp sup_pairwise.cpp sup_multiple.cpp \
-                     sup_pairwise.h sup_multiple.h sup_defs.h
- superpose_LDADD = libssm.la -lmmdb
- if USE_LIBCCP4
--superpose_CPPFLAGS = -D_ccp4_
--superpose_LDADD += -lccp4c
-+superpose_CPPFLAGS = -D_ccp4_ $(CCP4_CFLAGS)
-+superpose_LDADD += $(CCP4_LIBS)
- endif
+ pkginclude_HEADERS = ssm/ssm_superpose.h ssm/ssm_csia.h ssm/ssm_vxedge.h \
diff --git a/ssm.spec b/ssm.spec
index bddebe8..f8bff4c 100644
--- a/ssm.spec
+++ b/ssm.spec
@@ -1,20 +1,17 @@
-# -*- mode: rpm-spec ; mode: font-lock -*-
-
 Summary: Macromolecular coordinate superposition library
 Name: ssm
-Version: 1.3
-Release: 4%{?dist}
+Version: 1.4
+Release: 1%{?dist}
 License: LGPLv3
 Group: System Environment/Libraries
 URL: ftp://ftp.ccp4.ac.uk/opensource/
-Source0: ftp://ftp.ccp4.ac.uk/opensource/%{name}-%{version}.tar.bz2
-Source1: ssm.pc.in
+Source0: ftp://ftp.ccp4.ac.uk/opensource/%{name}-%{version}.tar.gz
 Patch0: ssm-configure.ac.patch
 Patch1: ssm-makefile.am.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
-BuildRequires: mmdb-devel
+BuildRequires: mmdb2-devel
 BuildRequires: libccp4-devel
 
 %description
@@ -38,7 +35,7 @@ that have been compiled with the ssm library.
 %package devel
 Summary: Header files and library for developing programs with ssm
 Requires: %{name} = %{version}-%{release}
-Requires: mmdb-devel
+Requires: mmdb2-devel
 Requires: pkgconfig
 Group: Development/Libraries
 
@@ -48,7 +45,6 @@ development using SSM.
 
 %prep
 %setup -q
-cp %{SOURCE1} ./
 %patch0 -p0
 %patch1 -p0
 aclocal
@@ -77,8 +73,8 @@ rm -rf %{buildroot}
 %files
 %doc AUTHORS COPYING.LESSER
 %{_bindir}/superpose
-%{_libdir}/libssm.so.1.0.0
-%{_libdir}/libssm.so.1
+%{_libdir}/libssm.so.2.0.0
+%{_libdir}/libssm.so.2
 
 %files devel
 %{_libdir}/libssm.so
@@ -86,6 +82,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sun Jan 18 2015 Tim Fenn <tim.fenn at gmail.com> - 1.4-1
+- update to 1.4
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
