[clipper] update to 20140911 cvs

[Timothy Fenn]

commit bee1a51b8f8aa41950ab3361546f8d4630407e80
Author: Tim Fenn <tim.fenn at gmail.com>
Date:   Sun Jan 18 23:37:28 2015 -0500

    update to 20140911 cvs

 .gitignore              |    1 +
 clipper-pkgconfig.patch |    6 +++---
 clipper.spec            |   16 +++++++++-------
 sources                 |    2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7be4ed..55964c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ clipper.pc.in
 version.cpp
 clipper-autotools.patch
 /clipper-2.1.20130601.tar.gz
+/clipper-2.1.20140911.tar.gz
diff --git a/clipper-pkgconfig.patch b/clipper-pkgconfig.patch
index 953624d..e1478df 100644
--- a/clipper-pkgconfig.patch
+++ b/clipper-pkgconfig.patch
@@ -1,10 +1,10 @@
---- clipper.pc.in_orig	2013-07-08 23:17:43.516902581 -0700
-+++ clipper.pc.in	2013-07-08 23:19:59.883104039 -0700
+--- clipper.pc.in_orig	2015-01-18 22:57:15.455784075 -0500
++++ clipper.pc.in	2015-01-18 22:57:56.339141812 -0500
 @@ -7,6 +7,5 @@
  Description: crystallographic automation and complex data manipulation libraries
  Version: @VERSION@
  Requires: @CLIPPER_REQUIRES@
 -Libs: -L${libdir} @CLIPPER_LIBS@
--Libs.private: @FFTW_LIBS@ -lm @PTHREAD_LIBS@
+-Libs.private: @FFTW2_LIBS@ -lm @PTHREAD_LIBS@
 +Libs: -L${libdir} @CLIPPER_LIBS@ @FFTW_LIBS@ -lm @PTHREAD_LIBS@
  Cflags: -I${includedir} @PTHREAD_CFLAGS@
diff --git a/clipper.spec b/clipper.spec
index 13d88ee..f7f5604 100644
--- a/clipper.spec
+++ b/clipper.spec
@@ -1,17 +1,16 @@
 Name: clipper
 Summary: Clipper C++ crystallographic library
-URL: http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper.html
+URL: ftp://ftp.ccp4.ac.uk/opensource/
 Version: 2.1
-Release: 24.20130601%{?dist}
+Release: 25.20140911%{?dist}
 License: LGPLv2+
-Source0: ftp://ftp.ccp4.ac.uk/opensource/%{name}-%{version}.20130601.tar.gz
+Source0: ftp://ftp.ccp4.ac.uk/opensource/%{name}-%{version}.20140911.tar.gz
 Patch0: clipper-pkgconfig.patch
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fftw2-devel
 BuildRequires: gcc-gfortran
 BuildRequires: libccp4-devel
-BuildRequires: mmdb-devel
+BuildRequires: mmdb2-devel
 BuildRequires: pkgconfig
 
 %description
@@ -32,7 +31,7 @@ Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 Requires: fftw2-devel
 Requires: libccp4-devel
-Requires: mmdb-devel
+Requires: mmdb2-devel
 
 %description devel
 
@@ -41,7 +40,7 @@ necessary for developing programs using the clipper C++
 crystallographic library.
 
 %prep
-%setup -q -n %{name}-%{version}.20130601
+%setup -q -n %{name}-%{version}.20140911
 %patch0 -p0
 
 sed -i 's/\r//' dox/coordtypes.dox
@@ -76,6 +75,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/clipper.pc
 
 %changelog
+* Sun Jan 18 2015 Tim Fenn <tim.fenn at gmail.com> - 2.1-25.20140911
+- update to 20140911 cvs
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-24.20130601
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 85dc8ca..8974be2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e0d3faec7cc5a1eb377392122e6e254  clipper-2.1.20130601.tar.gz
+d27f2a7bf4f6a887c24c30c0f68fdd52  clipper-2.1.20140911.tar.gz