February 2024 - Arch-excludes - Fedora mailing-lists

Architecture specific change in rpms/Singular.git
by githook-noreply＠fedoraproject.org 26 Feb '24

26 Feb '24

The package rpms/Singular.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/Singular.git/commit/?id=73ce3d555a7…. Change: +ExcludeArch: %{ix86} Thanks. Full change: ============ commit 73ce3d555a746ab1f2a8ff5fc5997d84ebc66e0f Author: Jerry James <loganjerry(a)gmail.com> Date: Thu Feb 1 09:18:35 2024 -0700 Version 4.3.2p8 - Drop upstreamed -alias and -c99 patches - Stop building for 32-bit x86 - Build with ccluster and spasm support - Build docs only on x86_64 and ppc64le architectures diff --git a/Singular-alias.patch b/Singular-alias.patch deleted file mode 100644 index 08dbe3f..0000000 --- a/Singular-alias.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- singular-4.1.1/Singular/links/ndbm.cc.orig 2018-07-31 07:05:52.000000000 -0600 -+++ singular-4.1.1/Singular/links/ndbm.cc 2018-10-24 08:39:16.614020655 -0600 -@@ -280,7 +280,7 @@ datum dbm_nextkey(DBM *db) - db->dbm_flags |= _DBM_IOERR; - #endif - } -- if (((short *)db->dbm_pagbuf)[0] != 0) -+ if (db->dbm_pagbuf[0] != 0 || db->dbm_pagbuf[1] != 0) - { - item = makdatum(db->dbm_pagbuf, db->dbm_keyptr); - if (item.dptr != NULL) diff --git a/Singular-c99.patch b/Singular-c99.patch deleted file mode 100644 index f238862..0000000 --- a/Singular-c99.patch +++ /dev/null @@ -1,41 +0,0 @@ -commit b6647a741b9091b82021ff46d4c112099d175d57 -Author: Michael Orlitzky <michael(a)orlitzky.com> -Date: Thu Nov 10 20:59:00 2022 -0500 - - omalloc/omAllocSystem.c: add another include for malloc.h. - - There are two branches in this file, one for HAVE_MALLOC_SIZE and one - for HAVE_MALLOC_USABLE_SIZE. The former includes malloc.h, and the - latter needs to too; otherwise, malloc_usable_size() is undefined. - - This is caught by -Werror=implicit-function-declaration, which is - likely to be enabled by default in future versions of GCC and clang. - -diff --git a/omalloc/omAllocSystem.c b/omalloc/omAllocSystem.c -index b70a6292acf8ed80..62e20a57b8b53472 100644 ---- a/omalloc/omAllocSystem.c -+++ b/omalloc/omAllocSystem.c -@@ -30,15 +30,19 @@ - * - *******************************************************************/ - /* allocation of large addr */ --#if defined(HAVE_MALLOC_SIZE) -+ -+#if defined(HAVE_MALLOC_SIZE) || defined(HAVE_MALLOC_USABLE_SIZE) -+ #include <stdlib.h> - #ifdef HAVE_MALLOC_H -- #include <malloc.h> -+ #include <malloc.h> - #elif defined(HAVE_MALLOC_MALLOC_H) -- #include <malloc/malloc.h> -+ #include <malloc/malloc.h> - #endif -+#endif -+ -+#if defined(HAVE_MALLOC_SIZE) - #define _omSizeOfLargeAddr(addr) (malloc_size(addr)) - #elif defined(HAVE_MALLOC_USABLE_SIZE) -- #include <stdlib.h> - #define _omSizeOfLargeAddr(addr) (malloc_usable_size(addr)) - #else - void* omAllocLarge(size_t size) diff --git a/Singular-polymake-lib.patch b/Singular-polymake-lib.patch new file mode 100644 index 0000000..f5a5d52 --- /dev/null +++ b/Singular-polymake-lib.patch @@ -0,0 +1,10 @@ +--- singular-4.3.2/Singular/LIB/polymake.lib.orig 2023-09-06 02:51:20.000000000 -0600 ++++ singular-4.3.2/Singular/LIB/polymake.lib 2024-02-01 08:44:42.076075304 -0700 +@@ -226,7 +226,6 @@ EXAMPLE: example triangulations; shows + if ((p2t[i]=="}") and (p2t[i+1]=="}")) + { + np2t=np2t+"))"; +- i++; + } + else + { diff --git a/Singular-use-after-free.patch b/Singular-use-after-free.patch index 2438a25..1da71e9 100644 --- a/Singular-use-after-free.patch +++ b/Singular-use-after-free.patch @@ -21,8 +21,8 @@ longrat.cc:573:40: note: unnamed temporary defined here 573 | mpf_t *f = ((gmp_complex*)from)->real()._mpfp(); | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ ---- Singular-Release-4-2-1p3/factory/cfModGcd.cc.orig 2021-12-17 11:35:18.000000000 -0700 -+++ Singular-Release-4-2-1p3/factory/cfModGcd.cc 2022-07-25 14:53:41.944360644 -0600 +--- singular-4.3.2/factory/cfModGcd.cc.orig 2023-09-06 02:51:20.000000000 -0600 ++++ singular-4.3.2/factory/cfModGcd.cc 2024-02-01 08:40:42.663437275 -0700 @@ -1825,7 +1825,6 @@ gaussianElimFq (CFMatrix& M, CFArray& L, #else factoryError("NTL/FLINT missing: gaussianElimFq"); @@ -31,130 +31,15 @@ longrat.cc:573:40: note: unnamed temporary defined here M= (*N) (1, M.rows(), 1, M.columns()); L= CFArray (M.rows()); ---- Singular-Release-4-2-1p3/libpolys/coeffs/longrat.cc.orig 2021-12-17 11:35:18.000000000 -0700 -+++ Singular-Release-4-2-1p3/libpolys/coeffs/longrat.cc 2022-07-25 10:59:58.720085578 -0600 +--- singular-4.3.2/libpolys/coeffs/longrat.cc.orig 2024-02-01 08:40:42.664437261 -0700 ++++ singular-4.3.2/libpolys/coeffs/longrat.cc 2024-02-01 08:41:54.573427454 -0700 @@ -570,7 +570,8 @@ static number nlMapC(number from, const return INT_TO_SR(0); } - + - mpf_t *f = ((gmp_complex*)from)->real()._mpfp(); + gmp_float gfl = ((gmp_complex*)from)->real(); + mpf_t *f = gfl._mpfp(); number res; mpz_ptr dest,ndest; ---- Singular-Release-4-2-1p3/Singular/countedref.cc.orig 2021-12-17 11:35:18.000000000 -0700 -+++ Singular-Release-4-2-1p3/Singular/countedref.cc 2022-07-25 14:51:02.519890787 -0600 -@@ -317,13 +317,17 @@ public: - /// Recover the actual object from Singular interpreter object - static self cast(leftv arg) { - assume(arg != NULL); assume(is_ref(arg)); -- return self::cast(arg->Data()); -+ auto d = arg->Data(); -+ return self::cast(d); - } - - /// If necessary dereference. - static BOOLEAN resolve(leftv arg) { - assume(arg != NULL); -- while (is_ref(arg)) { if(CountedRef::cast(arg).dereference(arg)) return TRUE; }; -+ while (is_ref(arg)) { -+ CountedRef ref = CountedRef::cast(arg); -+ if (ref.dereference(arg)) return TRUE; -+ } - return (arg->next != NULL) && resolve(arg->next); - } - -@@ -369,8 +373,9 @@ char* countedref_String(blackbox */*b*/, - /// blackbox support - copy element - void* countedref_Copy(blackbox*/*b*/, void* ptr) - { -- if (ptr) return CountedRef::cast(ptr).outcast(); -- return NULL; -+ if (!ptr) return NULL; -+ CountedRef ref = CountedRef::cast(ptr); -+ return ref.outcast(); - } - - /// blackbox support - assign element -@@ -383,12 +388,16 @@ BOOLEAN countedref_Assign(leftv result, - } - - // Case: copy reference -- if (result->Typ() == arg->Typ()) -- return CountedRef::cast(arg).outcast(result); -+ if (result->Typ() == arg->Typ()) { -+ CountedRef ref = CountedRef::cast(arg); -+ return ref.outcast(result); -+ } - - // Case: new reference -- if ((arg->rtyp == IDHDL) || CountedRef::is_ref(arg)) -- return CountedRef(arg).outcast(result); -+ if ((arg->rtyp == IDHDL) || CountedRef::is_ref(arg)) { -+ CountedRef ref(arg); -+ return ref.outcast(result); -+ } - - WerrorS("Can only take reference from identifier"); - return TRUE; -@@ -483,7 +492,10 @@ BOOLEAN countedref_Op3(int op, leftv res - /// blackbox support - destruction - void countedref_destroy(blackbox */*b*/, void* ptr) - { -- if (ptr) CountedRef::cast(ptr).destruct(); -+ if (ptr) { -+ CountedRef ref = CountedRef::cast(ptr); -+ ref.destruct(); -+ } - } - - -@@ -539,7 +551,8 @@ public: - /// Blackbox support - generate initialized, but all-zero - shared data - void* countedref_InitShared(blackbox*) - { -- return CountedRefShared().outcast(); -+ auto ref = CountedRefShared(); -+ return ref.outcast(); - } - - /// Blackbox support - unary operation for shared data -@@ -656,23 +669,31 @@ BOOLEAN countedref_AssignShared(leftv re - /// Case: new reference to already shared data - if (result->Typ() == arg->Typ()) - { -- if (result->Data() != NULL) -- CountedRefShared::cast(result).destruct(); -- return CountedRefShared::cast(arg).outcast(result); -+ if (result->Data() != NULL) { -+ CountedRefShared ref = CountedRefShared::cast(result); -+ ref.destruct(); -+ } -+ CountedRefShared ref = CountedRefShared::cast(arg); -+ return ref.outcast(result); - } - if(CountedRefShared::cast(result).unassigned()) - { -- return CountedRefShared::cast(result).assign(result, arg); -+ CountedRefShared ref = CountedRefShared::cast(result); -+ return ref.assign(result, arg); - } - - /// Case: new shared data -- return CountedRefShared(arg).outcast(result); -+ CountedRefShared ref(arg); -+ return ref.outcast(result); - } - - /// blackbox support - destruction - void countedref_destroyShared(blackbox */*b*/, void* ptr) - { -- if (ptr) CountedRefShared::cast(ptr).destruct(); -+ if (ptr) { -+ CountedRefShared ref = CountedRefShared::cast(ptr); -+ ref.destruct(); -+ } - } - - diff --git a/Singular.spec b/Singular.spec index fe83f18..b6b22f9 100644 --- a/Singular.spec +++ b/Singular.spec @@ -1,7 +1,7 @@ %global singulardir %{_libdir}/Singular -%global upstreamver 4-3-1 +%global upstreamver 4-3-2 %global downstreamver %(tr - . <<< %{upstreamver}) -%global patchver p1 +%global patchver p8 %bcond_with python @@ -14,9 +14,21 @@ # of Singular cannot be installed. %bcond_with bootstrap +# Starting with the 4.3.1p3 release, doc building has become problematic. The +# s390x build usually fails: while building the examples, Singular eventually +# attempts to fork, gets back ENOMEM, and then doesn't handle the failure well. +# The result is that the build stalls. To avoid all this, we only build docs +# for aarch64, x86_64, and ppc64le. If you really need docs for s390x, help me +# figure out how to avoid the problem described above. +%ifarch %{arm64} x86_64 %{power64} +%bcond_without docs +%else +%bcond_with docs +%endif + Name: Singular Version: %{downstreamver}%{?patchver} -Release: 5%{?dist} +Release: 1%{?dist} Summary: Computer Algebra System for polynomial computations # License analysis: # - The project as a whole is GPL-2.0-only OR GPL-3.0-only @@ -38,6 +50,7 @@ BuildRequires: boost-devel %if %{with python} BuildRequires: boost-python2-devel %endif +BuildRequires: ccluster-devel BuildRequires: cddlib-devel BuildRequires: desktop-file-utils BuildRequires: doxygen @@ -55,6 +68,7 @@ BuildRequires: javapackages-tools %endif BuildRequires: libgfan-devel BuildRequires: libnormaliz-devel +BuildRequires: libspasm-devel BuildRequires: libtool BuildRequires: lrcalc BuildRequires: make @@ -93,9 +107,12 @@ Provides: Singular-polymake = %{version}-%{release} # This can be removed when F41 reaches EOL Obsoletes: Singular-surfex < 4.3.1-1 +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + # Support S390(x) architectures Patch0: %{name}-arches.patch -# Fix both underlinking and overlinking +# Fix overlinking Patch1: %{name}-link.patch # Fix the desktop files Patch2: %{name}-desktop.patch @@ -107,23 +124,24 @@ Patch4: %{name}-format.patch Patch5: %{name}-parens.patch # Unbundle gfanlib Patch6: %{name}-gfanlib.patch -# Fix code that violates the strict aliasing rules -Patch7: %{name}-alias.patch # Let ESingular read a compressed singular.info file -Patch8: %{name}-emacs.patch +Patch7: %{name}-emacs.patch # Fix a sequence point error -Patch9: %{name}-sequence-point.patch +# https://github.com/Singular/Singular/pull/1200 +Patch8: %{name}-sequence-point.patch # Avoid an unnecessary array comparison -Patch10: %{name}-array-compare.patch +Patch9: %{name}-array-compare.patch # Fix several "use after free" scenarios due to temporary objects -Patch11: %{name}-use-after-free.patch +# https://github.com/Singular/Singular/pull/1201 +Patch10: %{name}-use-after-free.patch # Fix mismatched type declarations -Patch12: %{name}-type-mismatch.patch +Patch11: %{name}-type-mismatch.patch # Change little-endian-specific code to endian-agnostic code -Patch13: %{name}-endian.patch +Patch12: %{name}-endian.patch # Disable examples that use the network to avoid hangs on the koji builders -Patch14: %{name}-doc-hang.patch -Patch15: Singular-c99.patch +Patch13: %{name}-doc-hang.patch +# Fix an off-by-one error in polymake.lib that leads to failed examples +Patch14: %{name}-polymake-lib.patch %description Singular is a computer algebra system for polynomial computations, with @@ -219,6 +237,9 @@ sed -ri 's/(lboost_python)-\$\{PYTHON_VERSION\}/\1%{python2_version_nodots}/' \ # Do not force the use of c++11, since the polymake code requires c++14 sed -i 's/-std=c++11//' m4/ntl-check.m4 +# Do not add an rpath for ccluster +sed -i 's@ -Wl,-rpath,\${CCLUSTER_HOME}/lib@@' m4/ccluster-check.m4 + # Regenerate configure due to patches 0, 1, and 6 autoreconf -fi @@ -227,7 +248,7 @@ sed -i '/countedref\.cc/s/\$(CXXFLAGS)/& -fno-strict-aliasing/g' Singular/Makefi %build -export CPPFLAGS='-I%{_includedir}/flint -I%{_includedir}/gfanlib' +export CPPFLAGS='-I%{_includedir}/arb -I%{_includedir}/flint -I%{_includedir}/gfanlib' %if %{with python} pyincdir=$(python2 -Esc "import sysconfig; print(sysconfig.get_paths()['include'])") CPPFLAGS="$CPPFLAGS -I$pyincdir" @@ -248,16 +269,13 @@ module load lrcalc-%{_arch} --enable-bigintm-module \ --enable-gfanlib-module \ --enable-Order-module \ -%if %{with polymake} --enable-polymake-module \ -%else - --disable-polymake-module \ -%endif %if %{with python} --enable-python-module \ %else --disable-python-module \ %endif + --enable-sispasm-module \ --enable-streamio \ --with-gmp \ --with-ntl \ @@ -269,14 +287,13 @@ module load lrcalc-%{_arch} --without-python \ %endif --with-readline \ - --enable-doc \ +%if %{with docs} + --enable-doc-build \ +%endif --with-malloc=system %make_build %make_build -C dox html -%make_build -C Singular libparse -make -C doc -j1 -f Makefile-docbuild singular.idx -make -C doc -j1 all-local %install @@ -314,9 +331,11 @@ mkdir -p %{buildroot}%{_mandir}/man1 for cmd in ESingular Singular TSingular; do cp -p Singular/$cmd.man %{buildroot}%{_mandir}/man1/$cmd.1 done +%if %{with docs} cp -a doc/{html,singular.idx} %{buildroot}%{_datadir}/singular mkdir -p %{buildroot}%{_infodir} cp -p doc/singular.info %{buildroot}%{_infodir} +%endif # remove script that calls surf; we don't ship it rm -f %{buildroot}%{singulardir}/singularsurf @@ -368,7 +387,6 @@ make check %doc README.md %{_bindir}/Singular %{_bindir}/TSingular -%{_infodir}/singular.info* %{_mandir}/man1/Singular.1* %{_mandir}/man1/TSingular.1* %{_datadir}/applications/Singular.desktop @@ -376,8 +394,12 @@ make check %{_datadir}/ml_python/ %{_datadir}/ml_singular/ %{_datadir}/singular/singular.idx +%{_infodir}/singular.info* +%if %{with docs} %docdir %{_datadir}/singular/html/ %{_datadir}/singular/html/ +%{singulardir}/libparse +%endif %dir %{singulardir} %{singulardir}/Singular %{singulardir}/TSingular @@ -458,6 +480,13 @@ make check %changelog +* Thu Feb 1 2024 Jerry James <loganjerry(a)gmail.com> - 4.3.2p8-1 +- Version 4.3.2p8 +- Drop upstreamed -alias and -c99 patches +- Stop building for 32-bit x86 +- Build with ccluster and spasm support +- Build docs only on x86_64 and ppc64le architectures + * Mon Jan 22 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.3.1p1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 16b536e..61cc71a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (singular-4.3.1p1.tar.gz) = d27d8e042ea085e49aed6a0697056c36e78e62ea0b9d17751cdf4c556cf4f6efce3b34b411c77aef97c6d90675bea11c97651eb7009634cb8a9b630ec820a06e +SHA512 (singular-4.3.2p8.tar.gz) = e848110323d2b00d739a6feafef4514fffa14e2905be7a3c9419f33e47234207b1cef8c97b382ce72fc26e06b1407eca0d365a6241d1747a2a5d06e1a69a23af

1 0

Architecture specific change in rpms/coin-or-Dip.git
by githook-noreply＠fedoraproject.org 26 Feb '24

26 Feb '24

The package rpms/coin-or-Dip.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/coin-or-Dip.git/commit/?id=f64b512e…. Change: +ExcludeArch: %{ix86} Thanks. Full change: ============ commit f64b512e4f92bf75d234169bbd4f99b0244d5346 Author: Jerry James <loganjerry(a)gmail.com> Date: Wed Jan 31 20:46:49 2024 -0700 Build with asl instead of mp - Verify that License is valid SPDX - Stop building for 32-bit x86 diff --git a/coin-or-Dip.spec b/coin-or-Dip.spec index 6aa0a80..29bf737 100644 --- a/coin-or-Dip.spec +++ b/coin-or-Dip.spec @@ -10,10 +10,14 @@ Name: coin-or-%{module} Summary: Decomposition for Integer Programming Version: 0.95.0 -Release: 12%{?dist} +Release: 13%{?dist} License: EPL-1.0 URL: https://github.com/coin-or/%{module}/wiki Source0: https://github.com/coin-or/%{module}/archive/releases/%{version}/%{module}-… + +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: coin-or-Alps-doc BuildRequires: coin-or-Cbc-doc %if %{with_mpi} @@ -25,7 +29,7 @@ BuildRequires: doxygen-latex BuildRequires: gcc-c++ BuildRequires: make %if %{with_asl} -BuildRequires: mp-devel +BuildRequires: asl-devel %endif %if %{with_mpi} BuildRequires: pkgconfig(ompi) @@ -49,7 +53,9 @@ Patch1: %{name}-svnversion.patch # Fix a BibTeX commenting issue in the guide Patch2: %{name}-bib.patch -Patch3: coin-or-Dip-configure-c99.patch + +# Fix Modern C issues in the configure script +Patch3: %{name}-configure-c99.patch %description DIP (Decomposition for Integer Programming) is an open-source extensible @@ -104,7 +110,7 @@ sed -i 's/ @DIPLIB_PCLIBS@/\nLibs.private:&/' Dip/dip.pc.in %endif %configure --enable-openmp \ %if %{with_asl} - --with-asl-lib="-lasl -lmp -lipoptamplinterface -lbonminampl" \ + --with-asl-lib="-lasl -lipoptamplinterface -lbonminampl" \ --with-asl-incdir="%{_includedir}/asl" %endif @@ -158,6 +164,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{_pkgdocdir}/dippy.pdf %changelog +* Wed Jan 31 2024 Jerry James <loganjerry(a)gmail.com> - 0.95.0-13 +- Build with asl instead of mp +- Verify that License is valid SPDX +- Stop building for 32-bit x86 + * Wed Jan 24 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.95.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild @@ -179,7 +190,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test * Wed Jan 19 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.95.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Tue Sep 21 2021 Antonio Trande <sagitter(a)fedoraproject.org - 0.95.0-5 +* Tue Sep 21 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 0.95.0-5 - Rebuilt for Ipopt-3.14.4 * Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.95.0-4

1 0

Architecture specific change in rpms/coin-or-Couenne.git
by githook-noreply＠fedoraproject.org 26 Feb '24

26 Feb '24

The package rpms/coin-or-Couenne.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/coin-or-Couenne.git/commit/?id=2810…. Change: +ExcludeArch: %{ix86} Thanks. Full change: ============ commit 281029b1ea4f927a4b1123f7f0aafcba86f89b80 Author: Jerry James <loganjerry(a)gmail.com> Date: Wed Jan 31 20:38:50 2024 -0700 Build with asl instead of mp - Verify that License is valid SPDX - BR asl-devel instead of mp-devel - Stop building for 32-bit x86 diff --git a/coin-or-Couenne.spec b/coin-or-Couenne.spec index a3a905e..72d166f 100644 --- a/coin-or-Couenne.spec +++ b/coin-or-Couenne.spec @@ -6,10 +6,14 @@ Name: coin-or-%{module} Summary: An exact solver for nonconvex MINLPs Version: 0.5.8 -Release: 14%{?dist} +Release: 15%{?dist} License: EPL-1.0 URL: https://projects.coin-or.org/%{module} Source0: http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz + +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: coin-or-Bonmin-doc BuildRequires: coin-or-Cbc-doc BuildRequires: doxygen @@ -21,7 +25,7 @@ BuildRequires: make BuildRequires: pkgconfig(bonmin) BuildRequires: pkgconfig(nauty) %if %{with_asl} -BuildRequires: mp-devel +BuildRequires: asl-devel %endif %if %{with_mpi} BuildRequires: openmpi-devel @@ -36,9 +40,10 @@ Patch0: %{name}-docdir.patch Patch1: %{name}-signed.patch # Fix comparison operator signature -Patch2: %{name}-gcc11.patch +Patch2: %{name}-gcc11.patch -Patch3: coin-or-Couenne-configure-c99.patch +# Avoid implicit function declarations in the configure script +Patch3: %{name}-configure-c99.patch %description Couenne (Convex Over and Under ENvelopes for Nonlinear Estimation) is a @@ -95,7 +100,7 @@ sed -i 's/ @COUENNELIB_PCLIBS@/\nLibs.private:&/' couenne.pc.in %configure \ %if %{with_asl} --with-asl-incdir="%{_includedir}/asl" \ - --with-asl-lib="-lasl -lmp -lipoptamplinterface -lbonminampl" \ + --with-asl-lib="-lasl -lipoptamplinterface -lbonminampl" \ %endif --with-nauty-incdir="%{_includedir}/nauty" \ --with-nauty-lib="-lnauty" @@ -151,6 +156,12 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make test %{_pkgdocdir}/couenne_doxy.tag %changelog +* Wed Jan 31 2024 Jerry James <loganjerry(a)gmail.com> - 0.5.8-15 +- Build with asl instead of mp +- Verify that License is valid SPDX +- BR asl-devel instead of mp-devel +- Stop building for 32-bit x86 + * Wed Jan 24 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.8-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild @@ -172,7 +183,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make test * Wed Jan 19 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Tue Sep 21 2021 Antonio Trande <sagitter(a)fedoraproject.org - 0.5.8-7 +* Tue Sep 21 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 0.5.8-7 - Rebuilt for Ipopt-3.14.4 * Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.5.8-6

1 0

Architecture specific change in rpms/coin-or-Bcps.git
by githook-noreply＠fedoraproject.org 26 Feb '24

26 Feb '24

The package rpms/coin-or-Bcps.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/coin-or-Bcps.git/commit/?id=9090b03…. Change: +ExcludeArch: %{ix86} Thanks. Full change: ============ commit 9090b034c130b4bced8b490bb883c45cdd36e419 Author: Jerry James <loganjerry(a)gmail.com> Date: Wed Jan 31 17:06:12 2024 -0700 Version 0.95.1 - Verify that License is valid SPDX - Drop all patches - Stop building for 32-bit x86 diff --git a/coin-or-Bcps-configure-c99.patch b/coin-or-Bcps-configure-c99.patch deleted file mode 100644 index 4315abe..0000000 --- a/coin-or-Bcps-configure-c99.patch +++ /dev/null @@ -1,47 +0,0 @@ -Port configure scripts to C99 by eliminating implicit declarations -of the exit function. - -This has already been fixed upstream: - -commit a28ade7597645136fbfe6b8baa50002bbae947ea -Author: Ted Ralphs <ted(a)lehigh.edu> -Date: Wed Jul 7 12:54:53 2021 -0400 - - Removing old files that are no longer needed - -commit 8fb265bc9331b11486479441794bfb989b2760ba -Author: Ted Ralphs <ted(a)lehigh.edu> -Date: Wed Jul 7 12:38:40 2021 -0400 - - Moving to new autotools - -diff --git a/Bcps/configure b/Bcps/configure -index 94ead1d1201863f8..ebd9f9756ae0a2e9 100755 ---- a/Bcps/configure -+++ b/Bcps/configure -@@ -6391,8 +6391,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/configure b/configure -index 480cc15fcf407a78..84f58ce0eaa65c7f 100755 ---- a/configure -+++ b/configure -@@ -6961,8 +6961,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-Bcps-docdir.patch b/coin-or-Bcps-docdir.patch deleted file mode 100644 index aa0bc32..0000000 --- a/coin-or-Bcps-docdir.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up CHiPPS-BiCePS-releases-0.94.5/Bcps/configure.orig CHiPPS-BiCePS-releases-0.94.5/Bcps/configure ---- CHiPPS-BiCePS-releases-0.94.5/Bcps/configure.orig 2019-02-25 10:57:15.000000000 -0700 -+++ CHiPPS-BiCePS-releases-0.94.5/Bcps/configure 2019-06-22 15:44:23.856112272 -0600 -@@ -21972,7 +21972,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-BiCePS-releases-0.94.5/Bcps/Makefile.in.orig CHiPPS-BiCePS-releases-0.94.5/Bcps/Makefile.in ---- CHiPPS-BiCePS-releases-0.94.5/Bcps/Makefile.in.orig 2019-02-25 10:57:15.000000000 -0700 -+++ CHiPPS-BiCePS-releases-0.94.5/Bcps/Makefile.in 2019-06-22 15:44:04.467146602 -0600 -@@ -405,7 +405,7 @@ EXTRA_DIST = examples/Blis/BlisBranchObj - ######################################################################## - pkgconfiglibdir = $(libdir)/pkgconfig - pkgconfiglib_DATA = bcps.pc --addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Bcps -+addlibsdir = $(DESTDIR)$(datadir)/doc/coin-or-Bcps - - ######################################################################## - # Maintainer Stuff # -@@ -414,7 +414,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-BiCePS-releases-0.94.5/Makefile.in.orig CHiPPS-BiCePS-releases-0.94.5/Makefile.in ---- CHiPPS-BiCePS-releases-0.94.5/Makefile.in.orig 2019-02-25 10:57:15.000000000 -0700 -+++ CHiPPS-BiCePS-releases-0.94.5/Makefile.in 2019-06-22 15:43:05.937250241 -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-Bcps.spec b/coin-or-Bcps.spec index c4d5bff..7d9e550 100644 --- a/coin-or-Bcps.spec +++ b/coin-or-Bcps.spec @@ -2,11 +2,15 @@ Name: coin-or-%{module} Summary: Part of the COIN High Performance Parallel Search Framework -Version: 0.94.5 -Release: 13%{?dist} +Version: 0.95.1 +Release: 1%{?dist} License: EPL-1.0 URL: https://github.com/coin-or/CHiPPS-BiCePS Source0: https://github.com/coin-or/CHiPPS-BiCePS/archive/releases/%{version}/CHiPPS… + +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: coin-or-Alps-devel BuildRequires: coin-or-Alps-doc BuildRequires: coin-or-Cgl-devel @@ -15,10 +19,6 @@ BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: make -# Install documentation in standard rpm directory -Patch0: %{name}-docdir.patch -Patch1: coin-or-Bcps-configure-c99.patch - %description BiCePS is one of the libraries that make up the CHiPPS (COIN High Performance Parallel Search Framework) library hierarchy. It implements the data-handling @@ -64,37 +64,42 @@ sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ -i libtool %make_build all -%make_build -C Bcps doxydoc +doxygen doxydoc/doxygen.conf %install %make_install rm -f %{buildroot}%{_libdir}/*.la -rm -f %{buildroot}%{_docdir}/%{name}/{LICENSE,bcps_addlibs.txt} -cp -a Bcps/doxydoc/{html,*.tag} %{buildroot}%{_docdir}/%{name} +rm %{buildroot}%{_datadir}/doc/coin-or-bcps/LICENSE +cp -a doxydoc/html bcps_doxy.tag %{buildroot}%{_datadir}/doc/coin-or-bcps %check -LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test - -%ldconfig_scriptlets +make test %files %license LICENSE -%dir %{_docdir}/%{name} -%{_docdir}/%{name}/AUTHORS -%{_docdir}/%{name}/README -%{_libdir}/libBcps.so.0 -%{_libdir}/libBcps.so.0.* +%dir %{_datadir}/doc/coin-or-bcps/ +%{_datadir}/doc/coin-or-bcps/AUTHORS +%{_datadir}/doc/coin-or-bcps/README +%{_datadir}/doc/coin-or-bcps/README.md +%{_libdir}/libBcps.so.1 +%{_libdir}/libBcps.so.1.* %files devel -%{_includedir}/coin/* +%{_includedir}/coin-or/ %{_libdir}/libBcps.so %{_libdir}/pkgconfig/bcps.pc %files doc -%{_docdir}/%{name}/html -%{_docdir}/%{name}/bcps_doxy.tag +%{_datadir}/doc/coin-or-bcps/html/ +%{_datadir}/doc/coin-or-bcps/bcps_doxy.tag %changelog +* Wed Jan 31 2024 Jerry James <loganjerry(a)gmail.com> - 0.95.1-1 +- Version 0.95.1 +- Verify that License is valid SPDX +- Drop all patches +- Stop building for 32-bit x86 + * Wed Jan 24 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.94.5-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 05e221a..d08e761 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (CHiPPS-Bcps-0.94.5.tar.gz) = b53a2ad62a832d4beb0ce2b5c7fd0e81eeb01b9039c0b78ce849adb94b44ad2300aad0f6357ecbcf41f5a5bb427508bde931667dfe40eaa83de50e3d696e3211 +SHA512 (CHiPPS-Bcps-0.95.1.tar.gz) = 93c2512f599b56aca10dbdd51fd0d7dcb2b994974e362173e844fc23a45a4b5440efdd23dde709b1c6daa98752556e3e3c4019d46a99176804b540170d30cfe6

1 0

Architecture specific change in rpms/coin-or-SYMPHONY.git
by githook-noreply＠fedoraproject.org 26 Feb '24

26 Feb '24

The package rpms/coin-or-SYMPHONY.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/coin-or-SYMPHONY.git/commit/?id=369…. Change: +ExcludeArch: %{ix86} Thanks. Full change: ============ commit 3690f1ee792f5ec92b63b25e5a82ac001f3985b6 Author: Jerry James <loganjerry(a)gmail.com> Date: Wed Jan 31 16:00:47 2024 -0700 Version 5.7.1 - Get source tarball from github - Convert License to SPDX - Stop building for 32-bit x86 diff --git a/.gitignore b/.gitignore index c79307b..9ed9bae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /SYMPHONY-*.tgz +/SYMPHONY-*.tar.gz /SYMPHONY-*-Manual.pdf diff --git a/coin-or-SYMPHONY-configure-c99.patch b/coin-or-SYMPHONY-configure-c99.patch index 58de645..29958f5 100644 --- a/coin-or-SYMPHONY-configure-c99.patch +++ b/coin-or-SYMPHONY-configure-c99.patch @@ -2,11 +2,10 @@ Fix historic C99 compatiblity issue. Upgrading and re-running autoconf will address this as well, which is why it is not necessary to upstream this patch. -diff --git a/configure b/configure -index 66a0e072b1435f08..0b95494b2bd5e9ad 100755 ---- a/configure -+++ b/configure -@@ -2738,7 +2738,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +diff -up SYMPHONY-releases-5.7.1/configure.orig SYMPHONY-releases-5.7.1/configure +--- SYMPHONY-releases-5.7.1/configure.orig 2023-05-11 13:38:01.000000000 -0600 ++++ SYMPHONY-releases-5.7.1/configure 2023-10-27 15:37:18.224145048 -0600 +@@ -2566,7 +2566,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ @@ -15,7 +14,30 @@ index 66a0e072b1435f08..0b95494b2bd5e9ad 100755 '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 ();' \ -@@ -6447,8 +6447,8 @@ main () +@@ -6958,8 +6958,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 -up SYMPHONY-releases-5.7.1/SYMPHONY/configure.orig SYMPHONY-releases-5.7.1/SYMPHONY/configure +--- SYMPHONY-releases-5.7.1/SYMPHONY/configure.orig 2023-05-11 13:38:01.000000000 -0600 ++++ SYMPHONY-releases-5.7.1/SYMPHONY/configure 2023-10-27 15:37:18.227145007 -0600 +@@ -2745,7 +2745,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ +- '' \ ++ '#include <stdlib.h>' \ + '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 ();' \ +@@ -6452,8 +6452,8 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) diff --git a/coin-or-SYMPHONY-docdir.patch b/coin-or-SYMPHONY-docdir.patch index 09b7c7b..4ba4fb8 100644 --- a/coin-or-SYMPHONY-docdir.patch +++ b/coin-or-SYMPHONY-docdir.patch @@ -1,6 +1,19 @@ ---- SYMPHONY-5.6.14/Makefile.in.orig 2016-03-17 11:36:23.388764962 -0300 -+++ SYMPHONY-5.6.14/Makefile.in 2016-03-17 11:36:51.512766039 -0300 -@@ -506,7 +506,7 @@ EXTRA_DIST = $(am__append_2) +diff -up SYMPHONY-releases-5.7.1/Makefile.in.orig SYMPHONY-releases-5.7.1/Makefile.in +--- SYMPHONY-releases-5.7.1/Makefile.in.orig 2023-05-11 13:38:01.000000000 -0600 ++++ SYMPHONY-releases-5.7.1/Makefile.in 2023-10-27 15:33:53.175867290 -0600 +@@ -265,7 +265,7 @@ SUBDIRS = $(subdirs) + DISTCLEANFILES = coin_subdirs.txt $(am__append_2) \ + $(VPATH_DISTCLEANFILES) + DocFiles = README README.md AUTHORS AUTHORS.md LICENSE LICENSE.md +-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 SYMPHONY-releases-5.7.1/SYMPHONY/Makefile.in.orig SYMPHONY-releases-5.7.1/SYMPHONY/Makefile.in +--- SYMPHONY-releases-5.7.1/SYMPHONY/Makefile.in.orig 2023-05-11 13:38:01.000000000 -0600 ++++ SYMPHONY-releases-5.7.1/SYMPHONY/Makefile.in 2023-10-27 15:33:53.175867290 -0600 +@@ -518,7 +518,7 @@ EXTRA_DIST = $(am__append_2) ######################################################################## pkgconfiglibdir = $(libdir)/pkgconfig pkgconfiglib_DATA = symphony.pc symphony-app.pc osi-sym.pc @@ -9,13 +22,12 @@ ######################################################################## # Maintainer Stuff # -@@ -516,7 +516,7 @@ CLEANFILES = +@@ -528,7 +528,7 @@ CLEANFILES = # Files that are generated and should be cleaned with make distclean DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES) - DocFiles = README AUTHORS LICENSE + DocFiles = README README.md AUTHORS AUTHORS.md LICENSE LICENSE.md -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 SYMPHONY-5.6.14/Makefile.orig SYMPHONY-5.6.14/Makefile diff --git a/coin-or-SYMPHONY-restrict.patch b/coin-or-SYMPHONY-restrict.patch index 13c5d2c..e4eba69 100644 --- a/coin-or-SYMPHONY-restrict.patch +++ b/coin-or-SYMPHONY-restrict.patch @@ -1,6 +1,7 @@ ---- SYMPHONY-5.6.17/src/LP/lp_proccomm.c.orig 2019-02-23 21:51:19.000000000 -0700 -+++ SYMPHONY-5.6.17/src/LP/lp_proccomm.c 2019-06-22 13:30:05.638494993 -0600 -@@ -838,9 +838,9 @@ void send_node_desc(lp_prob *p, int node +diff -up SYMPHONY-releases-5.7.1/SYMPHONY/src/LP/lp_proccomm.c.orig SYMPHONY-releases-5.7.1/SYMPHONY/src/LP/lp_proccomm.c +--- SYMPHONY-releases-5.7.1/SYMPHONY/src/LP/lp_proccomm.c.orig 2023-05-11 13:38:01.000000000 -0600 ++++ SYMPHONY-releases-5.7.1/SYMPHONY/src/LP/lp_proccomm.c 2023-10-27 15:36:18.228950998 -0600 +@@ -862,9 +862,9 @@ void send_node_desc(lp_prob *p, int node PRINT_TIME2(p->tm, f); sprintf(reason, "%s %i", "branched", n->bc_index + 1); if (n->bc_index==0) { @@ -12,18 +13,19 @@ } char branch_dir='M'; -@@ -854,7 +854,7 @@ void send_node_desc(lp_prob *p, int node +@@ -878,7 +878,7 @@ void send_node_desc(lp_prob *p, int node branch_dir = 'R'; } } - sprintf(reason, "%s %c %f %f %i", reason, branch_dir, + sprintf(&reason[strlen(reason)], " %c %f %f %i", branch_dir, - lp_data->objval+p->mip->obj_offset, sum_inf, num_inf); + p->objval+p->mip->obj_offset, sum_inf, num_inf); fprintf(f, "%s\n", reason); FREE(reason); ---- SYMPHONY-5.6.17/src/TreeManager/tm_func.c.orig 2019-02-23 21:51:19.000000000 -0700 -+++ SYMPHONY-5.6.17/src/TreeManager/tm_func.c 2019-06-22 13:26:47.070933884 -0600 -@@ -1468,9 +1468,9 @@ int generate_children(tm_prob *tm, bc_no +diff -up SYMPHONY-releases-5.7.1/SYMPHONY/src/TreeManager/tm_func.c.orig SYMPHONY-releases-5.7.1/SYMPHONY/src/TreeManager/tm_func.c +--- SYMPHONY-releases-5.7.1/SYMPHONY/src/TreeManager/tm_func.c.orig 2023-05-11 13:38:01.000000000 -0600 ++++ SYMPHONY-releases-5.7.1/SYMPHONY/src/TreeManager/tm_func.c 2023-10-27 15:35:18.208754585 -0600 +@@ -1470,9 +1470,9 @@ int generate_children(tm_prob *tm, bc_no } if (action[i] == PRUNE_THIS_CHILD_FATHOMABLE || action[i] == PRUNE_THIS_CHILD_INFEASIBLE){ @@ -35,7 +37,7 @@ child->lower_bound); } fprintf(f,"%s\n",reason); -@@ -1825,10 +1825,9 @@ char shall_we_dive(tm_prob *tm, double o +@@ -1839,10 +1839,9 @@ char shall_we_dive(tm_prob *tm, double o if (tm->par.vbc_emulation == VBC_EMULATION_FILE_NEW) { switch (category) { case VBC_PRUNED_INFEASIBLE: @@ -48,7 +50,7 @@ if (node->parent->children[0]==node) { branch_dir = node->parent->bobj.sense[0]; /*branch_dir = 'L';*/ -@@ -1843,13 +1842,12 @@ char shall_we_dive(tm_prob *tm, double o +@@ -1857,13 +1856,12 @@ char shall_we_dive(tm_prob *tm, double o sprintf(reason," 0"); } @@ -65,7 +67,7 @@ if (node->parent->children[0]==node) { branch_dir = node->parent->bobj.sense[0]; /*branch_dir = 'L';*/ -@@ -1863,7 +1861,7 @@ char shall_we_dive(tm_prob *tm, double o +@@ -1877,7 +1875,7 @@ char shall_we_dive(tm_prob *tm, double o }else{ sprintf(reason," 0"); } @@ -74,9 +76,10 @@ break; case VBC_FEAS_SOL_FOUND: /* This case has already been dealt in install_new_ub(), hence ---- SYMPHONY-5.6.17/src/TreeManager/tm_proccomm.c.orig 2019-02-23 21:51:19.000000000 -0700 -+++ SYMPHONY-5.6.17/src/TreeManager/tm_proccomm.c 2019-06-22 13:28:55.189650693 -0600 -@@ -816,9 +816,9 @@ void receive_node_desc(tm_prob *tm, bc_n +diff -up SYMPHONY-releases-5.7.1/SYMPHONY/src/TreeManager/tm_proccomm.c.orig SYMPHONY-releases-5.7.1/SYMPHONY/src/TreeManager/tm_proccomm.c +--- SYMPHONY-releases-5.7.1/SYMPHONY/src/TreeManager/tm_proccomm.c.orig 2023-05-11 13:38:01.000000000 -0600 ++++ SYMPHONY-releases-5.7.1/SYMPHONY/src/TreeManager/tm_proccomm.c 2023-10-27 15:35:18.208754585 -0600 +@@ -832,9 +832,9 @@ void receive_node_desc(tm_prob *tm, bc_n PRINT_TIME2(tm, f); sprintf(reason, "%s %i", "branched", n->bc_index + 1); if (n->bc_index==0) { @@ -88,7 +91,7 @@ } char branch_dir='M'; -@@ -829,7 +829,7 @@ void receive_node_desc(tm_prob *tm, bc_n +@@ -845,7 +845,7 @@ void receive_node_desc(tm_prob *tm, bc_n branch_dir = 'R'; } } diff --git a/coin-or-SYMPHONY.spec b/coin-or-SYMPHONY.spec index 4bb0028..e152044 100644 --- a/coin-or-SYMPHONY.spec +++ b/coin-or-SYMPHONY.spec @@ -2,11 +2,14 @@ Name: coin-or-%{module} Summary: Solver for mixed-integer linear programs -Version: 5.6.17 -Release: 13%{?dist} -License: EPL-1.0 +Version: 5.7.1 +Release: 1%{?dist} + +# The project as a whole is licensed EPL-2.0. However, many source files still +# claim to be licensed EPL-1.0. This is probably an upstream oversight. +License: EPL-2.0 AND EPL-1.0 URL: https://github.com/coin-or/%{module}/wiki -Source0: http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz +Source0: https://github.com/coin-or/%{module}/archive/releases/%{version}/%{module}-… # The PDF manual cannot be built from source, missing BibTeX file (as of 5.6.17) Source1: https://coin-or.github.io/%{module}/doc/%{module}-%{version}-Manual.pdf BuildRequires: coin-or-Cgl-devel @@ -19,6 +22,9 @@ BuildRequires: glpk-devel BuildRequires: make BuildRequires: readline-devel +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + # Install documentation in standard rpm directory Patch0: %{name}-docdir.patch @@ -62,7 +68,7 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup -p1 -n %{module}-%{version} +%autosetup -p1 -n %{module}-releases-%{version} %build %configure \ @@ -116,6 +122,12 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{_libdir}/pkgconfig/symphony.pc %changelog +* Wed Jan 31 2024 Jerry James <loganjerry(a)gmail.com> - 5.7.1-1 +- Version 5.7.1 +- Get source tarball from github +- Convert License to SPDX +- Stop building for 32-bit x86 + * Wed Jan 24 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.6.17-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 588c650..efa51d8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (SYMPHONY-5.6.17.tgz) = 5e97d9b52a19195a1a18e79c35a4796cc179da04cf88975978d822abac4c302cce89c0d2020ecc812189876db2455297c752cfa8d2b6e2a9e0cf7c0aa02adf99 -SHA512 (SYMPHONY-5.6.17-Manual.pdf) = 367a5c6166925d1a48914c46f31654f1b9d881b19a15533575d29e3b41897013df7a52743bd054edd1ef6ba8d516874aa05b7dac36d4120feffa7816ba8d08ce +SHA512 (SYMPHONY-5.7.1.tar.gz) = 3367ec0059dd55d5d581daf1ac6d3ce21eaa857bda334b749ee4534fbf6ed36d3f7bcc9484e70bb3ae2e13c6bf0b8bc193ffa606688a20b79fc7d42c69c9603d +SHA512 (SYMPHONY-5.7.1-Manual.pdf) = fdec123f5be62f7fbbf335105adc476defb66fc4272d6f5606bea410632191a764770ab48967cb7404182a90f99f60af433feacfb709a8dd7684489f44eaaac0

1 0

Architecture specific change in rpms/coin-or-FlopC++.git
by githook-noreply＠fedoraproject.org 26 Feb '24

26 Feb '24

The package rpms/coin-or-FlopC++.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/coin-or-FlopC++.git/commit/?id=2d2e…. Change: +ExcludeArch: %{ix86} Thanks. Full change: ============ commit 2d2ec2a1ce24c4662e4058db4ba7cbaf0dbec1a5 Author: Jerry James <loganjerry(a)gmail.com> Date: Wed Jan 31 15:53:49 2024 -0700 Stop building for 32-bit x86 - Verify the License field is valid SPDX - Correct the project URL diff --git a/coin-or-FlopC++.spec b/coin-or-FlopC++.spec index 9cf82b8..74db5cb 100644 --- a/coin-or-FlopC++.spec +++ b/coin-or-FlopC++.spec @@ -3,9 +3,9 @@ Name: coin-or-%{module} Summary: Algebraic modeling language Version: 1.2.5 -Release: 13%{?dist} +Release: 14%{?dist} License: EPL-1.0 -URL: https://projects.coin-or.org/%{module} +URL: https://projects.coin-or.org/FlopCpp Source0: http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz BuildRequires: coin-or-Cbc-devel BuildRequires: coin-or-Cbc-doc @@ -13,6 +13,9 @@ BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: make +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + # Install documentation in standard rpm directory Patch0: %{name}-docdir.patch @@ -99,6 +102,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{_docdir}/%{name}/flopcpp_doxy.tag %changelog +* Wed Jan 31 2024 Jerry James <loganjerry(a)gmail.com> - 1.2.5-14 +- Stop building for 32-bit x86 +- Verify the License field is valid SPDX +- Correct the project URL + * Wed Jan 24 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.5-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

1 0

Architecture specific change in rpms/coin-or-CoinMP.git
by githook-noreply＠fedoraproject.org 26 Feb '24

26 Feb '24

The package rpms/coin-or-CoinMP.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/coin-or-CoinMP.git/commit/?id=a5eb9…. Change: +ExcludeArch: %{ix86} Thanks. Full change: ============ commit a5eb94aab82c2eac5e2c5b9a1a652f33f833627f Author: Jerry James <loganjerry(a)gmail.com> Date: Wed Jan 31 15:48:25 2024 -0700 Stop building for 32-bit x86 - Convert License tag to SPDX - Build with NDEBUG diff --git a/coin-or-CoinMP.spec b/coin-or-CoinMP.spec index 9d023e7..c7fcc34 100644 --- a/coin-or-CoinMP.spec +++ b/coin-or-CoinMP.spec @@ -3,18 +3,23 @@ Name: coin-or-%{module} Summary: C-API interface to CLP, CBC and CGL Version: 1.8.4 -Release: 13%{?dist} -License: CPL -URL: http://projects.coin-or.org/%{module} +Release: 14%{?dist} +License: CPL-1.0 +URL: https://projects.coin-or.org/%{module} Source0: http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz BuildRequires: coin-or-Cbc-devel BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: make +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + # Install documentation in standard rpm directory Patch0: %{name}-docdir.patch -Patch1: coin-or-CoinMP-configure-c99.patch + +# Fix Modern C issues in the configure script +Patch1: %{name}-configure-c99.patch %description CoinMP is a C-API library that supports most of the functionality of CLP @@ -39,6 +44,7 @@ for file in README AUTHORS examples/example.c LICENSE; do done %build +export CPPFLAGS='-DNDEBUG' %configure # Get rid of undesirable hardcoded rpaths; workaround libtool reordering @@ -76,6 +82,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{_libdir}/pkgconfig/coinmp.pc %changelog +* Wed Jan 31 2024 Jerry James <loganjerry(a)gmail.com> - 1.8.4-14 +- Stop building for 32-bit x86 +- Convert License tag to SPDX +- Build with NDEBUG + * Wed Jan 24 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.8.4-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

1 0

Architecture specific change in rpms/coin-or-Bonmin.git
by githook-noreply＠fedoraproject.org 26 Feb '24

26 Feb '24

The package rpms/coin-or-Bonmin.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/coin-or-Bonmin.git/commit/?id=dfc95…. Change: +ExcludeArch: %{ix86} Thanks. Full change: ============ commit dfc950606f3b4e4e801b2abc22f1a95980571c2a Author: Jerry James <loganjerry(a)gmail.com> Date: Wed Jan 31 15:23:51 2024 -0700 Release 1.8.9 - Convert License to SPDX - Drop upstreamed patches: -typo, -clear, -bool, -assertions, -fix_iFP_Ecp - BR asl-devel instead of mp-devel - Stop building for 32-bit x86 diff --git a/.gitignore b/.gitignore index 2d0a972..9d15ab7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /Bonmin-*.tgz +/Bonmin-*.tar.gz diff --git a/coin-or-Bonmin-assertions.patch b/coin-or-Bonmin-assertions.patch deleted file mode 100644 index 2944eb5..0000000 --- a/coin-or-Bonmin-assertions.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/coin-or/Bonmin/commit/bce858f7874e1d2d9e57cc96ab8b8185e85a9651 - ---- a/src/Interfaces/BonTypes.hpp 2010-04-29 02:58:54.000000000 -0600 -+++ b/src/Interfaces/BonTypes.hpp 2021-07-20 11:28:06.733907309 -0600 -@@ -29,18 +29,11 @@ public: - - /** Access pointer to first element of storage.*/ - inline T* operator()(){ --#if defined(_MSC_VER) -- if (std::vector<T>::size() == 0) -- return NULL; --#endif --return &std::vector<T>::front();} -+ return &(*std::vector<T>::begin()); -+} - /** Access pointer to first element of storage.*/ - inline const T* operator()() const { --#if defined(_MSC_VER) -- if (std::vector<T>::size() == 0) -- return NULL; --#endif --return &std::vector<T>::front(); -+ return &(*std::vector<T>::begin()); - } - }; - diff --git a/coin-or-Bonmin-bool.patch b/coin-or-Bonmin-bool.patch deleted file mode 100644 index f476e05..0000000 --- a/coin-or-Bonmin-bool.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://github.com/coin-or/Bonmin/commit/fe6f493c1ac45373db1a6a29138d70c85a310a08 - ---- a/src/Algorithms/QuadCuts/BonQuadRow.cpp 2021-07-20 11:22:40.885361344 -0600 -+++ b/src/Algorithms/QuadCuts/BonQuadRow.cpp 2021-07-20 11:24:48.038574325 -0600 -@@ -263,7 +263,7 @@ QuadRow::add_to_hessian(AdjustableMat &H - assert(Q_hessian_idx_.empty()); - for(int i = 0 ; i < Q_.nnz_ ; i++){ - std::pair<int, int> e; -- e = std::make_pair(Q_.jCol_[i] + offset, Q_.iRow_[i] + offset); -+ e = std::make_pair(Q_.jCol_[i] + (offset ? 1 : 0), Q_.iRow_[i] + (offset ? 1 : 0)); - AdjustableMat::iterator pos = H.find(e); - if(pos != H.end()){//Already exists - if(pos->second.second != -1) diff --git a/coin-or-Bonmin-bug24.patch b/coin-or-Bonmin-bug24.patch index e644fe1..f40b8b6 100644 --- a/coin-or-Bonmin-bug24.patch +++ b/coin-or-Bonmin-bug24.patch @@ -10,9 +10,9 @@ Subject: [PATCH] set honor_original_bounds=yes in Ipopt, if not set diff --git a/src/Interfaces/Ipopt/BonIpoptSolver.cpp b/src/Interfaces/Ipopt/BonIpoptSolver.cpp index 4003ba31..ff96ab76 100644 ---- a/src/Interfaces/Ipopt/BonIpoptSolver.cpp -+++ b/src/Interfaces/Ipopt/BonIpoptSolver.cpp -@@ -264,6 +264,7 @@ namespace Bonmin +--- a/Bonmin/src/Interfaces/Ipopt/BonIpoptSolver.cpp ++++ b/Bonmin/src/Interfaces/Ipopt/BonIpoptSolver.cpp +@@ -267,6 +267,7 @@ namespace Bonmin bool set = false; double dummy_dbl; int dummy_int; @@ -20,7 +20,7 @@ index 4003ba31..ff96ab76 100644 set = Options->GetNumericValue("gamma_phi", dummy_dbl, ""); if(!set) Options->SetNumericValue("gamma_phi", 1e-8, true, true); -@@ -282,6 +283,10 @@ namespace Bonmin +@@ -285,6 +286,10 @@ namespace Bonmin set = Options->GetEnumValue("mu_oracle",dummy_int, ""); if(!set) Options->SetStringValue("mu_oracle","probing", true, true); diff --git a/coin-or-Bonmin-clear.patch b/coin-or-Bonmin-clear.patch deleted file mode 100644 index 63652b5..0000000 --- a/coin-or-Bonmin-clear.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/coin-or/Bonmin/commit/3c51a306137f6f6f37825770987585b407919ff8 - ---- a/src/Algorithms/QuadCuts/BonQuadRow.cpp 2020-01-29 03:51:36.000000000 -0700 -+++ b/src/Algorithms/QuadCuts/BonQuadRow.cpp 2021-07-20 11:22:40.885361344 -0600 -@@ -89,8 +89,8 @@ QuadRow::operator=(const OsiRowCut &cut) - c_ = 0; - a_ = cut.row(); - Q_ = TMat(); -- g_.empty(); -- a_grad_idx_.empty(); -+ g_.clear(); -+ a_grad_idx_.clear(); - Q_row_grad_idx_.clear(); - Q_col_grad_idx_.clear(); - //Q_hessian_idx.empty(); diff --git a/coin-or-Bonmin-configure-c99.patch b/coin-or-Bonmin-configure-c99.patch index 04dc1b4..824de4c 100644 --- a/coin-or-Bonmin-configure-c99.patch +++ b/coin-or-Bonmin-configure-c99.patch @@ -9,7 +9,7 @@ diff --git a/configure b/configure index ce83f1ee469d2cad..d822b0f230d2ca23 100755 --- a/configure +++ b/configure -@@ -2683,7 +2683,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -2561,7 +2561,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ @@ -18,7 +18,29 @@ index ce83f1ee469d2cad..d822b0f230d2ca23 100755 '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 ();' \ -@@ -6384,8 +6384,8 @@ main () +@@ -6953,8 +6953,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 +--- a/Bonmin/configure ++++ b/Bonmin/configure +@@ -2689,7 +2689,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ +- '' \ ++ '#include <stdlib.h>' \ + '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 ();' \ +@@ -6390,8 +6390,8 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) diff --git a/coin-or-Bonmin-docdir.patch b/coin-or-Bonmin-docdir.patch index fa5581c..f801cce 100644 --- a/coin-or-Bonmin-docdir.patch +++ b/coin-or-Bonmin-docdir.patch @@ -1,7 +1,7 @@ -diff -up Bonmin-1.8.8/configure.orig Bonmin-1.8.8/configure ---- Bonmin-1.8.8/configure.orig 2020-01-31 05:22:34.000000000 -0700 -+++ Bonmin-1.8.8/configure 2020-02-21 09:50:40.462332764 -0700 -@@ -24897,7 +24897,7 @@ echo "${ECHO_T}$doxysrcdir (src)" >&6 +diff -up Bonmin-releases-1.8.9/Bonmin/configure.orig Bonmin-releases-1.8.9/Bonmin/configure +--- Bonmin-releases-1.8.9/Bonmin/configure.orig 2023-01-30 07:45:31.000000000 -0700 ++++ Bonmin-releases-1.8.9/Bonmin/configure 2023-02-10 16:47:15.707663831 -0700 +@@ -24906,7 +24906,7 @@ echo "${ECHO_T}$doxysrcdir (src)" >&6 fi # Not built, fall back to installed tag file if test $doxyfound = no ; then @@ -10,13 +10,25 @@ diff -up Bonmin-1.8.8/configure.orig Bonmin-1.8.8/configure # AC_MSG_NOTICE([Considering $doxydir (install)]) # AC_MSG_NOTICE([Subdirs: $coin_subdirs)]) coin_doxy_tagfiles="$coin_doxy_tagfiles $doxydir/$doxytag=$doxydir/html" -diff -up Bonmin-1.8.8/Makefile.in.orig Bonmin-1.8.8/Makefile.in ---- Bonmin-1.8.8/Makefile.in.orig 2020-01-31 05:22:34.000000000 -0700 -+++ Bonmin-1.8.8/Makefile.in 2020-02-21 09:50:40.498332159 -0700 +diff -up Bonmin-releases-1.8.9/Bonmin/Makefile.in.orig Bonmin-releases-1.8.9/Bonmin/Makefile.in +--- Bonmin-releases-1.8.9/Bonmin/Makefile.in.orig 2023-01-30 07:45:31.000000000 -0700 ++++ Bonmin-releases-1.8.9/Bonmin/Makefile.in 2023-02-10 16:47:55.943574480 -0700 @@ -376,7 +376,7 @@ DISTCLEANFILES = Test/*.$(OBJEXT) Test/u Test/CppExample/CppExample$(EXEEXT) Test/testtoy.nl \ $(am__append_4) $(VPATH_DISTCLEANFILES) - DocFiles = README AUTHORS LICENSE + DocFiles = README README.md AUTHORS AUTHORS.md LICENSE LICENSE.md +-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 Bonmin-releases-1.8.9/Makefile.in.orig Bonmin-releases-1.8.9/Makefile.in +--- Bonmin-releases-1.8.9/Makefile.in.orig 2023-02-10 16:45:58.085765373 -0700 ++++ Bonmin-releases-1.8.9/Makefile.in 2023-02-10 16:47:31.031248959 -0700 +@@ -251,7 +251,7 @@ SUBDIRS = $(subdirs) + DISTCLEANFILES = coin_subdirs.txt $(am__append_2) \ + $(VPATH_DISTCLEANFILES) + DocFiles = README README.md AUTHORS AUTHORS.md LICENSE LICENSE.md -DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME) +DocInstallDir = $(datadir)/doc/coin-or-$(PACKAGE_NAME) COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE diff --git a/coin-or-Bonmin-fix_iFP_Ecp.patch b/coin-or-Bonmin-fix_iFP_Ecp.patch deleted file mode 100644 index 2d363d8..0000000 --- a/coin-or-Bonmin-fix_iFP_Ecp.patch +++ /dev/null @@ -1,64 +0,0 @@ -From d2120d07740f18e94f410e0618009f7c82dfcecd Mon Sep 17 00:00:00 2001 -From: Stefan Vigerske <svigerske(a)gams.com> -Date: Thu, 26 Jan 2023 13:19:04 +0100 -Subject: [PATCH] fix signature of EcpCuts::generateCuts() - -- remove const, so it properly overwrites generateCuts() of super class -- fixes #31 ---- - src/Algorithms/OaGenerators/BonEcpCuts.cpp | 2 +- - src/Algorithms/OaGenerators/BonEcpCuts.hpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Algorithms/OaGenerators/BonEcpCuts.cpp b/src/Algorithms/OaGenerators/BonEcpCuts.cpp -index c6b0b4332..9cc4ed586 100644 ---- a/src/Algorithms/OaGenerators/BonEcpCuts.cpp -+++ b/src/Algorithms/OaGenerators/BonEcpCuts.cpp -@@ -45,7 +45,7 @@ namespace Bonmin - void - EcpCuts::generateCuts(const OsiSolverInterface &si, - OsiCuts & cs, -- const CglTreeInfo info) const -+ const CglTreeInfo info) - { - if (beta_ >=0) { - BabInfo * babInfo = dynamic_cast<BabInfo *> (si.getAuxiliaryInfo()); -diff --git a/src/Algorithms/OaGenerators/BonEcpCuts.hpp b/src/Algorithms/OaGenerators/BonEcpCuts.hpp -index baf0a519b..4179597ef 100644 ---- a/src/Algorithms/OaGenerators/BonEcpCuts.hpp -+++ b/src/Algorithms/OaGenerators/BonEcpCuts.hpp -@@ -40,7 +40,7 @@ namespace Bonmin - {} - /** Standard cut generation methods. */ - virtual void generateCuts(const OsiSolverInterface &si, OsiCuts & cs, -- const CglTreeInfo info = CglTreeInfo()) const; -+ const CglTreeInfo info = CglTreeInfo()); - double doEcpRounds(OsiSolverInterface &si, - bool leaveSiUnchanged, - double* violation = NULL); -From 09d94590fbf85c6beef58c3373b9f48b0b951b82 Mon Sep 17 00:00:00 2001 -From: Pierre Bonami <bonami(a)gurobi.com> -Date: Mon, 30 Jan 2023 06:06:44 +0100 -Subject: [PATCH] Obviously wrong cutoff update (#37) - -Maybe for #36 ---- - src/Algorithms/OaGenerators/BonFpForMinlp.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/Algorithms/OaGenerators/BonFpForMinlp.cpp b/src/Algorithms/OaGenerators/BonFpForMinlp.cpp -index 2345759d..cab337f6 100644 ---- a/src/Algorithms/OaGenerators/BonFpForMinlp.cpp -+++ b/src/Algorithms/OaGenerators/BonFpForMinlp.cpp -@@ -158,7 +158,10 @@ namespace Bonmin - //nlp is solved and feasible - // Update the cutoff - ub = std::min(ub, nlp_->getObjValue()); -- cutoff = ub * (1 - parameters_.cbcCutoffIncrement_); -+ cutoff = ub > 0 ? -+ ub * (1 - parameters_.cbcCutoffIncrement_): -+ ub * (1 + parameters_.cbcCutoffIncrement_); -+ assert(cutoff < ub); - - numSols_++; - } diff --git a/coin-or-Bonmin-sign.patch b/coin-or-Bonmin-sign.patch index 993cad2..c8fc7e2 100644 --- a/coin-or-Bonmin-sign.patch +++ b/coin-or-Bonmin-sign.patch @@ -1,5 +1,6 @@ ---- Bonmin-1.8.7/src/CbcBonmin/Heuristics/BonHeuristicFPump.cpp.orig 2015-01-20 03:33:55.000000000 -0700 -+++ Bonmin-1.8.7/src/CbcBonmin/Heuristics/BonHeuristicFPump.cpp 2019-06-20 10:35:57.915689913 -0600 +diff -up Bonmin-releases-1.8.9/Bonmin/src/CbcBonmin/Heuristics/BonHeuristicFPump.cpp.orig Bonmin-releases-1.8.9/Bonmin/src/CbcBonmin/Heuristics/BonHeuristicFPump.cpp +--- Bonmin-releases-1.8.9/Bonmin/src/CbcBonmin/Heuristics/BonHeuristicFPump.cpp.orig 2023-01-30 07:45:31.000000000 -0700 ++++ Bonmin-releases-1.8.9/Bonmin/src/CbcBonmin/Heuristics/BonHeuristicFPump.cpp 2023-02-10 16:51:05.749435658 -0700 @@ -529,7 +529,7 @@ namespace Bonmin if(indexColumnSelected < 0){//Looks like all variables have been fixed to 0 continue; @@ -9,9 +10,10 @@ for (size_t j=0; j<jac_g.size(); j++) { int iColumn = jac_g[j].first; if((int)j == indexColumnSelected) ---- Bonmin-1.8.7/src/Interfaces/BonTMINLP2TNLP.cpp.orig 2015-01-20 03:33:55.000000000 -0700 -+++ Bonmin-1.8.7/src/Interfaces/BonTMINLP2TNLP.cpp 2019-06-20 10:35:06.093616856 -0600 -@@ -369,7 +369,7 @@ namespace Bonmin +diff -up Bonmin-releases-1.8.9/Bonmin/src/Interfaces/BonTMINLP2TNLP.cpp.orig Bonmin-releases-1.8.9/Bonmin/src/Interfaces/BonTMINLP2TNLP.cpp +--- Bonmin-releases-1.8.9/Bonmin/src/Interfaces/BonTMINLP2TNLP.cpp.orig 2023-01-30 07:45:31.000000000 -0700 ++++ Bonmin-releases-1.8.9/Bonmin/src/Interfaces/BonTMINLP2TNLP.cpp 2023-02-10 16:51:05.749435658 -0700 +@@ -370,7 +370,7 @@ namespace Bonmin #endif if (init_x == true) { if(x_init_.empty()){ @@ -20,7 +22,7 @@ IpBlasDcopy(n, x_init_user_(), 1, x, 1); } else -@@ -378,7 +378,7 @@ namespace Bonmin +@@ -379,7 +379,7 @@ namespace Bonmin if (init_z == true) { if(duals_init_ == NULL) return false; @@ -29,7 +31,7 @@ IpBlasDcopy(n, duals_init_, 1, z_L, 1); IpBlasDcopy(n, duals_init_ + n, 1, z_U, 1); -@@ -386,7 +386,7 @@ namespace Bonmin +@@ -387,7 +387,7 @@ namespace Bonmin if(init_lambda == true) { if(duals_init_ == NULL) return false; @@ -38,7 +40,7 @@ if(m > 0) IpBlasDcopy(m, duals_init_ + 2*n , 1, lambda, 1); } -@@ -666,8 +666,8 @@ namespace Bonmin +@@ -667,8 +667,8 @@ namespace Bonmin double TMINLP2TNLP::check_solution(OsiObject ** objects, int nObjects){ diff --git a/coin-or-Bonmin-typo.patch b/coin-or-Bonmin-typo.patch deleted file mode 100644 index a365af5..0000000 --- a/coin-or-Bonmin-typo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Bonmin-1.8.7/src/Interfaces/BonOsiTMINLPInterface.cpp.orig 2015-01-20 03:33:55.000000000 -0700 -+++ Bonmin-1.8.7/src/Interfaces/BonOsiTMINLPInterface.cpp 2019-06-20 10:31:14.486759607 -0600 -@@ -1853,7 +1853,7 @@ OsiTMINLPInterface::getConstraintsViolat - if(rowLower[i] > -1e10) - rowViolation = std::max(0.,rowLower[i] - g[i]); - -- if(rowUpper[i] < 1e10); -+ if(rowUpper[i] < 1e10) - rowViolation = std::max(rowViolation, g[i] - rowUpper[i]); - - norm = rowViolation > norm ? rowViolation : norm; diff --git a/coin-or-Bonmin.spec b/coin-or-Bonmin.spec index f28dae7..cc19d92 100644 --- a/coin-or-Bonmin.spec +++ b/coin-or-Bonmin.spec @@ -4,11 +4,14 @@ Name: coin-or-%{module} Summary: Basic Open-source Nonlinear Mixed INteger programming -Version: 1.8.8 -Release: 15%{?dist} -License: EPL-1.0 -URL: http://projects.coin-or.org/%{module} -Source0: http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz +Version: 1.8.9 +Release: 1%{?dist} + +# EPL-1.0: the project as a whole +# SMLNJ: Bonmin/src/Interfaces/Ampl/sos_kludge.cpp +License: EPL-1.0 AND SMLNJ +URL: https://projects.coin-or.org/%{module} +Source0: https://github.com/coin-or/Bonmin/archive/releases/%{version}/%{module}-%{v… BuildRequires: coin-or-Cgl-doc BuildRequires: coin-or-Clp-doc BuildRequires: coin-or-Ipopt-common @@ -22,7 +25,7 @@ BuildRequires: gcc-c++ BuildRequires: help2man BuildRequires: make %if %{with_asl} -BuildRequires: mp-devel +BuildRequires: asl-devel %endif %if %{with_mpi} BuildRequires: pkgconfig(ompi) @@ -33,34 +36,22 @@ BuildRequires: pkgconfig(cbc) BuildRequires: tex(tex4ht.sty) BuildRequires: tex(threeparttable.sty) +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + # Install documentation in standard rpm directory Patch0: %{name}-docdir.patch -# Fix a typo in the violation code -Patch1: %{name}-typo.patch - # Fix mixed signed/unsigned operations -Patch2: %{name}-sign.patch - -# Fix calls to empty() that should be calls to clear() -# https://github.com/coin-or/Bonmin/commit/3c51a306137f6f6f37825770987585b407… -Patch3: %{name}-clear.patch - -# Avoid implicit cast from bool to int -# https://github.com/coin-or/Bonmin/commit/fe6f493c1ac45373db1a6a29138d70c85a… -Patch4: %{name}-bool.patch - -# Fix C++ assertions -# https://github.com/coin-or/Bonmin/commit/bce858f7874e1d2d9e57cc96ab8b8185e8… -Patch5: %{name}-assertions.patch +Patch1: %{name}-sign.patch # https://github.com/coin-or/Bonmin/issues/24 -Patch6: %{name}-bug24.patch +Patch2: %{name}-bug24.patch -Patch7: %{name}-configure-c99.patch +# Fix Modern C issues in the configure script +Patch3: %{name}-configure-c99.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=2165475 -Patch8: %{name}-fix_iFP_Ecp.patch +%global _docdir_fmt %{name} %description Bonmin (Basic Open-source Nonlinear Mixed INteger programming) is an @@ -114,11 +105,11 @@ Requires: %{name} = %{version}-%{release} This package contains the documentation for %{name}. %prep -%autosetup -p1 -n %{module}-%{version} +%autosetup -p1 -n %{module}-releases-%{version} # The pkgconfig file lists transitive dependencies. Those are necessary when # using static libraries, but not with shared libraries. -sed -i 's/ @BONMINLIB_PCLIBS@/\nLibs.private:&/' bonmin.pc.in +sed -i 's/ @BONMINLIB_PCLIBS@/\nLibs.private:&/' Bonmin/bonmin.pc.in %build %if %{with_mpi} @@ -137,17 +128,18 @@ sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ -e 's|CC="$g..$"|CC="\1 -Wl,--as-needed"|' \ -i libtool -%make_build all doxydoc -make -C doc all +%make_build all +%make_build -C Bonmin doxydoc %install %make_install rm -f %{buildroot}%{_libdir}/*.la -rm %{buildroot}%{_docdir}/%{name}/LICENSE -cp -a AUTHORS README doxydoc/{html,*.tag} %{buildroot}%{_pkgdocdir} +rm %{buildroot}%{_pkgdocdir}/LICENSE +cp -a Bonmin/{AUTHORS,README} Bonmin/doxydoc/{bonmin_doxy.tag,html} \ + %{buildroot}%{_pkgdocdir} mkdir -p %{buildroot}%{_mandir}/man1 -LD_LIBRARY_PATH=%{buildroot}%{_libdir} help2man -N src/Apps/.libs/bonmin > \ - %{buildroot}%{_mandir}/man1/bonmin.1 +LD_LIBRARY_PATH=%{buildroot}%{_libdir} help2man -N \ + Bonmin/src/Apps/.libs/bonmin > %{buildroot}%{_mandir}/man1/bonmin.1 %check %if %{with_mpi} @@ -155,8 +147,6 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} help2man -N src/Apps/.libs/bonmin > \ %endif LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make test -%ldconfig_scriptlets - %files %license LICENSE %dir %{_pkgdocdir} @@ -181,11 +171,17 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make test %endif %files doc -%doc doc/html %{_pkgdocdir}/html/ %{_pkgdocdir}/bonmin_doxy.tag %changelog +* Wed Jan 31 2024 Jerry James <loganjerry(a)gmail.com> - 1.8.9-1 +- Release 1.8.9 +- Convert License to SPDX +- Drop upstreamed patches: -typo, -clear, -bool, -assertions, -fix_iFP_Ecp +- BR asl-devel instead of mp-devel +- Stop building for 32-bit x86 + * Wed Jan 24 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.8.8-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild @@ -195,7 +191,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make test * Wed Jul 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.8.8-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild -* Tue Feb 07 2023 Antonio Trande <sagitter(a)fedoraproject.org - 1.8.8-12 +* Tue Feb 07 2023 Antonio Trande <sagitter(a)fedoraproject.org> - 1.8.8-12 - Fix rhbz#2165475 * Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.8.8-11 @@ -210,10 +206,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make test * Wed Jan 19 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.8.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Tue Sep 21 2021 Antonio Trande <sagitter(a)fedoraproject.org - 1.8.8-7 +* Tue Sep 21 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 1.8.8-7 - Patched for upstream bug #24 -* Tue Sep 21 2021 Antonio Trande <sagitter(a)fedoraproject.org - 1.8.8-6 +* Tue Sep 21 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 1.8.8-6 - Rebuild for Ipopt-3.14.4 * Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.8.8-5 diff --git a/sources b/sources index cf4dd8a..da63ca0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Bonmin-1.8.8.tgz) = 0eb5eb359fe09faaf4a7c583f09aa19ce900b9753ee633340634b28009b353b8b8ea410a194909cf751dbf2b200ffc2d7492c732d1b141e5543c37f4c9027f2a +SHA512 (Bonmin-1.8.9.tar.gz) = 2b9317c68a90a6d72c78074fd595810f82fbaa8a0467a9ab4f77149000e8bfcb8b0d17c2a67b18866fabb0777ecda03bb747a3b90627e418f835828903e6bbed

1 0

Architecture specific change in rpms/coin-or-Bcp.git
by githook-noreply＠fedoraproject.org 26 Feb '24

26 Feb '24

The package rpms/coin-or-Bcp.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/coin-or-Bcp.git/commit/?id=195f5115…. Change: +ExcludeArch: %{ix86} Thanks. Full change: ============ commit 195f5115b2e8b1bdb793209cee77ee690ee692a0 Author: Jerry James <loganjerry(a)gmail.com> Date: Wed Jan 31 15:11:26 2024 -0700 Rebuild for coin-or-Clp 1.17.9 and coin-or-Cgl 0.60.8 - Convert License to SPDX - Stop building for 32-bit x86 diff --git a/coin-or-Bcp.spec b/coin-or-Bcp.spec index 66fc5ec..be99100 100644 --- a/coin-or-Bcp.spec +++ b/coin-or-Bcp.spec @@ -3,9 +3,9 @@ Name: coin-or-%{module} Summary: Branch-Cut-Price Framework Version: 1.4.4 -Release: 14%{?dist} -License: CPL -URL: http://projects.coin-or.org/%{module} +Release: 15%{?dist} +License: CPL-1.0 +URL: https://projects.coin-or.org/%{module} Source0: http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz BuildRequires: coin-or-Cgl-devel BuildRequires: coin-or-Cgl-doc @@ -16,6 +16,9 @@ BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: make +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + # Install documentation in standard rpm directory Patch0: %{name}-docdir.patch @@ -52,7 +55,7 @@ This package contains the documentation for %{name}. %autosetup -p1 -n %{module}-%{version} %build -export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" +export CXXFLAGS="-std=c++14 %{build_cxxflags}" %configure # Get rid of undesirable hardcoded rpaths; workaround libtool reordering @@ -73,8 +76,6 @@ cp -a doxydoc/{html,*.tag} %{buildroot}%{_docdir}/%{name} %check LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test -%ldconfig_scriptlets - %files %license LICENSE %dir %{_docdir}/%{name} @@ -93,6 +94,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{_pkgdocdir}/bcp_doxy.tag %changelog +* Wed Jan 31 2024 Jerry James <loganjerry(a)gmail.com> - 1.4.4-15 +- Rebuild for coin-or-Clp 1.17.9 and coin-or-Cgl 0.60.8 +- Convert License to SPDX +- Stop building for 32-bit x86 + * Wed Jan 24 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4.4-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

1 0

Architecture specific change in rpms/coin-or-Alps.git
by githook-noreply＠fedoraproject.org 26 Feb '24

26 Feb '24

The package rpms/coin-or-Alps.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/coin-or-Alps.git/commit/?id=d473ee2…. Change: +ExcludeArch: %{ix86} Thanks. Full change: ============ commit d473ee26af818a4c48659b77fa2a4b7ab603d6c4 Author: Jerry James <loganjerry(a)gmail.com> Date: Wed Jan 31 15:05:20 2024 -0700 Version 1.5.11 - Verify the license is valid SPDX - Add patch to avoid deprecated std::unary_function and mallinfo - Stop building for 32-bit x86 - Trim BuildRequires diff --git a/coin-or-Alps-deprecated.patch b/coin-or-Alps-deprecated.patch new file mode 100644 index 0000000..9320a51 --- /dev/null +++ b/coin-or-Alps-deprecated.patch @@ -0,0 +1,24 @@ +diff -up CHiPPS-ALPS-releases-1.5.11/Alps/src/AlpsHelperFunctions.h.orig CHiPPS-ALPS-releases-1.5.11/Alps/src/AlpsHelperFunctions.h +--- CHiPPS-ALPS-releases-1.5.11/Alps/src/AlpsHelperFunctions.h.orig 2023-07-20 11:45:55.000000000 -0600 ++++ CHiPPS-ALPS-releases-1.5.11/Alps/src/AlpsHelperFunctions.h 2023-11-11 20:37:25.993639995 -0700 +@@ -35,7 +35,7 @@ + //############################################################################# + + /** A functor class used in calulating total workload in a node pool. */ +-class TotalWorkload : public std::unary_function<AlpsTreeNode*, void> { ++class TotalWorkload { + + private: + double totalLoad_; +diff -up CHiPPS-ALPS-releases-1.5.11/Alps/src/AlpsSubTree.cpp.orig CHiPPS-ALPS-releases-1.5.11/Alps/src/AlpsSubTree.cpp +--- CHiPPS-ALPS-releases-1.5.11/Alps/src/AlpsSubTree.cpp.orig 2023-07-20 11:45:55.000000000 -0600 ++++ CHiPPS-ALPS-releases-1.5.11/Alps/src/AlpsSubTree.cpp 2023-11-11 20:30:42.920801078 -0700 +@@ -1345,7 +1345,7 @@ AlpsSubTree::exploreUnitWork(bool leaveA + //std::cout << "checkMemory = " << checkMemory << std::endl; + + if (checkMemory) { +- struct mallinfo memInfo = mallinfo(); ++ struct mallinfo2 memInfo = mallinfo2(); + double memUsage = static_cast<double>(memInfo.uordblks + memInfo.hblkhd) / 1024.0; + memUsage /= 1024.0; + if (memUsage > broker_->getPeakMemory()) { diff --git a/coin-or-Alps-docdir.patch b/coin-or-Alps-docdir.patch index 466d422..ec6f65e 100644 --- a/coin-or-Alps-docdir.patch +++ b/coin-or-Alps-docdir.patch @@ -1,7 +1,7 @@ -diff -up CHiPPS-ALPS-releases-1.5.7/Alps/configure.orig CHiPPS-ALPS-releases-1.5.7/Alps/configure ---- CHiPPS-ALPS-releases-1.5.7/Alps/configure.orig 2019-02-24 21:25:03.000000000 -0700 -+++ CHiPPS-ALPS-releases-1.5.7/Alps/configure 2019-06-21 12:19:08.029717509 -0600 -@@ -23191,7 +23191,7 @@ echo "${ECHO_T}$doxysrcdir (src)" >&6 +diff -up CHiPPS-ALPS-releases-1.5.11/Alps/configure.orig CHiPPS-ALPS-releases-1.5.11/Alps/configure +--- CHiPPS-ALPS-releases-1.5.11/Alps/configure.orig 2023-07-20 11:45:55.000000000 -0600 ++++ CHiPPS-ALPS-releases-1.5.11/Alps/configure 2023-11-11 20:32:52.529154324 -0700 +@@ -24272,7 +24272,7 @@ echo "${ECHO_T}$doxysrcdir (src)" >&6 fi # Not built, fall back to installed tag file if test $doxyfound = no ; then @@ -10,10 +10,10 @@ diff -up CHiPPS-ALPS-releases-1.5.7/Alps/configure.orig CHiPPS-ALPS-releases-1.5 # 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-ALPS-releases-1.5.7/Alps/Makefile.in.orig CHiPPS-ALPS-releases-1.5.7/Alps/Makefile.in ---- CHiPPS-ALPS-releases-1.5.7/Alps/Makefile.in.orig 2019-02-24 21:25:03.000000000 -0700 -+++ CHiPPS-ALPS-releases-1.5.7/Alps/Makefile.in 2019-04-07 15:24:39.267623450 -0600 -@@ -379,7 +379,7 @@ EXTRA_DIST = examples/Abc/AbcBranchActua +diff -up CHiPPS-ALPS-releases-1.5.11/Alps/Makefile.in.orig CHiPPS-ALPS-releases-1.5.11/Alps/Makefile.in +--- CHiPPS-ALPS-releases-1.5.11/Alps/Makefile.in.orig 2023-07-20 11:45:55.000000000 -0600 ++++ CHiPPS-ALPS-releases-1.5.11/Alps/Makefile.in 2023-11-11 20:33:22.436774329 -0700 +@@ -398,7 +398,7 @@ EXTRA_DIST = examples/Abc/AbcBranchActua ######################################################################## pkgconfiglibdir = $(libdir)/pkgconfig pkgconfiglib_DATA = alps.pc @@ -22,22 +22,22 @@ diff -up CHiPPS-ALPS-releases-1.5.7/Alps/Makefile.in.orig CHiPPS-ALPS-releases-1 ######################################################################## # Maintainer Stuff # -@@ -388,7 +388,7 @@ addlibsdir = $(DESTDIR)$(datadir)/coin/d +@@ -407,7 +407,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 + DocFiles = README README.md AUTHORS AUTHORS.md LICENSE LICENSE.md -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-ALPS-releases-1.5.7/Makefile.in.orig CHiPPS-ALPS-releases-1.5.7/Makefile.in ---- CHiPPS-ALPS-releases-1.5.7/Makefile.in.orig 2019-02-24 21:25:03.000000000 -0700 -+++ CHiPPS-ALPS-releases-1.5.7/Makefile.in 2019-04-07 15:24:39.268623447 -0600 -@@ -266,7 +266,7 @@ SUBDIRS = $(subdirs) +diff -up CHiPPS-ALPS-releases-1.5.11/Makefile.in.orig CHiPPS-ALPS-releases-1.5.11/Makefile.in +--- CHiPPS-ALPS-releases-1.5.11/Makefile.in.orig 2023-07-20 11:45:55.000000000 -0600 ++++ CHiPPS-ALPS-releases-1.5.11/Makefile.in 2023-11-11 20:35:20.960268375 -0700 +@@ -278,7 +278,7 @@ SUBDIRS = $(subdirs) DISTCLEANFILES = coin_subdirs.txt $(am__append_2) \ $(VPATH_DISTCLEANFILES) - DocFiles = README AUTHORS LICENSE + DocFiles = README README.md AUTHORS AUTHORS.md LICENSE LICENSE.md -DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME) +DocInstallDir = $(datadir)/doc/coin-or-$(PACKAGE_NAME) COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE diff --git a/coin-or-Alps.spec b/coin-or-Alps.spec index e600ce0..13ae4a5 100644 --- a/coin-or-Alps.spec +++ b/coin-or-Alps.spec @@ -1,34 +1,36 @@ %global module Alps -%if 0%{?fedora} >= 33 -%global blaslib flexiblas -%else -%global blaslib openblas -%endif - Name: coin-or-%{module} Summary: COIN-OR High-Performance Parallel Search Framework -Version: 1.5.7 -Release: 14%{?dist} +Version: 1.5.11 +Release: 1%{?dist} + License: EPL-1.0 URL: https://github.com/coin-or/CHiPPS-ALPS Source0: https://github.com/coin-or/CHiPPS-ALPS/archive/releases/%{version}/CHiPPS-A… + +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: coin-or-Cgl-devel BuildRequires: coin-or-Clp-devel BuildRequires: coin-or-CoinUtils-doc BuildRequires: doxygen BuildRequires: gcc-c++ -BuildRequires: gcc-gfortran -BuildRequires: glpk-devel BuildRequires: make -BuildRequires: %{blaslib}-devel # Install documentation in standard rpm directory Patch0: %{name}-docdir.patch # Bad #define generated if svnversion is available Patch1: %{name}-svnversion.patch -Patch2: coin-or-Alps-configure-c99.patch + +# Fix C99 violations in the configure script +Patch2: %{name}-configure-c99.patch + +# std::unary_function is deprecated in C++14 and removed in C++17 +# mallinfo is deprecated in glibc 2.33 +Patch3: %{name}-deprecated.patch %description CHiPPS is the COIN-OR High-Performance Parallel Search Framework, a framework @@ -64,13 +66,8 @@ This package contains the documentation for %{name}. %autosetup -p1 -n CHiPPS-ALPS-releases-%{version} %build -%configure \ - --with-blas-incdir=%{_includedir}/%{blaslib} \ - --with-blas-lib=-l%{blaslib} \ - --with-glpk-incdir=%{_includedir} \ - --with-glpk-lib=-lglpk \ - --with-lapack-incdir=%{_includedir}/%{blaslib} \ - --with-lapack-lib=-l%{blaslib} +export CPPFLAGS='-DNDEBUG' +%configure # Get rid of undesirable hardcoded rpaths; workaround libtool reordering # -Wl,--as-needed after all the libraries. @@ -80,26 +77,24 @@ sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ -i libtool %make_build all -%make_build -C Alps doxydoc +%make_build doxygen-docs %install %make_install -rm -f %{buildroot}%{_libdir}/*.la -rm -f %{buildroot}%{_docdir}/%{name}/{LICENSE,alps_addlibs.txt} -cp -a Alps/doxydoc/{html,*.tag} %{buildroot}%{_docdir}/%{name} +rm %{buildroot}%{_libdir}/*.la +rm %{buildroot}%{_docdir}/%{name}/{alps_addlibs.txt,LICENSE} +cp -a doxydoc/{html,alps_doxy.tag} %{buildroot}%{_docdir}/%{name} %check LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test -%ldconfig_scriptlets - %files %license LICENSE %dir %{_docdir}/%{name} %{_docdir}/%{name}/AUTHORS %{_docdir}/%{name}/README -%{_libdir}/libAlps.so.0 -%{_libdir}/libAlps.so.0.* +%{_libdir}/libAlps.so.3 +%{_libdir}/libAlps.so.3.* %files devel %{_includedir}/coin/* @@ -111,6 +106,13 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{_docdir}/%{name}/alps_doxy.tag %changelog +* Wed Jan 31 2024 Jerry James <loganjerry(a)gmail.com> - 1.5.11-1 +- Version 1.5.11 +- Verify the license is valid SPDX +- Add patch to avoid deprecated std::unary_function and mallinfo +- Stop building for 32-bit x86 +- Trim BuildRequires + * Wed Jan 24 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.7-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 441213f..14ee936 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (CHiPPS-ALPS-1.5.7.tar.gz) = 7c3d838bfa8366f0a440dfe1cc9fbff1ca23e6528c3d89348fb4df8bab50b1a7c666523cde20ecd9f09ad54e599ffed1e6ed48631078dbd4d6885e2b10e9e495 +SHA512 (CHiPPS-ALPS-1.5.11.tar.gz) = ced0814514f9f5e4d3b011a51588fd799c294ee644db9f1187d19fa209e825bbcb0595bf3439883cd4e7e2d7266ae6b6517d32c34141e1d996c333b432e54864

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes February 2024