diff --git a/.gitignore b/.gitignore index b9d1a47..812c6b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ blitz-0.9.tar.gz +/blitz-0.10.tar.gz diff --git a/blitz.spec b/blitz.spec index 8e9865b..56c0c1c 100644 --- a/blitz.spec +++ b/blitz.spec @@ -1,17 +1,20 @@ Name: blitz -Version: 0.9 -Release: 15%{?dist} +Version: 0.10 +Release: 1%{?dist} Summary: C++ class library for matrix scientific computing Group: Development/Libraries -License: GPLv2 -URL: http://www.oonumerics.org/blitz +License: LGPLv3+ or BSD +# URL: http://www.oonumerics.org/blitz +# This url seems down +URL: http://sourceforge.net/projects/blitz Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: blitz-gcc43.patch -Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +# https://sourceforge.net/tracker/?func=detail&aid=3534421&group_id=63961&atid=505791 +Patch0: blitz-gcc47.patch -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info +BuildRequires: boost-devel > 1.40.0 gcc-gfortran doxygen texinfo graphviz +Requires(post): /sbin/install-info /sbin/ldconfig +Requires(preun): /sbin/install-info /sbin/ldconfig %description Blitz++ is a C++ class library for scientific computing which provides @@ -25,7 +28,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel -This are the header files and libraries needed to develop a %{name} +These are the header files and libraries needed to develop a %{name} application %package doc @@ -41,33 +44,37 @@ HTML documentation files for the Blitz Library %patch0 -p1 %build -%configure --enable-shared --disable-static --disable-fortran \ - --disable-dependency-tracking --disable-cxx-flags-preset +%configure --enable-shared --disable-static --disable-cxx-flags-preset \ + --enable-serialization --enable-64bit --enable-fortran \ + --disable-fortran-flags-preset + make %{?_smp_mflags} +make info +make html +make pdf + # blitz.pc is created directly by configure # I use sed to add %%libdir/blitz to the include directories of the library # so that different bzconfig.h can be installed for different archs +# +# The problem is reported here +# https://sourceforge.net/tracker/?func=detail&aid=2273091&group_id=63961&atid=505791 %{__sed} -i -e "s/Cflags: -I\${includedir}/Cflags: -I\${includedir} -I\${libdir}\/blitz\/include/" blitz.pc %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install-info + mkdir -p %{buildroot}%{_libdir}/blitz/include/blitz mv %{buildroot}%{_includedir}/blitz/gnu %{buildroot}%{_libdir}/blitz/include/blitz -rm -rf doc/doxygen/html/installdox -# There are some empty files in doc, remove before copying in doc -(find -empty | xargs rm) + # Put in doc only the source code rm -rf examples/.deps rm -rf examples/Makefile* -# Check fails with gcc 4.3 and ppc -# Removed for the moment -#%check -#make %{?_smp_mflags} check-testsuite - -%clean -rm -rf %{buildroot} +%check +make %{?_smp_mflags} check-testsuite %post -p /sbin/ldconfig @@ -81,14 +88,11 @@ if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi - %files -%defattr(-,root,root,-) -%doc AUTHORS LEGAL COPYING README LICENSE +%doc AUTHORS LEGAL COPYING COPYING.LESSER README LICENSE %{_libdir}/*so.* %files devel -%defattr(-,root,root,-) %doc examples %{_libdir}/*.so %{_libdir}/pkgconfig/* @@ -97,13 +101,17 @@ fi %{_infodir}/* %exclude %{_libdir}/*.la %exclude %{_infodir}/dir -%exclude %{_libdir}/pkgconfig/blitz-uninstalled.pc %files doc -%defattr(-,root,root,-) -%doc doc/{blitz.pdf,blitz.html,blitz_abt.html,blitz_fot.html,blitz_ovr.html,blitz_toc.html,blitz_1.html,blitz_2.html,blitz_3.html,blitz_4.html,blitz_5.html,blitz_6.html,blitz_7.html,blitz_8.html,blitz_9.html,blitz_10.html,blitz_11.html,blitz_12.html,blitz_13.html,blitz_14.html,blitz_15.html,blitz_16.html,indirect.gif,slice.gif,strideslice.gif,sinsoid.gif,tensor1.gif,blitz.gif,blitztiny.jpg} +%doc COPYING COPYING.LESSER LICENSE +%doc doc/blitz.pdf +%doc doc/blitz.html +%doc examples %changelog +* Sun Jul 01 2012 Sergio Pascual - 0.10-1 +- New upstream source + * Thu Jan 12 2012 Fedora Release Engineering - 0.9-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 3002fa1..fc1f727 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -031df2816c73e2d3bd6d667bbac19eca blitz-0.9.tar.gz +3e3b486784faf7ddd946ae5fb04d47f0 blitz-0.10.tar.gz