[clipper] * Mon Jul 8 2013 Tim Fenn <tim.fenn at gmail.com> - 2.1-19.20130601 - update to 20130601 cvs - remove b

[Timothy Fenn]

commit c3fd90013b3eaa18f27587bcda3e25d00ec41ab9
Author: Tim Fenn <tim.fenn at gmail.com>
Date:   Tue Jul 23 23:21:29 2013 -0700

    * Mon Jul 8 2013 Tim Fenn <tim.fenn at gmail.com> - 2.1-19.20130601
    - update to 20130601 cvs
    - remove binaries
    - update upstream URL and build

 .gitignore              |    1 +
 clipper-pkgconfig.patch |   10 ++++++++
 clipper.spec            |   57 +++++++++++-----------------------------------
 sources                 |    5 +---
 4 files changed, 26 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9788ed9..c7be4ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ clipper-2.1-100511-ac.tar.gz
 clipper.pc.in
 version.cpp
 clipper-autotools.patch
+/clipper-2.1.20130601.tar.gz
diff --git a/clipper-pkgconfig.patch b/clipper-pkgconfig.patch
new file mode 100644
index 0000000..953624d
--- /dev/null
+++ b/clipper-pkgconfig.patch
@@ -0,0 +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
+@@ -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: -L${libdir} @CLIPPER_LIBS@ @FFTW_LIBS@ -lm @PTHREAD_LIBS@
+ Cflags: -I${includedir} @PTHREAD_CFLAGS@
diff --git a/clipper.spec b/clipper.spec
index 7436f10..2baae8c 100644
--- a/clipper.spec
+++ b/clipper.spec
@@ -2,19 +2,14 @@ Name: clipper
 Summary: Clipper C++ crystallographic library
 URL: http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper.html
 Version: 2.1
-Release: 18.20100511cvs%{?dist}
+Release: 19.20130601%{?dist}
 License: LGPLv2+
-Source0: http://www.ysbl.york.ac.uk/~cowtan/%{name}/%{name}-%{version}-100511-ac.tar.gz
-Source1: clipper.pc.in
-Source2: version.cpp
-Patch0: clipper-autotools.patch
+Source0: ftp://ftp.ccp4.ac.uk/opensource/%{name}-%{version}.20130601.tar.gz
+Patch0: clipper-pkgconfig.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
 BuildRequires: fftw2-devel
-BuildRequires: gpp4-devel
+BuildRequires: libccp4-devel
 BuildRequires: mmdb-devel
 BuildRequires: pkgconfig
 
@@ -45,21 +40,14 @@ necessary for developing programs using the clipper C++
 crystallographic library.
 
 %prep
-%setup -q
-cp %{SOURCE1} ./
-cp %{SOURCE2} ./clipper/
+%setup -q -n %{name}-%{version}.20130601
 %patch0 -p0
-libtoolize --automake
-aclocal -I config
-automake --copy --add-missing --gnu
-autoconf
 
 sed -i 's/\r//' dox/coordtypes.dox
 sed -i 's/\r//' dox/develop.dox
-chmod 644 dox/wheretolook.dox
 
 %build
-%configure --enable-contrib --enable-phs --with-mmdb=`pkg-config mmdb --variable=prefix` --enable-mmdb --enable-minimol --enable-cif --with-gpp4="" --enable-gpp4 --enable-cns --disable-static --enable-single-lib CXXFLAGS=`pkg-config gpp4 --cflags`
+%configure --enable-contrib --enable-phs --enable-cns --enable-mmdb --enable-cif --enable-ccp4 --enable-fortran --enable-shared --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -77,38 +65,21 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
-%doc NEWS README AUTHORS COPYING
-%{_bindir}/caniso
-%{_bindir}/cecalc
-%{_bindir}/cfft
-%{_bindir}/chltofom
-%{_bindir}/cinvfft
-%{_bindir}/cmakereference
-%{_bindir}/cmaplocal
-%{_bindir}/cmodeltoseq
-%{_bindir}/cncsfrommodel
-%{_bindir}/convert2mtz
-%{_bindir}/cpatterson
-%{_bindir}/cphasecombine
-%{_bindir}/cphasematch
-%{_bindir}/csfcalc
-%{_bindir}/csfcreate
-%{_bindir}/csigmaa
-%{_bindir}/csymmatch
-%{_bindir}/maketestdata
-%{_libdir}/libclipper.so.*
+%doc README AUTHORS COPYING
+%{_libdir}/libclipper*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc dox
-%{_bindir}/clipper-config
-%{_bindir}/clipper_test
-%{_libdir}/libclipper.so
+%{_libdir}/libclipper*.so
 %{_includedir}/clipper
 %{_libdir}/pkgconfig/clipper.pc
 
 %changelog
+* Mon Jul 8 2013 Tim Fenn <tim.fenn at gmail.com> - 2.1-19.20130601
+- update to 20130601 cvs
+- remove binaries
+- update upstream URL and build
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-18.20100511cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 88405cd..85dc8ca 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-467105fd1fc2e8419e5b2abd8aa0cb1b  clipper-2.1-100511-ac.tar.gz
-bcaaab9bbc6d501c0395dfe306e2c561  clipper.pc.in
-a6630f996ac7a3029979e6a014b4b4d0  version.cpp
-4d4401ffdad54aa255765cb3f4024ff8  clipper-autotools.patch
+2e0d3faec7cc5a1eb377392122e6e254  clipper-2.1.20130601.tar.gz