From 011b66a426d41efb8c61a3d6bf00ec26444914d7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 24 Jun 2024 09:05:31 -0600 Subject: [PATCH 01/13] Version 3.6.1 --- sources | 2 +- zimpl.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources b/sources index c253c94..533a83d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scipoptsuite-9.0.1.tgz) = 0068b433a5c168e46973d53c2df4121139d6efe13fe1d6d60a9e818bac97244403b54a1819ede06b28e6301cfc3c884c563d277fcb16e5fe740e4cbd2d472336 +SHA512 (scipoptsuite-9.1.0.tgz) = 03c1c49dd5e4dbc5bfd4f07305937079773f6912c87b0ba86166fc02996928e8d23332137a944f16f2488a88dc12a4a2c6ebde216eb4532135ed282a182bfdaf diff --git a/zimpl.spec b/zimpl.spec index 47e2184..be54109 100644 --- a/zimpl.spec +++ b/zimpl.spec @@ -2,10 +2,10 @@ # packages. Most of them can be downloaded separately, so we do not build the # entire suite here. See https://github.com/scipopt/scip/issues/37. # There is now a zimpl repository, but upstream has not tagged any releases yet. -%global scipoptsuitever 9.0.1 +%global scipoptsuitever 9.1.0 Name: zimpl -Version: 3.6.0 +Version: 3.6.1 Release: %autorelease Summary: Zuse Institut Mathematical Programming Language From 486cf09867455eb8f4197b056afff6f155862cae Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 17 Jul 2024 16:21:37 -0600 Subject: [PATCH 02/13] Fix the VCS field --- zimpl.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zimpl.spec b/zimpl.spec index be54109..0e90010 100644 --- a/zimpl.spec +++ b/zimpl.spec @@ -18,19 +18,19 @@ Summary: Zuse Institut Mathematical Programming Language # GPL-1.0-or-later: CM-Super License: LGPL-3.0-or-later AND OFL-1.1-RFN AND Knuth-CTAN AND GPL-1.0-or-later URL: https://zimpl.zib.de/ -VCS: https://github.com/scipopt/zimpl -Source0: https://scipopt.org/download/release/scipoptsuite-%{scipoptsuitever}.tgz +VCS: git:https://github.com/scipopt/zimpl.git +Source: https://scipopt.org/download/release/scipoptsuite-%{scipoptsuitever}.tgz # Build a shared library instead of a static library. ZIMPL leaves some symbols # undefined, namely those listed in src/zimpl/xlpglue.h. They take advantage of # the fact that linking with a static library only pulls in the referenced # symbols to avoid referring to the xlp symbols in certain cases, for example, # in the scip test suite. Since Fedora wants shared libraries, we have to give # those symbols weak dummy definitions to avoid unresolved symbols at link time. -Patch0: %{name}-shared.patch +Patch: %{name}-shared.patch # This package and cddlib both have C functions named set_copy and set_free. # This is a problem for polymake, which links both libraries. Rename the # zimpl functions to set_copy_zimpl and set_free_zimpl. -Patch1: %{name}-cddlib-set-clash.patch +Patch: %{name}-cddlib-set-clash.patch # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} From 5440f7e3c977f447a36858193b5bedec958efa0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:52:40 +0000 Subject: [PATCH 03/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 985db2826a3da07c7c3dc083a60a68d71bc1ea89 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 23 Sep 2024 11:25:07 -0600 Subject: [PATCH 04/13] Version 3.6.2 - Use zlib-ng directly instead of via the compatibility interface - Temporarily disable one failing test on ppc64le --- .gitignore | 1 + sources | 2 +- zimpl-zlib-ng.patch | 77 +++++++++++++++++++++++++++++++++++++++++++++ zimpl.spec | 21 +++++++------ 4 files changed, 90 insertions(+), 11 deletions(-) create mode 100644 zimpl-zlib-ng.patch diff --git a/.gitignore b/.gitignore index bd178c5..065737d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /scipoptsuite-*.tgz +/zimpl-*.tar.gz diff --git a/sources b/sources index 533a83d..bb7b7aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scipoptsuite-9.1.0.tgz) = 03c1c49dd5e4dbc5bfd4f07305937079773f6912c87b0ba86166fc02996928e8d23332137a944f16f2488a88dc12a4a2c6ebde216eb4532135ed282a182bfdaf +SHA512 (zimpl-3.6.2.tar.gz) = 78cb6d3c06f3a8f42005eda8b04b56f414f6327e5cd3ffbd6a5eadf1a93295b3aa4ec57deb2ed6281f038565a457b0dc9817d2e0c85cf18e86312e95d2c157a0 diff --git a/zimpl-zlib-ng.patch b/zimpl-zlib-ng.patch new file mode 100644 index 0000000..8d21795 --- /dev/null +++ b/zimpl-zlib-ng.patch @@ -0,0 +1,77 @@ +--- zimpl-362/CMakeLists.txt.orig 2024-09-17 19:44:17.589497126 -0600 ++++ zimpl-362/CMakeLists.txt 2024-09-17 19:55:30.619340046 -0600 +@@ -125,11 +125,11 @@ include_directories(${GMP_INCLUDE_DIRS}) + set(libs ${libs} ${GMP_LIBRARIES}) + + if(ZLIB) +- find_package(ZLIB) ++ find_package(ZLIB-NG) + endif() +-if(ZLIB_FOUND) +- set(libs ${libs} ${ZLIB_LIBRARIES}) +- include_directories(${ZLIB_INCLUDE_DIRS}) ++if(ZLIB-NG_FOUND) ++ set(libs ${libs} -lz-ng) ++ include_directories(/usr/include) + else() + add_definitions(-DWITHOUT_ZLIB) + endif() +--- zimpl-362/src/zimpl/iread.c.orig 2024-09-17 19:44:29.886348077 -0600 ++++ zimpl-362/src/zimpl/iread.c 2024-09-17 19:50:15.407160377 -0600 +@@ -38,7 +38,7 @@ + #endif + + #ifndef WITHOUT_ZLIB +-#include ++#include + #endif + + #include "zimpl/lint.h" +--- zimpl-362/src/zimpl/metaio.c.orig 2024-09-12 23:08:28.000000000 -0600 ++++ zimpl-362/src/zimpl/metaio.c 2024-09-17 19:49:03.368033502 -0600 +@@ -34,7 +34,8 @@ + #include + + #ifndef WITHOUT_ZLIB +-#include ++#define WITH_GZFILEOP ++#include + #endif + + #include "zimpl/lint.h" +@@ -248,7 +249,7 @@ MFP* mio_open(char const* name, char con + { + mfp->type = MFP_ZLIB; + +- if (NULL == (mfp->fp.zlib = gzopen(filename, "r"))) ++ if (NULL == (mfp->fp.zlib = zng_gzopen(filename, "r"))) + { + perror(filename); + free(mfp); +@@ -300,7 +301,7 @@ void mio_close(MFP* mfp) + break; + #ifndef WITHOUT_ZLIB + case MFP_ZLIB : +- gzclose(mfp->fp.zlib); ++ zng_gzclose(mfp->fp.zlib); + break; + #endif /* ! WITHOUT_ZLIB */ + default : +@@ -328,7 +329,7 @@ int mio_getc(MFP const* mfp) + break; + #ifndef WITHOUT_ZLIB + case MFP_ZLIB : +- c = gzgetc(mfp->fp.zlib); ++ c = zng_gzgetc(mfp->fp.zlib); + break; + #endif /* ! WITHOUT_ZLIB */ + default : +@@ -354,7 +355,7 @@ char* mio_gets(MFP const* mfp, char* buf + break; + #ifndef WITHOUT_ZLIB + case MFP_ZLIB : +- s = gzgets(mfp->fp.zlib, buf, len); ++ s = zng_gzgets(mfp->fp.zlib, buf, len); + break; + #endif /* ! WITHOUT_ZLIB */ + default : diff --git a/zimpl.spec b/zimpl.spec index 0e90010..702fc3c 100644 --- a/zimpl.spec +++ b/zimpl.spec @@ -1,11 +1,7 @@ -# ZIMPL is only available in the scipoptsuite tarball, which is a collection of -# packages. Most of them can be downloaded separately, so we do not build the -# entire suite here. See https://github.com/scipopt/scip/issues/37. -# There is now a zimpl repository, but upstream has not tagged any releases yet. -%global scipoptsuitever 9.1.0 +%global giturl https://github.com/scipopt/zimpl Name: zimpl -Version: 3.6.1 +Version: 3.6.2 Release: %autorelease Summary: Zuse Institut Mathematical Programming Language @@ -18,8 +14,8 @@ Summary: Zuse Institut Mathematical Programming Language # GPL-1.0-or-later: CM-Super License: LGPL-3.0-or-later AND OFL-1.1-RFN AND Knuth-CTAN AND GPL-1.0-or-later URL: https://zimpl.zib.de/ -VCS: git:https://github.com/scipopt/zimpl.git -Source: https://scipopt.org/download/release/scipoptsuite-%{scipoptsuitever}.tgz +VCS: git:%{giturl}.git +Source: %{giturl}/archive/v%{upver}/%{name}-%{version}.tar.gz # Build a shared library instead of a static library. ZIMPL leaves some symbols # undefined, namely those listed in src/zimpl/xlpglue.h. They take advantage of # the fact that linking with a static library only pulls in the referenced @@ -31,6 +27,8 @@ Patch: %{name}-shared.patch # This is a problem for polymake, which links both libraries. Rename the # zimpl functions to set_copy_zimpl and set_free_zimpl. Patch: %{name}-cddlib-set-clash.patch +# Use zlib-ng directly, rather than via the compatibility interface +Patch: %{name}-zlib-ng.patch # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -40,7 +38,7 @@ BuildRequires: cmake BuildRequires: flex BuildRequires: gcc BuildRequires: pkgconfig(gmp) -BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(zlib-ng) Requires: libzimpl%{?_isa} = %{version}-%{release} @@ -79,7 +77,7 @@ This package contains headers and library links for developing applications that use libzimpl. %prep -%autosetup -n scipoptsuite-%{scipoptsuitever}/%{name} -p1 +%autosetup -n %{name}-%{upver} -p1 # Fix installation directories if [ "%{_lib}" != "lib" ]; then @@ -100,11 +98,14 @@ export CXXFLAGS='%{build_cxxflags} -DFREEMEM -DNO_MSHELL' mkdir -p %{buildroot}%{_mandir}/man1 cp -p doc/zimpl.man %{buildroot}%{_mandir}/man1/zimpl.1 +# FIXME: Test qubo.zpl (qbo: lp) fails on ppc64le +%ifnarch ppc64le %check export LD_LIBRARY_PATH=%{buildroot}%{_libdir} cd check sh check.sh ../%{_vpath_builddir}/bin/zimpl cd - +%endif %files %doc doc/zimpl.pdf From 4d83bff845532f5dac566494b6c10225244a0cc1 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 15 Jan 2025 15:34:13 -0700 Subject: [PATCH 05/13] Work around a test failure - The failure appears to be due to changes in bsearch behavior in newer glibc builds --- zimpl-test-bsearch.patch | 20 ++++++++++++++++++++ zimpl.spec | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 zimpl-test-bsearch.patch diff --git a/zimpl-test-bsearch.patch b/zimpl-test-bsearch.patch new file mode 100644 index 0000000..1d43a8d --- /dev/null +++ b/zimpl-test-bsearch.patch @@ -0,0 +1,20 @@ +--- zimpl-362/check/minlp.pip.ref.orig 2024-09-12 23:08:28.000000000 -0600 ++++ zimpl-362/check/minlp.pip.ref 2025-01-15 15:31:47.835678296 -0700 +@@ -31,7 +31,7 @@ Subject to + c1_1: + -1 x#1 +1 x#1^2 = 1 + c2_1: +- +30 x#1 * x#2 * x#3 <= 77 ++ +30 x#2 * x#3 * x#1 <= 77 + c3_1: + +1 y * z -4 y^2 * z^3 = 0 + c4_1: +@@ -40,7 +40,7 @@ Subject to + c5_1: + +2 y +5 z +1 y * z = -7 + c6_1: +- +4 x#1^2 +2.66666666666667 x#1 * x#2 +0.444444444444444 x#2^2 = 9 ++ +4 x#1^2 +2.66666666666667 x#2 * x#1 +0.444444444444444 x#2^2 = 9 + c7_1_a_0: + - __c7_1_t_0@d + a = 0 + c7_1_b_1: diff --git a/zimpl.spec b/zimpl.spec index 702fc3c..352fdea 100644 --- a/zimpl.spec +++ b/zimpl.spec @@ -29,6 +29,9 @@ Patch: %{name}-shared.patch Patch: %{name}-cddlib-set-clash.patch # Use zlib-ng directly, rather than via the compatibility interface Patch: %{name}-zlib-ng.patch +# Fix a test failure that appears to be due to changes in bsearch behavior +# in newer glibc builds +Patch: %{name}-test-bsearch.patch # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -79,6 +82,7 @@ applications that use libzimpl. %prep %autosetup -n %{name}-%{upver} -p1 +%conf # Fix installation directories if [ "%{_lib}" != "lib" ]; then sed -i 's,\(DESTINATION \)lib,\1%{_lib},' src/CMakeLists.txt From 0834586d56ef1e1d3add88f17fd8dbbb506a5d14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:46:49 +0000 Subject: [PATCH 06/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From af131320c9ce87a7c1341a133a0555aa12287e4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:18:34 +0000 Subject: [PATCH 07/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 025aa89f89119fa45d601444f5bb73fc95febbea Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sun, 23 Nov 2025 13:25:12 -0700 Subject: [PATCH 08/13] Version 3.7.0 --- sources | 2 +- zimpl-shared.patch | 37 ++++++++++++++++++++----------------- zimpl.spec | 36 ++++++++++++++++-------------------- 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/sources b/sources index bb7b7aa..3ae7de5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zimpl-3.6.2.tar.gz) = 78cb6d3c06f3a8f42005eda8b04b56f414f6327e5cd3ffbd6a5eadf1a93295b3aa4ec57deb2ed6281f038565a457b0dc9817d2e0c85cf18e86312e95d2c157a0 +SHA512 (zimpl-3.7.0.tar.gz) = 1bdf3255ffd453b2d885c7dc7faa9ff70491fafb72c57d054ab1e673ea634475c62c6ecc39713b67f1591e6323fe6a771c309225bcd1dd2c0192f38fe0e95887 diff --git a/zimpl-shared.patch b/zimpl-shared.patch index d3b69cd..9670439 100644 --- a/zimpl-shared.patch +++ b/zimpl-shared.patch @@ -1,6 +1,6 @@ ---- zimpl/CMakeLists.txt.orig 2023-08-08 06:33:21.000000000 -0600 -+++ zimpl/CMakeLists.txt 2023-11-15 21:04:39.935423110 -0700 -@@ -41,8 +41,6 @@ endif() +--- zimpl-3.7.0/CMakeLists.txt.orig 2025-11-23 05:19:53.000000000 -0700 ++++ zimpl-3.7.0/CMakeLists.txt 2025-11-23 13:14:26.606931058 -0700 +@@ -49,8 +49,6 @@ endif() # use C99 standard set(CMAKE_C_STANDARD 99) @@ -9,9 +9,9 @@ option(ZLIB "use ZLIB" ON) option(SANITIZE_ADDRESS "should the address sanitizer be enabled in debug mode if available" OFF) ---- zimpl/src/CMakeLists.txt.orig 2023-08-08 06:33:23.000000000 -0600 -+++ zimpl/src/CMakeLists.txt 2023-11-15 21:04:39.936423097 -0700 -@@ -118,12 +118,10 @@ if(MSVC) +--- zimpl-3.7.0/src/CMakeLists.txt.orig 2025-11-23 05:19:53.000000000 -0700 ++++ zimpl-3.7.0/src/CMakeLists.txt 2025-11-23 13:15:22.276583290 -0700 +@@ -119,12 +119,10 @@ if(MSVC) endif() #create zimpl with pic @@ -28,23 +28,26 @@ target_link_libraries(libzimpl ${libs}) #create zimpl binary -@@ -140,21 +138,18 @@ endif() +@@ -141,16 +139,13 @@ endif() set_target_properties(libzimpl PROPERTIES OUTPUT_NAME "zimpl") -set_target_properties(libzimpl-pic PROPERTIES - OUTPUT_NAME "zimpl-pic") - + include(GNUInstallDirs) + # install the header files of zimpl - install(FILES ${headers} DESTINATION include/zimpl) + install(FILES ${headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zimpl) # install the binary and the library to appropriate locations and add them to an export group -install(TARGETS libzimpl zimpl libzimpl-pic EXPORT zimpl-targets +install(TARGETS libzimpl zimpl EXPORT zimpl-targets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin - INCLUDES DESTINATION include) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +@@ -164,7 +159,7 @@ endif() + install(FILES ${PROJECT_SOURCE_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/zimpl) # Add library targets to the build-tree export set -export(TARGETS libzimpl libzimpl-pic @@ -52,9 +55,9 @@ FILE "${CMAKE_BINARY_DIR}/zimpl-targets.cmake") #configure the config file for the build tree ---- zimpl/src/zimpl/zimpllib.c.orig 2023-08-08 06:33:23.000000000 -0600 -+++ zimpl/src/zimpl/zimpllib.c 2023-11-15 21:04:39.936423097 -0700 -@@ -456,3 +456,66 @@ bool zpl_read_with_args(char** argv, int +--- zimpl-3.7.0/src/zimpl/zimpllib.c.orig 2025-11-23 05:19:53.000000000 -0700 ++++ zimpl-3.7.0/src/zimpl/zimpllib.c 2025-11-23 13:14:26.607519615 -0700 +@@ -455,3 +455,66 @@ bool zpl_read_with_args(char** argv, int return ret; } @@ -121,8 +124,8 @@ +{ + abort(); +} ---- zimpl/zimpl-config.cmake.in.orig 2023-08-08 06:33:23.000000000 -0600 -+++ zimpl/zimpl-config.cmake.in 2023-11-15 21:04:39.936423097 -0700 +--- zimpl-3.7.0/zimpl-config.cmake.in.orig 2025-11-23 05:19:53.000000000 -0700 ++++ zimpl-3.7.0/zimpl-config.cmake.in 2025-11-23 13:14:26.607724336 -0700 @@ -3,7 +3,7 @@ if(NOT TARGET libzimpl) endif() diff --git a/zimpl.spec b/zimpl.spec index 352fdea..ec3188a 100644 --- a/zimpl.spec +++ b/zimpl.spec @@ -1,12 +1,10 @@ %global giturl https://github.com/scipopt/zimpl Name: zimpl -Version: 3.6.2 +Version: 3.7.0 Release: %autorelease Summary: Zuse Institut Mathematical Programming Language -%global upver %(sed 's/\\.//g' <<< %{version}) - # LGPL-3.0-or-later: the project as a whole # Other licenses are due to fonts embedded in the PDF manual: # OFL-1.1-RFN: AMS @@ -15,7 +13,7 @@ Summary: Zuse Institut Mathematical Programming Language License: LGPL-3.0-or-later AND OFL-1.1-RFN AND Knuth-CTAN AND GPL-1.0-or-later URL: https://zimpl.zib.de/ VCS: git:%{giturl}.git -Source: %{giturl}/archive/v%{upver}/%{name}-%{version}.tar.gz +Source: %{giturl}/archive/v%{version}/%{name}-%{version}.tar.gz # Build a shared library instead of a static library. ZIMPL leaves some symbols # undefined, namely those listed in src/zimpl/xlpglue.h. They take advantage of # the fact that linking with a static library only pulls in the referenced @@ -45,16 +43,15 @@ BuildRequires: pkgconfig(zlib-ng) Requires: libzimpl%{?_isa} = %{version}-%{release} -%global _desc %{expand: -Zimpl is a little language to translate the mathematical model of a -problem into a linear or nonlinear (mixed-) integer mathematical program -expressed in .lp or .mps file format which can be read and (hopefully) -solved by a LP or MIP solver.} +%global _desc %{expand:Zimpl is a little language to translate the mathematical model of a problem +into a linear or nonlinear (mixed-) integer mathematical program expressed in +.lp or .mps file format which can be read and (hopefully) solved by a LP or +MIP solver.} -%description %_desc +%description +%_desc -This package contains a command-line tool to access ZIMPL -functionality. +This package contains a command-line tool to access ZIMPL functionality. %package -n libzimpl # LGPL-3.0-or-later: the project as a whole @@ -63,7 +60,8 @@ functionality. License: LGPL-3.0-or-later AND LGPL-2.0-or-later AND GPL-3.0-or-later WITH Bison-exception-2.2 Summary: Zuse Institut Mathematical Programming Language -%description -n libzimpl %_desc +%description -n libzimpl +%_desc This package contains a library interface to ZIMPL functionality. @@ -80,14 +78,9 @@ This package contains headers and library links for developing applications that use libzimpl. %prep -%autosetup -n %{name}-%{upver} -p1 +%autosetup -p1 %conf -# Fix installation directories -if [ "%{_lib}" != "lib" ]; then - sed -i 's,\(DESTINATION \)lib,\1%{_lib},' src/CMakeLists.txt -fi - # Avoid warnings about obsolete invocations of grep sed -i 's/fgrep/grep -F/' check/check.sh @@ -102,8 +95,11 @@ export CXXFLAGS='%{build_cxxflags} -DFREEMEM -DNO_MSHELL' mkdir -p %{buildroot}%{_mandir}/man1 cp -p doc/zimpl.man %{buildroot}%{_mandir}/man1/zimpl.1 +# We do this in %%files with the %%license macro +rm -fr %{buildroot}%{_datadir}/licenses + # FIXME: Test qubo.zpl (qbo: lp) fails on ppc64le -%ifnarch ppc64le +%ifnarch %{power64} %check export LD_LIBRARY_PATH=%{buildroot}%{_libdir} cd check From e4006e879ec3426019dc9b069b208220414a4a78 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 14 Jan 2026 08:54:26 -0700 Subject: [PATCH 09/13] Reflow the description text - Be more precise about globbing in %files --- zimpl.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zimpl.spec b/zimpl.spec index ec3188a..1523ceb 100644 --- a/zimpl.spec +++ b/zimpl.spec @@ -74,8 +74,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: libzimpl%{?_isa} = %{version}-%{release} %description -n libzimpl-devel -This package contains headers and library links for developing -applications that use libzimpl. +This package contains headers and library links for developing applications +that use libzimpl. %prep %autosetup -p1 @@ -115,7 +115,7 @@ cd - %files -n libzimpl %doc CHANGELOG README %license LICENSE -%{_libdir}/libzimpl.so.0* +%{_libdir}/libzimpl.so.0{,.*} %files -n libzimpl-devel %{_includedir}/zimpl/ From 7fe9e53280bfe49b4257be3ed01986be1e3413a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:08:30 +0000 Subject: [PATCH 10/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From fde328aafb46ed258acfac414191383accf477db Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 3 Apr 2026 10:16:25 -0600 Subject: [PATCH 11/13] Version 3.7.1 --- sources | 2 +- zimpl-shared.patch | 27 ++++++++++++++------------- zimpl.spec | 7 ++++++- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/sources b/sources index 3ae7de5..e98ee2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zimpl-3.7.0.tar.gz) = 1bdf3255ffd453b2d885c7dc7faa9ff70491fafb72c57d054ab1e673ea634475c62c6ecc39713b67f1591e6323fe6a771c309225bcd1dd2c0192f38fe0e95887 +SHA512 (zimpl-3.7.1.tar.gz) = a94eba1ec9d7947d30c948599092100f5f1d6be509967f947154141a7718e054e398860fbfba34bb2e0dd129f58fd168d1087023ffe3215f7d498e829e38afc9 diff --git a/zimpl-shared.patch b/zimpl-shared.patch index 9670439..8183dbf 100644 --- a/zimpl-shared.patch +++ b/zimpl-shared.patch @@ -1,5 +1,5 @@ ---- zimpl-3.7.0/CMakeLists.txt.orig 2025-11-23 05:19:53.000000000 -0700 -+++ zimpl-3.7.0/CMakeLists.txt 2025-11-23 13:14:26.606931058 -0700 +--- zimpl-3.7.1/CMakeLists.txt.orig 2026-03-31 18:33:37.000000000 -0600 ++++ zimpl-3.7.1/CMakeLists.txt 2026-04-03 09:07:34.324781686 -0600 @@ -49,8 +49,6 @@ endif() # use C99 standard @@ -8,10 +8,10 @@ -set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) option(ZLIB "use ZLIB" ON) - option(SANITIZE_ADDRESS "should the address sanitizer be enabled in debug mode if available" OFF) ---- zimpl-3.7.0/src/CMakeLists.txt.orig 2025-11-23 05:19:53.000000000 -0700 -+++ zimpl-3.7.0/src/CMakeLists.txt 2025-11-23 13:15:22.276583290 -0700 -@@ -119,12 +119,10 @@ if(MSVC) + option(SANITIZE "should sanitizers be enabled if available" OFF) +--- zimpl-3.7.1/src/CMakeLists.txt.orig 2026-03-31 18:33:37.000000000 -0600 ++++ zimpl-3.7.1/src/CMakeLists.txt 2026-04-03 09:10:52.288477757 -0600 +@@ -118,12 +118,10 @@ if(MSVC) endif() #create zimpl with pic @@ -24,11 +24,11 @@ +add_library(libzimpl SHARED ${libsources}) +set_target_properties(libzimpl PROPERTIES + POSITION_INDEPENDENT_CODE on -+ VERSION 0.0.0 SOVERSION 0) ++ VERSION 0.0.0 SOVERSION 0) target_link_libraries(libzimpl ${libs}) #create zimpl binary -@@ -141,16 +139,13 @@ endif() +@@ -138,9 +136,6 @@ endif() set_target_properties(libzimpl PROPERTIES OUTPUT_NAME "zimpl") @@ -38,7 +38,8 @@ include(GNUInstallDirs) # install the header files of zimpl - install(FILES ${headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zimpl) +@@ -150,7 +145,7 @@ if(MSVC) + endif() # install the binary and the library to appropriate locations and add them to an export group -install(TARGETS libzimpl zimpl libzimpl-pic EXPORT zimpl-targets @@ -55,8 +56,8 @@ FILE "${CMAKE_BINARY_DIR}/zimpl-targets.cmake") #configure the config file for the build tree ---- zimpl-3.7.0/src/zimpl/zimpllib.c.orig 2025-11-23 05:19:53.000000000 -0700 -+++ zimpl-3.7.0/src/zimpl/zimpllib.c 2025-11-23 13:14:26.607519615 -0700 +--- zimpl-3.7.1/src/zimpl/zimpllib.c.orig 2026-03-31 18:33:37.000000000 -0600 ++++ zimpl-3.7.1/src/zimpl/zimpllib.c 2026-04-03 09:07:34.325265327 -0600 @@ -455,3 +455,66 @@ bool zpl_read_with_args(char** argv, int return ret; @@ -124,8 +125,8 @@ +{ + abort(); +} ---- zimpl-3.7.0/zimpl-config.cmake.in.orig 2025-11-23 05:19:53.000000000 -0700 -+++ zimpl-3.7.0/zimpl-config.cmake.in 2025-11-23 13:14:26.607724336 -0700 +--- zimpl-3.7.1/zimpl-config.cmake.in.orig 2026-03-31 18:33:37.000000000 -0600 ++++ zimpl-3.7.1/zimpl-config.cmake.in 2026-04-03 09:07:34.325434322 -0600 @@ -3,7 +3,7 @@ if(NOT TARGET libzimpl) endif() diff --git a/zimpl.spec b/zimpl.spec index 1523ceb..37bb313 100644 --- a/zimpl.spec +++ b/zimpl.spec @@ -1,7 +1,7 @@ %global giturl https://github.com/scipopt/zimpl Name: zimpl -Version: 3.7.0 +Version: 3.7.1 Release: %autorelease Summary: Zuse Institut Mathematical Programming Language @@ -98,6 +98,11 @@ cp -p doc/zimpl.man %{buildroot}%{_mandir}/man1/zimpl.1 # We do this in %%files with the %%license macro rm -fr %{buildroot}%{_datadir}/licenses +# Help the debuginfo generator find source files +mkdir -p %{_vpath_builddir}/zimpl +ln -s ../../src/zimpl/mmlscan.l %{_vpath_builddir}/zimpl +ln -s ../../src/zimpl/mmlparse2.y %{_vpath_builddir}/zimpl + # FIXME: Test qubo.zpl (qbo: lp) fails on ppc64le %ifnarch %{power64} %check From 31ad5ad8c32362a34c5e226c014d1ea3a76316ae Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 14 Jul 2026 19:34:30 -0600 Subject: [PATCH 12/13] Use the cmake declarative buildsystem --- zimpl.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/zimpl.spec b/zimpl.spec index 37bb313..a530c0c 100644 --- a/zimpl.spec +++ b/zimpl.spec @@ -33,9 +33,9 @@ Patch: %{name}-test-bsearch.patch # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} +BuildSystem: cmake BuildRequires: bison -BuildRequires: cmake BuildRequires: flex BuildRequires: gcc BuildRequires: pkgconfig(gmp) @@ -80,18 +80,14 @@ that use libzimpl. %prep %autosetup -p1 -%conf # Avoid warnings about obsolete invocations of grep sed -i 's/fgrep/grep -F/' check/check.sh -%build +%conf -p export CFLAGS='%{build_cflags} -DFREEMEM -DNO_MSHELL' export CXXFLAGS='%{build_cxxflags} -DFREEMEM -DNO_MSHELL' -%cmake -%cmake_build -%install -%cmake_install +%install -a mkdir -p %{buildroot}%{_mandir}/man1 cp -p doc/zimpl.man %{buildroot}%{_mandir}/man1/zimpl.1 @@ -103,9 +99,9 @@ mkdir -p %{_vpath_builddir}/zimpl ln -s ../../src/zimpl/mmlscan.l %{_vpath_builddir}/zimpl ln -s ../../src/zimpl/mmlparse2.y %{_vpath_builddir}/zimpl +%check # FIXME: Test qubo.zpl (qbo: lp) fails on ppc64le %ifnarch %{power64} -%check export LD_LIBRARY_PATH=%{buildroot}%{_libdir} cd check sh check.sh ../%{_vpath_builddir}/bin/zimpl From bf3f776f6d4bdf0bcbe041caa49242d03d697698 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:40:52 +0000 Subject: [PATCH 13/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild