From 0f700b7fa0f880a839d24d62a71dfdb39f559892 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Feb 01 2024 04:39:32 +0000 Subject: Version 0.95.0 - Drop all patches - Verify that License is valid SPDX - Stop building for 32-bit x86 --- diff --git a/coin-or-Blis-configure-c99.patch b/coin-or-Blis-configure-c99.patch deleted file mode 100644 index 3c863ff..0000000 --- a/coin-or-Blis-configure-c99.patch +++ /dev/null @@ -1,28 +0,0 @@ -Avoid calling the undeclared exit function. Implicit function -declarations were removed from C99. No need to upstream this -because it will go away with newer autoconf. - -diff --git a/configure b/configure -index 72566b8a27d74ee9..5b3a98b0de3e8202 100755 ---- a/configure -+++ b/configure -@@ -2571,7 +2571,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ -- '' \ -+ '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ -@@ -6965,8 +6965,8 @@ main () - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF - rm -f conftest$ac_exeext diff --git a/coin-or-Blis-docdir.patch b/coin-or-Blis-docdir.patch deleted file mode 100644 index 7c99291..0000000 --- a/coin-or-Blis-docdir.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up CHiPPS-BLIS-releases-0.94.8/Blis/configure.orig CHiPPS-BLIS-releases-0.94.8/Blis/configure ---- CHiPPS-BLIS-releases-0.94.8/Blis/configure.orig 2019-03-15 13:31:45.000000000 -0600 -+++ CHiPPS-BLIS-releases-0.94.8/Blis/configure 2019-06-24 11:22:40.989608292 -0600 -@@ -21948,7 +21948,7 @@ echo "${ECHO_T}$doxysrcdir (src)" >&6 - fi - # Not built, fall back to installed tag file - if test $doxyfound = no ; then -- eval doxydir="${datadir}/coin/doc/${proj}/doxydoc" -+ eval doxydir="${datadir}/doc/coin-or-${proj}" - # AC_MSG_NOTICE([Considering $doxydir (install)]) - # AC_MSG_NOTICE([Subdirs: $coin_subdirs)]) - coin_doxy_tagfiles="$coin_doxy_tagfiles $doxydir/$doxytag=$doxydir/html" -diff -up CHiPPS-BLIS-releases-0.94.8/Blis/Makefile.in.orig CHiPPS-BLIS-releases-0.94.8/Blis/Makefile.in ---- CHiPPS-BLIS-releases-0.94.8/Blis/Makefile.in.orig 2019-03-15 13:31:45.000000000 -0600 -+++ CHiPPS-BLIS-releases-0.94.8/Blis/Makefile.in 2019-04-07 14:39:53.210840975 -0600 -@@ -340,7 +340,7 @@ EXTRA_DIST = examples/BlisMain.cpp examp - ######################################################################## - pkgconfiglibdir = $(libdir)/pkgconfig - pkgconfiglib_DATA = blis.pc --addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Blis -+addlibsdir = $(DESTDIR)$(datadir)/doc/coin-or-$(PACKAGE_NAME) - - ######################################################################## - # Maintainer Stuff # -@@ -349,7 +349,7 @@ addlibsdir = $(DESTDIR)$(datadir)/coin/d - # Files that are generated and should be cleaned with make distclean - DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES) - DocFiles = README AUTHORS LICENSE --DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME) -+DocInstallDir = $(datadir)/doc/coin-or-$(PACKAGE_NAME) - COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE - COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE - all: all-recursive -diff -up CHiPPS-BLIS-releases-0.94.8/Makefile.in.orig CHiPPS-BLIS-releases-0.94.8/Makefile.in ---- CHiPPS-BLIS-releases-0.94.8/Makefile.in.orig 2019-03-15 13:31:45.000000000 -0600 -+++ CHiPPS-BLIS-releases-0.94.8/Makefile.in 2019-04-07 14:40:26.536740100 -0600 -@@ -266,7 +266,7 @@ SUBDIRS = $(subdirs) - DISTCLEANFILES = coin_subdirs.txt $(am__append_2) \ - $(VPATH_DISTCLEANFILES) - DocFiles = README AUTHORS LICENSE --DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME) -+DocInstallDir = $(datadir)/doc/coin-or-$(PACKAGE_NAME) - COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE - COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE - all: all-recursive diff --git a/coin-or-Blis.spec b/coin-or-Blis.spec index d7799d6..ef839ff 100644 --- a/coin-or-Blis.spec +++ b/coin-or-Blis.spec @@ -2,11 +2,15 @@ Name: coin-or-%{module} Summary: BLIS (BiCePS Linear Integer Solver) -Version: 0.94.8 -Release: 13%{?dist} +Version: 0.95.0 +Release: 1%{?dist} License: EPL-1.0 URL: https://github.com/coin-or/CHiPPS-BLIS Source0: https://github.com/coin-or/CHiPPS-BLIS/archive/releases/%{version}/CHiPPS-BLIS-%{version}.tar.gz + +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: coin-or-Bcps-devel BuildRequires: coin-or-Bcps-doc BuildRequires: coin-or-Cgl-devel @@ -16,10 +20,6 @@ BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: make -# Install documentation in standard rpm directory -Patch0: %{name}-docdir.patch -Patch1: coin-or-Blis-configure-c99.patch - %description BLIS (BiCePS Linear Integer Solver) is an application developed on top of BiCePS and is part of the CHiPPS library hierarchy. BLIS is a branch and cut @@ -60,13 +60,14 @@ sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ -i libtool %make_build all -%make_build -C Blis doxydoc +%make_build doxygen-docs %install %make_install +mv %{buildroot}%{_docdir}/coin-or-blis %{buildroot}%{_docdir}/%{name} rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_docdir}/%{name}/{LICENSE,blis_addlibs.txt} -cp -a Blis/doxydoc/{html,*.tag} %{buildroot}%{_docdir}/%{name} +cp -a blis_doxy.tag doxydoc/html %{buildroot}%{_docdir}/%{name} %check LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test @@ -75,13 +76,13 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %license LICENSE %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/AUTHORS -%doc %{_docdir}/%{name}/README +%doc %{_docdir}/%{name}/README.md %{_bindir}/blis -%{_libdir}/libBlis.so.0 -%{_libdir}/libBlis.so.0.* +%{_libdir}/libBlis.so.1 +%{_libdir}/libBlis.so.1.* %files devel -%{_includedir}/coin/* +%{_includedir}/coin-or/* %{_libdir}/libBlis.so %{_libdir}/pkgconfig/blis.pc @@ -90,6 +91,12 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{_docdir}/%{name}/blis_doxy.tag %changelog +* Wed Jan 31 2024 Jerry James - 0.95.0-1 +- Version 0.95.0 +- Drop all patches +- Verify that License is valid SPDX +- Stop building for 32-bit x86 + * Wed Jan 24 2024 Fedora Release Engineering - 0.94.8-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 634c0a2..07df119 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (CHiPPS-BLIS-0.94.8.tar.gz) = 5b401eaf7b80af6cb724606655c38811918e92ae89d2f4a1fd5f318bdc8fa1463175a106c2f3ab43bf5eda677a6d7bbdb8a0f8bc0155135108a10bbcbb93070b +SHA512 (CHiPPS-BLIS-0.95.0.tar.gz) = 9bd19ce8d19ef0ebdbf5690d4fc2076916bc63c5223b5f0bdd5ffc80d46cffed966608680c878e9d7522831dff5b81dbf7e86a0a58469f5299d06266947b4ba0