[givaro] Update to 3.4.2. Add doxygen documentation and examples to docs.

Tue Jul 5 17:18:15 UTC 2011

commit ddb5a7dae4b4a8b73ee30567f456fa433eb72b03
Author: Jerry James <loganjerry at gmail.com>
Date:   Tue Jul 5 11:17:36 2011 -0600

    Update to 3.4.2.
    Add doxygen documentation and examples to docs.

 .gitignore                 |    2 +-
 givaro-config-script.patch |   10 ++--
 givaro-config.h            |  100 --------------------------------------------
 givaro.spec                |   73 +++++++++++++++++++-------------
 sources                    |    2 +-
 5 files changed, 51 insertions(+), 136 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 096b1ca..3510d74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-givaro-3.3.1.tar.gz
+/givaro-3.4.2.tar.gz
diff --git a/givaro-config-script.patch b/givaro-config-script.patch
index 76de2f4..3909ad0 100644
--- a/givaro-config-script.patch
+++ b/givaro-config-script.patch
@@ -1,6 +1,6 @@
---- givaro-config.in	2004-05-13 02:08:24.000000000 +1000
-+++ givaro-config.in.new	2009-08-23 14:53:24.000000000 +1000
-@@ -55,11 +55,11 @@
+--- givaro-config.in	2011-05-03 04:52:46.000000000 -0600
++++ givaro-config.in.new	2011-05-16 16:39:10.127023925 -0600
+@@ -61,11 +61,11 @@
  	;;
  
      --cflags)
@@ -9,12 +9,12 @@
  	;;
  
      --libs)
--       	echo -L${libdir} -lgivaro @GMP_LIBS@ 
+-       	echo -L${libdir} ${libdir}/libgivaro.so -lgivaro @GMP_LIBS@ 
 +       	echo -n " -L${libdir} -lgivaro @GMP_LIBS@"
         	;;
  
      *)
-@@ -69,5 +69,6 @@
+@@ -75,5 +75,6 @@
      esac
      shift
  done
diff --git a/givaro.spec b/givaro.spec
index cae0e2a..681c22f 100644
--- a/givaro.spec
+++ b/givaro.spec
@@ -1,17 +1,17 @@
 Name:		givaro
-Version:	3.3.1
-Release:	2%{?dist}
+Version:	3.4.2
+Release:	1%{?dist}
 Summary:	C++ library for arithmetic and algebraic computations
 Group:		Development/Libraries
 
 License:	CeCILL-B
 URL:		http://ljk.imag.fr/CASYS/LOGICIELS/givaro/
-Source0:	http://ljk.imag.fr/CASYS/LOGICIELS/givaro/givaro-%{version}.tar.gz
-Source1:	givaro-config.h
+Source0:	https://forge.imag.fr/frs/download.php/125/givaro-%{version}.tar.gz
 Patch0:		givaro-config-script.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	doxygen
 BuildRequires:	gmp-devel
+BuildRequires:	tex(latex)
 
 
 %description
@@ -27,8 +27,8 @@ univariate polynomials (and therefore recursive multivariate).
 
 %package        devel
 Summary:	Files useful for %{name} development
-Group:	Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Group:		Development/Libraries
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 
 %description    devel
@@ -37,9 +37,9 @@ The libraries and header files for using %{name} for development.
 
 %package        static
 Summary:	Files used for static linking with %{name}
-Group:	Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	%{name}-devel = %{version}-%{release}
+Group:		Development/Libraries
+Requires:	%{name}%{?_isa} = %{version}-%{release}
+Requires:	%{name}-devel%{?_isa} = %{version}-%{release}
 
 
 %description    static
@@ -48,57 +48,69 @@ The static libraries for using %{name} for development.
 
 %prep
 %setup -q
-cp %{SOURCE1} new-givaro-config.h
-
-sed -i -e 's|^#define __GIVARO_VERSION.*$|#define __GIVARO_VERSION  "%{version}"|' new-givaro-config.h
+%patch0
 
+# Fix file encodings
 for i in Licence_CeCILL-B_V1-fr.txt Licence_CeCILL-B_V1-en.txt;
 do
 	iconv -f  iso8859-1 -t utf-8 $i > $i.new && \
 	touch -r $i $i.new && \
 	mv $i.new $i
 done
-%patch0
+
+# Remove unnecessary executable bits
+find examples -name Makefile.am | xargs chmod a-x
 
 
 %build
-%configure --with-gmp --enable-shared=yes
+%configure --enable-shared --enable-docs \
+  --docdir=%{_docdir}/%{name}-devel-%{version}
+
+# Fix an unused direct library dependency
+sed -i 's/-lm -lgcc_s/-lgcc_s/' libtool
+
 make %{?_smp_mflags}
 
+# Build the developer documentation
+cd docs
+doxygen DoxyfileDev
+cd ..
+
+# We don't want these files with the doxygen-generated files
+rm -f docs/givaro-html/{AUTHORS,COPYING,INSTALL}
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
+# Documentation installation is hopelessly broken
+sed -i 's/^SUBDIRS =.*/SUBDIRS = src macros tests/' Makefile
+
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
 
-rm -f $RPM_BUILD_ROOT%{_includedir}/givaro-config.h
-install -m 644 new-givaro-config.h $RPM_BUILD_ROOT%{_includedir}/givaro-config.h
-
 #givaro-makefile is installed incorrectly in usr/bin
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/
-mv $RPM_BUILD_ROOT/%{_bindir}/givaro-makefile $RPM_BUILD_ROOT%{_datadir}/%{name}/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+mv $RPM_BUILD_ROOT/%{_bindir}/givaro-makefile $RPM_BUILD_ROOT%{_datadir}/%{name}
 chmod 644  $RPM_BUILD_ROOT%{_datadir}/%{name}/givaro-makefile
-sed -i 's|#! /bin/sh||' $RPM_BUILD_ROOT%{_datadir}/%{name}/givaro-makefile
+sed -i '\%#! /bin/sh%D' $RPM_BUILD_ROOT%{_datadir}/%{name}/givaro-makefile
 
 
-%post -p /sbin/ldconfig
+%check
+make check
 
 
-%postun -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%postun -p /sbin/ldconfig
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYRIGHT Licence_CeCILL-B_V1-en.txt Licence_CeCILL-B_V1-fr.txt
 %{_libdir}/lib%{name}.so.*
 
 
 %files devel
-%defattr(-,root,root,-)
+%doc docs/givaro-html docs/givaro-dev-html examples
 %{_bindir}/%{name}-config
 %{_includedir}/%{name}/
 %{_includedir}/gmp++/
@@ -108,11 +120,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files static
-%defattr(-,root,root,-)
 %{_libdir}/lib%{name}.a
 
 
 %changelog
+* Tue Jul  5 2011 Jerry James <loganjerry at gmail.com> - 3.4.2-1
+- Update to 3.4.2
+- Add doxygen documentation and examples to docs
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index d419f1c..a58e0ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df8c06c5a53e2b1123b7b5ea146d8a09  givaro-3.3.1.tar.gz
+6be24745e3c9c0ec30dad0de1ce99e27  givaro-3.4.2.tar.gz
