Version 3.7.0

2025-11-23 13:25:12 -07:00 · 2025-11-23 13:25:12 -07:00 · 025aa89f89
commit 025aa89f89
parent af131320c9
3 changed files with 37 additions and 38 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (zimpl-3.6.2.tar.gz) = 78cb6d3c06f3a8f42005eda8b04b56f414f6327e5cd3ffbd6a5eadf1a93295b3aa4ec57deb2ed6281f038565a457b0dc9817d2e0c85cf18e86312e95d2c157a0
+SHA512 (zimpl-3.7.0.tar.gz) = 1bdf3255ffd453b2d885c7dc7faa9ff70491fafb72c57d054ab1e673ea634475c62c6ecc39713b67f1591e6323fe6a771c309225bcd1dd2c0192f38fe0e95887
--- 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()
 
--- 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