[packages/blitz] - updated to 1.0.2, finished package

qboosh qboosh at pld-linux.org
Mon Apr 22 20:45:30 CEST 2024 

commit 93891d9459543417c840fee954204432aa9754b4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Apr 22 20:31:06 2024 +0200

    - updated to 1.0.2, finished package

 blitz-DESTDIR.patch                  | 12 +++---
 blitz-compiler_specific_header.patch | 12 ------
 blitz-doc.patch                      | 13 ++++++
 blitz-infopage.patch                 | 21 +++++-----
 blitz.spec                           | 79 ++++++++++++++++++++++++------------
 5 files changed, 81 insertions(+), 56 deletions(-)
---
diff --git a/blitz.spec b/blitz.spec
index 3009efd..38ed7aa 100644
--- a/blitz.spec
+++ b/blitz.spec
@@ -1,22 +1,33 @@
+#
+# Conditional build:
+%bcond_without	apidocs	# Doxygen API documentation
+%bcond_with	tbb	# Intel Threading Building Blocks atomic types
+
 Summary:	Blitz++ - a C++ class library for scientific computing
 Summary(pl.UTF-8):	Blitz++ - biblioteka klas C++ do obliczeń naukowych
 Name:		blitz
-Version:	0.9
-Release:	0.1
-License:	GPL or Blitz artistic license
+Version:	1.0.2
+Release:	1
+License:	Artistic v2.0, BSD or LGPL v3
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/blitz/%{name}-%{version}.tar.gz
-# Source0-md5:	031df2816c73e2d3bd6d667bbac19eca
+#Source0Download: https://github.com/blitzpp/blitz/releases
+Source0:	https://github.com/blitzpp/blitz/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	195873ba25ae4c10b9cd374bf42c67c2
 Patch0:		%{name}-DESTDIR.patch
-Patch1:		%{name}-compiler_specific_header.patch
+Patch1:		%{name}-doc.patch
 Patch2:		%{name}-infopage.patch
-URL:		http://www.oonumerics.org/blitz/
+URL:		https://github.com/blitzpp/blitz/wiki/
 BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	blas-devel
+BuildRequires:	boost-devel
 BuildRequires:	doxygen
 BuildRequires:	fonts-TTF-bitstream-vera
+BuildRequires:	gcc-fortran
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
+%{?with_tbb:BuildRequires:	tbb-devel}
+BuildRequires:	texinfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,6 +47,7 @@ Summary:	Header files for Blitz++ library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Blitz++
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	libstdc++-devel
 
 %description devel
 Header files for Blitz++ library.
@@ -80,7 +92,7 @@ Przykłady Blitz++.
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
 
 %build
@@ -89,18 +101,31 @@ Przykłady Blitz++.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+# here papi is ptools-perfapi library, not the one from papi.spec
 %configure \
-	--enable-shared
-%{__make} lib
+	ac_cv_lib_papi_main=no \
+	%{?with_apidocs:--enable-doxygen --enable-html-docs} \
+	--enable-serialization \
+	--enable-shared \
+	%{?with_tbb:--with-tbb}
+
+%{__make}
+
+%{__make} -j1 info
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_docdir}/%{name}-doc-%{version}/doxygen,%{_examplesdir}/%{name}}
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-%{__make} install \
+%{__make} install install-info \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cp -af examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}
+cp -af examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}
+
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libblitz.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,36 +133,36 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%post devel
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
-%{__sed} -i -e 's/(blitz++)\./(blitz)./' %{_infodir}/dir
+%post	devel -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun devel	-p	/sbin/postshell
+%postun	devel -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog ChangeLog.1 LEGAL LICENSE NEWS README TODO
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%{_pkgconfigdir}/blitz-uninstalled.pc
+%doc AUTHORS COPYRIGHT ChangeLog* LEGAL NEWS README.md
+%attr(755,root,root) %{_libdir}/libblitz.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libblitz.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libblitz.so
 %{_includedir}/blitz
 %{_includedir}/random
 %{_pkgconfigdir}/blitz.pc
-%{_infodir}/*.info*
+%{_infodir}/blitz.info*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libblitz.a
 
+%if %{with apidocs}
 %files doc
 %defattr(644,root,root,755)
-%{_docdir}/%{name}-doc-%{version}
+%doc doc/doxygen/html/{search,*.css,*.html,*.js,*.png}
+%endif
 
 %files examples
 %defattr(644,root,root,755)
-%{_examplesdir}/%{name}
+%{_examplesdir}/%{name}-%{version}
diff --git a/blitz-DESTDIR.patch b/blitz-DESTDIR.patch
index 7a5cc37..2d47ea7 100644
--- a/blitz-DESTDIR.patch
+++ b/blitz-DESTDIR.patch
@@ -10,14 +10,14 @@ diff -Nurb blitz-0.9.orig/doc/doxygen/Makefile.am blitz-0.9.new/doc/doxygen/Make
  
  DISTCLEANFILES = Doxyfile doxygen-warning 
  
---- blitz-0.9/doc/Makefile.am.orig	2007-11-01 21:28:14.000000000 +0100
-+++ blitz-0.9/doc/Makefile.am	2007-11-01 21:28:50.000000000 +0100
+--- blitz-1.0.2/doc/Makefile.am.orig	2024-04-21 20:16:15.456712855 +0200
++++ blitz-1.0.2/doc/Makefile.am	2024-04-21 20:17:02.503124649 +0200
 @@ -5,7 +5,7 @@
  SUBDIRS = examples stencils doxygen
  
- # install these files
+ # docdir directory to install the doc (pdf ps html) 
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/$(PACKAGE)-doc-$(VERSION)
- doc_DATA = blitz.ps 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 \
+ 
+ DVIPS=export TEXPICTS=$(srcdir); dvips
+ AM_MAKEINFOFLAGS = --no-split -I$(srcdir)
diff --git a/blitz-compiler_specific_header.patch b/blitz-compiler_specific_header.patch
deleted file mode 100644
index 866c8da..0000000
--- a/blitz-compiler_specific_header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nurb blitz-0.8.orig/m4/ac_compiler_specific_header.m4 blitz-0.8.new/m4/ac_compiler_specific_header.m4
---- blitz-0.8.orig/m4/ac_compiler_specific_header.m4	2004-10-13 18:14:04.000000000 +0200
-+++ blitz-0.8.new/m4/ac_compiler_specific_header.m4	2005-05-21 10:24:42.211975904 +0200
-@@ -22,7 +22,7 @@
-             COMPILER_SPECIFIC_HEADER="hp/bzconfig.h" ;;
-   CC)       AX_PREFIX_CONFIG_H([blitz/sgi/bzconfig.h],[BZ])
-             COMPILER_SPECIFIC_HEADER="sgi/bzconfig.h" ;;
--  g++)      AX_PREFIX_CONFIG_H([blitz/gnu/bzconfig.h],[BZ])
-+  g++|*-*-*-g++)      AX_PREFIX_CONFIG_H([blitz/gnu/bzconfig.h],[BZ])
-             COMPILER_SPECIFIC_HEADER="gnu/bzconfig.h" ;;
-   pgCC)     AX_PREFIX_CONFIG_H([blitz/pgi/bzconfig.h],[BZ])
-             COMPILER_SPECIFIC_HEADER="pgi/bzconfig.h" ;;
diff --git a/blitz-doc.patch b/blitz-doc.patch
new file mode 100644
index 0000000..cf3d778
--- /dev/null
+++ b/blitz-doc.patch
@@ -0,0 +1,13 @@
+--- blitz-1.0.2/doc/doxygen/Makefile.am.orig	2024-04-22 20:05:26.115494996 +0200
++++ blitz-1.0.2/doc/doxygen/Makefile.am	2024-04-22 20:18:29.974581800 +0200
+@@ -91,10 +91,6 @@ make-install-dirs:
+ 	fi
+ 
+ install-data-hook: make-install-dirs
+-	@if test -d html; then \
+-		echo Installing HTML documentation into $(DESTDIR)$(docdir) ; \
+-		$(INSTALL_DATA) html/* $(DESTDIR)$(docdir) ; \
+-	fi
+ 	@if test -f $(PACKAGE).pdf; then \
+ 		echo Installing PDF manual into $(DESTDIR)$(docdir) ; \
+ 		$(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)$(docdir) ; \
diff --git a/blitz-infopage.patch b/blitz-infopage.patch
index bea958d..6b8202a 100644
--- a/blitz-infopage.patch
+++ b/blitz-infopage.patch
@@ -1,15 +1,14 @@
-diff -Nur blitz-0.8/doc/blitz.info blitz-0.8.new/doc/blitz.info
---- blitz-0.8/doc/blitz.info	2004-11-04 23:47:23.000000000 +0100
-+++ blitz-0.8.new/doc/blitz.info	2005-05-30 19:20:48.000000000 +0200
-@@ -1,8 +1,8 @@
- This is blitz.info, produced by makeinfo version 4.1 from blitz.texi.
+--- blitz-1.0.2/doc/blitz.texi.orig	2019-10-02 00:50:17.000000000 +0200
++++ blitz-1.0.2/doc/blitz.texi	2024-04-21 20:19:24.545688472 +0200
+@@ -10,9 +10,9 @@
+ @end iftex
+ @c %**end of header
  
--INFO-DIR-SECTION Blitz++ library
-+INFO-DIR-SECTION Libraries
- START-INFO-DIR-ENTRY
+- at dircategory Blitz++ library
++ at dircategory Libraries:
+ @direntry
 -* Blitz++: (blitz++).           High-performance C++ numeric library
-+* Blitz++: (blitz++).			High-performance C++ numeric library
- END-INFO-DIR-ENTRY
++* Blitz++: (blitz).			High-performance C++ numeric library
+ @end direntry
  
- 
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/blitz.git/commitdiff/93891d9459543417c840fee954204432aa9754b4

More information about the pld-cvs-commit mailing list