rpms/clipper/devel .cvsignore, 1.8, 1.9 clipper.spec, 1.9, 1.10 sources, 1.8, 1.9

[Timothy Fenn]

Author: timfenn

Update of /cvs/pkgs/rpms/clipper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19803

Modified Files:
	.cvsignore clipper.spec sources 
Log Message:
* Thu Jul 16 2009 Tim Fenn <fenn at stanford.edu> - 2.1-9.20090714cvs
- trim down patches, stick with upstream
- add pkgconfig to buildrequires




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clipper/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	14 Jul 2009 19:28:16 -0000	1.8
+++ .cvsignore	17 Jul 2009 20:43:24 -0000	1.9
@@ -1,2 +1,4 @@
 clipper-2.1-090714-ac.tar.gz
-clipper-patches-2.1.tar.gz
+clipper.pc.in
+version.cpp
+clipper-autotools.patch


Index: clipper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clipper/devel/clipper.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- clipper.spec	14 Jul 2009 19:28:16 -0000	1.9
+++ clipper.spec	17 Jul 2009 20:43:24 -0000	1.10
@@ -2,10 +2,12 @@ Name: clipper
 Summary: Clipper C++ crystallographic library
 URL: http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper.html
 Version: 2.1
-Release: 8.20090714cvs%{?dist}
+Release: 9.20090714cvs%{?dist}
 License: LGPLv2+
 Source0: http://www.ysbl.york.ac.uk/~cowtan/%{name}/%{name}-%{version}-090714-ac.tar.gz
-Source1: clipper-patches-2.1.tar.gz
+Source1: clipper.pc.in
+Source2: version.cpp
+Patch0: clipper-autotools.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -14,6 +16,7 @@ BuildRequires: libtool
 BuildRequires: fftw2-devel
 BuildRequires: gpp4-devel
 BuildRequires: mmdb-devel
+BuildRequires: pkgconfig
 
 %description
 There are currently two major pressures on crystallographic computing:
@@ -42,15 +45,21 @@ necessary for developing programs using 
 crystallographic library.
 
 %prep
-%setup -q -a 1
-./autogen.sh
+%setup -q
+cp %{SOURCE1} ./
+cp %{SOURCE2} ./clipper/
+%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 --disable-static
+%configure --enable-contrib --enable-phs --with-mmdb=`pkg-config mmdb --variable=prefix` --enable-mmdb --enable-minimol --enable-cif --with-gpp4="" --enable-gpp4 --enable-cns --enable-single-lib --disable-static CXXFLAGS=`pkg-config gpp4 --cflags`
 make %{?_smp_mflags}
 
 %install
@@ -70,17 +79,40 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc NEWS README AUTHORS COPYING
-%{_bindir}/*
+%{_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.*
 
 %files devel
 %defattr(-,root,root,-)
 %doc dox
+%{_bindir}/clipper-config
+%{_bindir}/clipper_test
 %{_libdir}/libclipper.so
 %{_includedir}/clipper
 %{_libdir}/pkgconfig/clipper.pc
 
 %changelog
+* Thu Jul 16 2009 Tim Fenn <fenn at stanford.edu> - 2.1-9.20090714cvs
+- trim down patches, stick with upstream
+- add pkgconfig to buildrequires
+
 * Tue Jul 14 2009 Tim Fenn <fenn at stanford.edu> - 2.1-8.20090714cvs
 - update to 090714
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clipper/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	14 Jul 2009 19:28:16 -0000	1.8
+++ sources	17 Jul 2009 20:43:25 -0000	1.9
@@ -1,2 +1,4 @@
 25124efb8d251cedfbd23f4b06851e47  clipper-2.1-090714-ac.tar.gz
-56b75cfde2599264a1c17fa4e2aa4539  clipper-patches-2.1.tar.gz
+bcaaab9bbc6d501c0395dfe306e2c561  clipper.pc.in
+a6630f996ac7a3029979e6a014b4b4d0  version.cpp
+bafa331e903105efc0757f1c0d8c124c  clipper-autotools.patch