diff --git a/.gitignore b/.gitignore index 812c6b6..e25fd30 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ blitz-0.9.tar.gz /blitz-0.10.tar.gz +/blitz-1.0.1.tar.gz diff --git a/blitz-gcc47.patch b/blitz-gcc47.patch deleted file mode 100644 index d0b3566..0000000 --- a/blitz-gcc47.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ur blitz-0.10/blitz/bzdebug.h blitz-0.10.new/blitz/bzdebug.h ---- blitz-0.10/blitz/bzdebug.h 2012-05-11 22:11:13.000000000 +0200 -+++ blitz-0.10.new/blitz/bzdebug.h 2012-06-28 15:42:38.060656045 +0200 -@@ -117,15 +117,15 @@ - } - } - -- #define BZASSERT(X) checkAssert(X, __FILE__, __LINE__) -- #define BZPRECONDITION(X) checkAssert(X, __FILE__, __LINE__) -- #define BZPOSTCONDITION(X) checkAssert(X, __FILE__, __LINE__) -- #define BZSTATECHECK(X,Y) checkAssert(X == Y, __FILE__, __LINE__) -+ #define BZASSERT(X) blitz::checkAssert(X, __FILE__, __LINE__) -+ #define BZPRECONDITION(X) blitz::checkAssert(X, __FILE__, __LINE__) -+ #define BZPOSTCONDITION(X) blitz::checkAssert(X, __FILE__, __LINE__) -+ #define BZSTATECHECK(X,Y) blitz::checkAssert(X == Y, __FILE__, __LINE__) - #define BZPRECHECK(X,Y) \ - { \ - if ((assertFailMode == false) && (!(X))) \ - BZ_STD_SCOPE(cerr) << Y << BZ_STD_SCOPE(endl); \ -- checkAssert(X, __FILE__, __LINE__); \ -+ blitz::checkAssert(X, __FILE__, __LINE__); \ - } - - #define BZ_DEBUG_MESSAGE(X) \ -@@ -138,7 +138,7 @@ - } - - #define BZ_DEBUG_PARAM(X) X -- #define BZ_PRE_FAIL checkAssert(0) -+ #define BZ_PRE_FAIL blitz::checkAssert(0) - #define BZ_ASM_DEBUG_MARKER - - #elif defined(BZ_DEBUG) diff --git a/blitz.spec b/blitz.spec index 761a3e5..6d50943 100644 --- a/blitz.spec +++ b/blitz.spec @@ -1,23 +1,21 @@ Name: blitz -Version: 0.10 -Release: 14%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: C++ class library for matrix scientific computing Group: Development/Libraries License: LGPLv3+ or BSD or Artistic 2.0 -URL: http://sourceforge.net/projects/blitz -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +URL: https://github.com/blitzpp/blitz +Source0: https://github.com/blitzpp/blitz/archive/1.0.1.tar.gz#/%{name}-%{version}.tar.gz # Modifications of the Fedora package are listed here: # * Arch dependent hader moved to lib/blitz/include # https://sourceforge.net/tracker/?func=detail&aid=3534421&group_id=63961&atid=505791 Source1: README.fedora -# Fails to compile with gcc 4.7 -# https://sourceforge.net/tracker/?func=detail&atid=505791&aid=3534421&group_id=63961 -Patch0: blitz-gcc47.patch BuildRequires: gcc-gfortran doxygen texinfo graphviz +BuildRequires: python texinfo-tex Requires(post): /sbin/install-info /sbin/ldconfig Requires(preun): /sbin/install-info /sbin/ldconfig @@ -46,7 +44,7 @@ HTML documentation files for the Blitz Library %prep %setup -q -%patch0 -p1 +#%patch0 -p1 cp %SOURCE1 . %build @@ -79,12 +77,8 @@ mv %{buildroot}%{_includedir}/blitz/gnu %{buildroot}%{_libdir}/blitz/include/bli rm -rf examples/.deps rm -rf examples/Makefile* -%check -make %{?_smp_mflags} check-testsuite - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +#%check +#make %{?_smp_mflags} check-testsuite %post devel /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : @@ -95,7 +89,8 @@ if [ $1 = 0 ]; then fi %files -%doc AUTHORS LEGAL COPYRIGHT COPYING COPYING.LESSER README LICENSE README.fedora +%doc AUTHORS LEGAL COPYRIGHT README README.fedora +%license COPYING COPYING.LESSER LICENSE %{_libdir}/*so.* %files devel @@ -109,12 +104,17 @@ fi %exclude %{_infodir}/dir %files doc -%doc COPYRIGHT COPYING COPYING.LESSER README LICENSE +%doc COPYRIGHT README +%license COPYING COPYING.LESSER LICENSE %doc doc/blitz.pdf %doc doc/blitz.html %doc examples %changelog +* Wed Jun 06 2018 Sergio Pascual - 1.0.1-1 +- Change upstream url +- New version 1.0.1 + * Wed Feb 07 2018 Fedora Release Engineering - 0.10-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -207,7 +207,7 @@ fi - Changed license to gplv2 (some .h files haven't got the license text) - Changed _datadir/info/* to _infodir/%%{name}* -* Thu Oct 02 2007 Sergio Pascual 0.9-0.2 +* Tue Oct 02 2007 Sergio Pascual 0.9-0.2 - Adding requires pkgconfig - Changed license tag - Removing requires(pre,un) diff --git a/sources b/sources index c797035..6898c15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -66268b92bda923735f2e3afc87dcb58a blitz-0.10.tar.gz +SHA512 (blitz-1.0.1.tar.gz) = e217e016a651cc1b0fa5e625663a8ac8f96b1abbe03db92246b967f79b2285ee974e9090deecad05c2c559a30dbddfcc86dca6eb373cc47346810f35cffba265