[qd/el6/master] Update to 2.3.11, build shared library.

[Jussi Lehtola]

commit cf37b013a38252d3ec3b57d9b68f03e2342d72b4
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Sat Dec 4 13:01:43 2010 +0200

    Update to 2.3.11, build shared library.

 qd-2.3.11-libtool.patch |   45 +++++++++++++++++++++++++++++++++++++++++++++
 qd.spec                 |   46 ++++++++++++++++++++++++++++++++++------------
 sources                 |    2 +-
 3 files changed, 80 insertions(+), 13 deletions(-)
---
diff --git a/qd-2.3.11-libtool.patch b/qd-2.3.11-libtool.patch
new file mode 100644
index 0000000..f587d07
--- /dev/null
+++ b/qd-2.3.11-libtool.patch
@@ -0,0 +1,45 @@
+diff -u qd-2.3.11/configure.ac\~ qd-2.3.11/configure.ac
+--- qd-2.3.11/configure.ac~	2009-05-12 03:45:05.000000000 +1000
++++ qd-2.3.11/configure.ac	2010-11-03 10:24:01.000000000 +1000
+@@ -312,7 +312,7 @@
+ 
+ # libtool stuff
+ # AC_DISABLE_SHARED
+-# AC_PROG_LIBTOOL
++AC_PROG_LIBTOOL
+ AC_PROG_RANLIB
+ 
+ # Output
+diff -u qd-2.3.11/src/Makefile.am\~ qd-2.3.11/src/Makefile.am
+--- qd-2.3.11/src/Makefile.am~	2009-05-12 03:45:05.000000000 +1000
++++ qd-2.3.11/src/Makefile.am	2010-11-03 13:26:45.000000000 +1000
+@@ -1,9 +1,9 @@
+ SRC = c_dd.cpp c_qd.cpp dd_real.cpp dd_const.cpp \
+       fpu.cpp qd_real.cpp qd_const.cpp util.cpp bits.cpp util.h
+ 
+-lib_LIBRARIES = libqd.a
++lib_LTLIBRARIES = libqd.la
+ 
+-libqd_a_SOURCES = $(SRC)
++libqd_la_SOURCES = $(SRC)
+ 
+ AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/include
+ 
+diff -u qd-2.3.11/tests/Makefile.am\~ qd-2.3.11/tests/Makefile.am
+--- qd-2.3.11/tests/Makefile.am~	2009-05-12 03:45:05.000000000 +1000
++++ qd-2.3.11/tests/Makefile.am	2010-11-03 13:56:03.000000000 +1000
+@@ -1,4 +1,4 @@
+-LDADD = $(top_builddir)/src/libqd.a
++LDADD = $(top_builddir)/src/libqd.la
+ AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/include
+ 
+ TESTS = qd_test pslq_test c_test
+@@ -17,7 +17,7 @@
+ f_test_LINK=$(CXXLINK)
+ f_test_LDADD = $(top_builddir)/fortran/libqdmod.a \
+                $(top_builddir)/fortran/libqd_f_main.a \
+-               $(LDADD) $(top_builddir)/src/libqd.a $(FCLIBS)
++               $(LDADD) $(top_builddir)/src/libqd.la $(FCLIBS)
+ endif
+ 
+ CLEANFILES=qd_timer quadt_test huge
diff --git a/qd.spec b/qd.spec
index 91122ab..b2b90b7 100644
--- a/qd.spec
+++ b/qd.spec
@@ -1,9 +1,6 @@
-# Disable debug package since only static library provided (leading to an empty debuginfo file)
-%global debug_package %{nil}
-
 Name:		qd
-Version:	2.3.7
-Release:	7%{?dist}
+Version:	2.3.11
+Release:	2%{?dist}
 Summary:	Double-Double and Quad-Double Arithmetic
 Group:		Applications/Engineering
 License:	BSD
@@ -11,6 +8,13 @@ URL:		http://www.cs.berkeley.edu/~yozo/
 Source0:	http://www.cs.berkeley.edu/%7Eyozo/software/qd-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Patch to enable building shared library
+Patch0:		qd-2.3.11-libtool.patch
+
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	libtool
+
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
 
@@ -31,7 +35,8 @@ are also included.
 %package devel
 Summary:	Double-Double and Quad-Double Arithmetic
 Group:		Applications/Engineering
-Provides:	qd-static = %{name}-%{version}
+Requires:	qd = %{version}-%{release}
+Obsoletes:	qd-static < %{version}-%{release}
 
 %description devel
 This package provides numeric types of twice the precision of IEEE
@@ -50,13 +55,16 @@ are also included.
 
 %prep
 %setup -q -n qd-%{version}
+%patch0 -p1
 
 %build
 export CC=gcc
 export CXX=g++	
 export FC=gfortran
 export FCFLAGS="%{optflags}"
-%configure
+
+autoreconf -i
+%configure --enable-shared --disable-static
 make %{?_smp_mflags}
 
 
@@ -65,31 +73,45 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Fix location of documentation
-mv %{buildroot}/usr/share/doc/qd/* .
-rm -rf %{buildroot}/usr/share/
+mv %{buildroot}%{_docdir}/qd/* .
+rm -rf %{buildroot}%{_datadir}
 
 # Move Fortran modules to %{_fmoddir}
 mkdir -p %{buildroot}%{_fmoddir}/%{name}
 mv %{buildroot}%{_libdir}/%{name}/*.mod %{buildroot}%{_fmoddir}/%{name}
 
+# Remove la file
+rm %{buildroot}%{_libdir}/*.la
+
 %check
 make check
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS README TODO
+%{_libdir}/libqd.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README qd.pdf TODO
+%doc qd.pdf
 %{_bindir}/qd-config
 %{_fmoddir}/qd/
 %{_includedir}/qd/
-%{_libdir}/libqd.a
+%{_libdir}/libqd.so
 %{_libdir}/libqd_f_main.a
 %{_libdir}/libqdmod.a
 
 
 %changelog
+* Wed Nov 03 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.11-2
+- Build shared library using Nils Petersen's patch (BZ #648964).
+
+* Tue Nov 02 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.11-1
+- Update to 2.3.11.
+
 * Wed Sep 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7-7
 - Fix location of Fortran modules.
 
diff --git a/sources b/sources
index b0c2487..0ab7bd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a66004a0eead55cf3cca87ddf3b69d8  qd-2.3.7.tar.gz
+4623b3b103897d7fb12c729e8c206969  qd-2.3.11.tar.gz