public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jerry James <loganjerry@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/scip] f44: Version 10.0.3
Date: Tue, 07 Jul 2026 02:09:46 GMT [thread overview]
Message-ID: <178339018663.1.2103410308995969551.rpms-scip-1acd74b17bb9@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/scip
Branch : f44
Commit : 1acd74b17bb964ab66bee3d9ba9f760adc665b62
Author : Jerry James <loganjerry@gmail.com>
Date : 2026-07-06T17:00:02-06:00
Stats : +39/-34 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/scip/c/1acd74b17bb964ab66bee3d9ba9f760adc665b62?branch=f44
Log:
Version 10.0.3
- Use the cmake declarative buildsystem
---
diff --git a/scip-zlib-ng.patch b/scip-zlib-ng.patch
index 4c74798..124d352 100644
--- a/scip-zlib-ng.patch
+++ b/scip-zlib-ng.patch
@@ -1,6 +1,6 @@
---- scip-10.0.0/CMakeLists.txt.orig 2025-11-25 14:55:21.139744656 -0700
-+++ scip-10.0.0/CMakeLists.txt 2025-11-25 14:56:06.669254921 -0700
-@@ -402,8 +402,11 @@ set(WITH_SCIPDEF on)
+--- scip-10.0.3/CMakeLists.txt.orig 2026-07-06 14:58:27.226826828 -0600
++++ scip-10.0.3/CMakeLists.txt 2026-07-06 14:59:03.634685065 -0600
+@@ -408,8 +408,11 @@ set(WITH_SCIPDEF on)
# ZLIB
if(ZLIB OR AUTOBUILD)
message(STATUS "Finding ZLIB")
@@ -14,8 +14,8 @@
if((NOT ZLIB_FOUND) AND (NOT AUTOBUILD))
message(FATAL_ERROR "ZLIB not found, try specifying ZLIB_DIR. ${AUTOBUILD_MSG}")
endif()
---- scip-10.0.0/src/CMakeLists.txt.orig 2025-11-25 13:52:22.391826611 -0700
-+++ scip-10.0.0/src/CMakeLists.txt 2025-11-25 13:55:49.940610227 -0700
+--- scip-10.0.3/src/CMakeLists.txt.orig 2026-07-06 14:58:31.034892941 -0600
++++ scip-10.0.3/src/CMakeLists.txt 2026-07-06 14:59:03.635040919 -0600
@@ -1147,7 +1147,7 @@ target_include_directories(libscip BEFOR
target_link_libraries(libscip
PRIVATE
@@ -34,8 +34,8 @@
${Readline_LIBRARY}
${GMP_LIBRARIES}
${MPFR_LIBRARIES}
---- scip-10.0.0/src/scip/fileio.c.orig 2025-11-23 02:06:47.000000000 -0700
-+++ scip-10.0.0/src/scip/fileio.c 2025-11-25 13:54:49.311963661 -0700
+--- scip-10.0.3/src/scip/fileio.c.orig 2026-07-02 02:45:36.000000000 -0600
++++ scip-10.0.3/src/scip/fileio.c 2026-07-06 15:00:15.456780238 -0600
@@ -41,23 +41,24 @@
#ifdef SCIP_WITH_ZLIB
@@ -62,7 +62,7 @@
- nbytesread = gzread((gzFile)stream, ptr, (unsigned int) (size * nmemb));
+ nbytesread = zng_gzread((gzFile)stream, ptr, (unsigned int) (size * nmemb));
- /* An error occured if nbytesread < 0. To be compatible with fread(), we return 0, which signifies an error there. */
+ /* An error occurred if nbytesread < 0. To be compatible with fread(), we return 0, which signifies an error there. */
if ( nbytesread < 0 )
return 0;
@@ -67,7 +68,7 @@ size_t SCIPfread(void *ptr, size_t size,
@@ -145,8 +145,8 @@
}
---- scip-10.0.0/src/scip/scip_general.c.orig 2025-11-23 02:06:47.000000000 -0700
-+++ scip-10.0.0/src/scip/scip_general.c 2025-11-25 13:54:49.312350211 -0700
+--- scip-10.0.3/src/scip/scip_general.c.orig 2026-07-02 02:45:36.000000000 -0600
++++ scip-10.0.3/src/scip/scip_general.c 2026-07-06 14:59:03.635716478 -0600
@@ -87,7 +87,7 @@
#endif
@@ -165,8 +165,8 @@
#endif
#ifdef SCIP_WITH_LAPACK
---- scip-10.0.0/src/xml/xmldef.h.orig 2025-11-23 02:06:47.000000000 -0700
-+++ scip-10.0.0/src/xml/xmldef.h 2025-11-25 13:54:49.312764573 -0700
+--- scip-10.0.3/src/xml/xmldef.h.orig 2026-07-02 02:45:36.000000000 -0600
++++ scip-10.0.3/src/xml/xmldef.h 2026-07-06 14:59:03.636092119 -0600
@@ -49,12 +49,13 @@ extern "C" {
diff --git a/scip.spec b/scip.spec
index 185f9ce..216758f 100644
--- a/scip.spec
+++ b/scip.spec
@@ -1,7 +1,10 @@
+# Whether to run tests
+%bcond ctest 1
+
%global giturl https://github.com/scipopt/scip
Name: scip
-Version: 10.0.2
+Version: 10.0.3
Release: %autorelease
Summary: Solving Constraint Integer Programs
@@ -27,8 +30,17 @@ Patch: %{name}-zlib-ng.patch
# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
+BuildSystem: cmake
+BuildOption(conf): -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir}
+BuildOption(conf): -DNAUTY_DIR:PATH=%{_prefix}
+BuildOption(conf): -DSYM:STRING=snauty
+BuildOption(conf): -DTPI:STRING=omp
+# The BendersQP-benders-qp-classical_20_0.mps test often triggers a timeout.
+# We could make the timeout longer (1500 seconds by default), but it sometimes
+# times out even at 3000 seconds. Let's just skip it.
+# The examples also (mostly) take a great deal of time.
+BuildOption(check): -E '(classical_20_0)|(examples-)'
-BuildRequires: cmake
BuildRequires: cmake(soplex)
BuildRequires: cmake(zimpl)
BuildRequires: gcc-c++
@@ -44,7 +56,6 @@ BuildRequires: zimpl
# Documentation
BuildRequires: doxygen
-BuildRequires: mathjax
BuildRequires: php-cli
BuildRequires: python3
@@ -116,7 +127,6 @@ API documentation for libscip.
%prep
%autosetup -p1
-%conf
# We want to know about overflow errors, as the compiler can do surprising
# things if we don't fix them!
sed -i 's/ -Wno-strict-overflow//' CMakeLists.txt make/make.project
@@ -131,22 +141,24 @@ sed -i 's/OSTYPE=@.*@/OSTYPE=linux/' src/scipbuildflags.c.in
# Ensure we cannot use the bundled bliss or nauty
rm -fr src/{bliss,nauty}
-%build
+%conf -p
%ifarch %{power64}
# Avoid error due to clashing "long double" and "float128" definitions
export CFLAGS='%{build_cflags} -DBOOST_MP_BITS_OF_FLOAT128_DEFINED'
export CXXFLAGS='%{build_cxxflags} -DBOOST_MP_BITS_OF_FLOAT128_DEFINED'
%endif
-%cmake \
- -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
- -DNAUTY_DIR:PATH=%{_prefix} \
- -DSYM:STRING=snauty \
- -DTPI:STRING=omp
-%cmake_build
+%build -a
# Build documentation
+sed -e 's/MathJax_2/MathJax_3/' \
+ -e 's/HTML-CSS/chtml/' \
+ -i \
+ applications/Coloring/doc/coloring.dxy \
+ applications/CycleClustering/doc/cycleclustering.dxy \
+ applications/MinIISC/doc/miniisc.dxy \
+ applications/Scheduler/doc/scheduler.dxy \
+ doc/scip.dxy
cd doc
-ln -s %{_datadir}/javascript/mathjax MathJax
ln -s ../check .
../%{_vpath_builddir}/bin/scip < inc/shelltutorial/commands \
> inc/shelltutorial/shelltutorialraw.tmp
@@ -161,19 +173,12 @@ cd -
doxygen scip.dxy
cd ..
-%install
-%cmake_install
-
+%install -a
# We install license files elsewhere
rm -fr %{buildroot}%{_defaultlicensedir}
-%check
+%check -p
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
-# The BendersQP-benders-qp-classical_20_0.mps test often triggers a timeout.
-# We could make the timeout longer (1500 seconds by default), but it sometimes
-# times out even at 3000 seconds. Let's just skip it.
-# The examples also (mostly) take a great deal of time.
-%ctest -E '(classical_20_0)|(examples-)'
%files
%{_bindir}/scip
diff --git a/sources b/sources
index cf914f9..20c2d19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (scip-10.0.2.tar.gz) = db2d96ef34fd1c05a2bded34850c09549c34ee83e81d49fd02195f95db2bd8c35123a42500e1cac78c8f7d55ec138e3707df5decee71c963847566cb6084f23d
+SHA512 (scip-10.0.3.tar.gz) = d610343e3cd9aafe8f6020db19f5d7466918643eb10b5a2d1f9912662213bf2f778ad65b0c139906e003a5b0f552db798a6b3ce9da46e726003c2141975661db
reply other threads:[~2026-07-07 2:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178339018663.1.2103410308995969551.rpms-scip-1acd74b17bb9@fedoraproject.org \
--to=loganjerry@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox