Compare commits

...
Sign in to create a new pull request.

5 commits

Author SHA1 Message Date
Fedora Release Engineering
bf3f776f6d Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 09:40:52 +00:00
Jerry James
31ad5ad8c3 Use the cmake declarative buildsystem 2026-07-14 19:34:30 -06:00
Jerry James
fde328aafb Version 3.7.1 2026-04-03 10:16:25 -06:00
Fedora Release Engineering
7fe9e53280 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 21:08:30 +00:00
Jerry James
e4006e879e Reflow the description text
- Be more precise about globbing in %files
2026-01-14 08:54:26 -07:00
3 changed files with 28 additions and 26 deletions

View file

@ -1 +1 @@
SHA512 (zimpl-3.7.0.tar.gz) = 1bdf3255ffd453b2d885c7dc7faa9ff70491fafb72c57d054ab1e673ea634475c62c6ecc39713b67f1591e6323fe6a771c309225bcd1dd2c0192f38fe0e95887 SHA512 (zimpl-3.7.1.tar.gz) = a94eba1ec9d7947d30c948599092100f5f1d6be509967f947154141a7718e054e398860fbfba34bb2e0dd129f58fd168d1087023ffe3215f7d498e829e38afc9

View file

@ -1,5 +1,5 @@
--- zimpl-3.7.0/CMakeLists.txt.orig 2025-11-23 05:19:53.000000000 -0700 --- zimpl-3.7.1/CMakeLists.txt.orig 2026-03-31 18:33:37.000000000 -0600
+++ zimpl-3.7.0/CMakeLists.txt 2025-11-23 13:14:26.606931058 -0700 +++ zimpl-3.7.1/CMakeLists.txt 2026-04-03 09:07:34.324781686 -0600
@@ -49,8 +49,6 @@ endif() @@ -49,8 +49,6 @@ endif()
# use C99 standard # use C99 standard
@ -8,10 +8,10 @@
-set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) -set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
option(ZLIB "use ZLIB" ON) option(ZLIB "use ZLIB" ON)
option(SANITIZE_ADDRESS "should the address sanitizer be enabled in debug mode if available" OFF) option(SANITIZE "should sanitizers be enabled if available" OFF)
--- zimpl-3.7.0/src/CMakeLists.txt.orig 2025-11-23 05:19:53.000000000 -0700 --- zimpl-3.7.1/src/CMakeLists.txt.orig 2026-03-31 18:33:37.000000000 -0600
+++ zimpl-3.7.0/src/CMakeLists.txt 2025-11-23 13:15:22.276583290 -0700 +++ zimpl-3.7.1/src/CMakeLists.txt 2026-04-03 09:10:52.288477757 -0600
@@ -119,12 +119,10 @@ if(MSVC) @@ -118,12 +118,10 @@ if(MSVC)
endif() endif()
#create zimpl with pic #create zimpl with pic
@ -24,11 +24,11 @@
+add_library(libzimpl SHARED ${libsources}) +add_library(libzimpl SHARED ${libsources})
+set_target_properties(libzimpl PROPERTIES +set_target_properties(libzimpl PROPERTIES
+ POSITION_INDEPENDENT_CODE on + POSITION_INDEPENDENT_CODE on
+ VERSION 0.0.0 SOVERSION 0) + VERSION 0.0.0 SOVERSION 0)
target_link_libraries(libzimpl ${libs}) target_link_libraries(libzimpl ${libs})
#create zimpl binary #create zimpl binary
@@ -141,16 +139,13 @@ endif() @@ -138,9 +136,6 @@ endif()
set_target_properties(libzimpl PROPERTIES set_target_properties(libzimpl PROPERTIES
OUTPUT_NAME "zimpl") OUTPUT_NAME "zimpl")
@ -38,7 +38,8 @@
include(GNUInstallDirs) include(GNUInstallDirs)
# install the header files of zimpl # 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 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 libzimpl-pic EXPORT zimpl-targets
@ -55,8 +56,8 @@
FILE "${CMAKE_BINARY_DIR}/zimpl-targets.cmake") FILE "${CMAKE_BINARY_DIR}/zimpl-targets.cmake")
#configure the config file for the build tree #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.1/src/zimpl/zimpllib.c.orig 2026-03-31 18:33:37.000000000 -0600
+++ zimpl-3.7.0/src/zimpl/zimpllib.c 2025-11-23 13:14:26.607519615 -0700 +++ 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 @@ -455,3 +455,66 @@ bool zpl_read_with_args(char** argv, int
return ret; return ret;
@ -124,8 +125,8 @@
+{ +{
+ abort(); + abort();
+} +}
--- zimpl-3.7.0/zimpl-config.cmake.in.orig 2025-11-23 05:19:53.000000000 -0700 --- zimpl-3.7.1/zimpl-config.cmake.in.orig 2026-03-31 18:33:37.000000000 -0600
+++ zimpl-3.7.0/zimpl-config.cmake.in 2025-11-23 13:14:26.607724336 -0700 +++ zimpl-3.7.1/zimpl-config.cmake.in 2026-04-03 09:07:34.325434322 -0600
@@ -3,7 +3,7 @@ if(NOT TARGET libzimpl) @@ -3,7 +3,7 @@ if(NOT TARGET libzimpl)
endif() endif()

View file

@ -1,7 +1,7 @@
%global giturl https://github.com/scipopt/zimpl %global giturl https://github.com/scipopt/zimpl
Name: zimpl Name: zimpl
Version: 3.7.0 Version: 3.7.1
Release: %autorelease Release: %autorelease
Summary: Zuse Institut Mathematical Programming Language Summary: Zuse Institut Mathematical Programming Language
@ -33,9 +33,9 @@ Patch: %{name}-test-bsearch.patch
# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86} ExcludeArch: %{ix86}
BuildSystem: cmake
BuildRequires: bison BuildRequires: bison
BuildRequires: cmake
BuildRequires: flex BuildRequires: flex
BuildRequires: gcc BuildRequires: gcc
BuildRequires: pkgconfig(gmp) BuildRequires: pkgconfig(gmp)
@ -74,33 +74,34 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: libzimpl%{?_isa} = %{version}-%{release} Requires: libzimpl%{?_isa} = %{version}-%{release}
%description -n libzimpl-devel %description -n libzimpl-devel
This package contains headers and library links for developing This package contains headers and library links for developing applications
applications that use libzimpl. that use libzimpl.
%prep %prep
%autosetup -p1 %autosetup -p1
%conf
# Avoid warnings about obsolete invocations of grep # Avoid warnings about obsolete invocations of grep
sed -i 's/fgrep/grep -F/' check/check.sh sed -i 's/fgrep/grep -F/' check/check.sh
%build %conf -p
export CFLAGS='%{build_cflags} -DFREEMEM -DNO_MSHELL' export CFLAGS='%{build_cflags} -DFREEMEM -DNO_MSHELL'
export CXXFLAGS='%{build_cxxflags} -DFREEMEM -DNO_MSHELL' export CXXFLAGS='%{build_cxxflags} -DFREEMEM -DNO_MSHELL'
%cmake
%cmake_build
%install %install -a
%cmake_install
mkdir -p %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}%{_mandir}/man1
cp -p doc/zimpl.man %{buildroot}%{_mandir}/man1/zimpl.1 cp -p doc/zimpl.man %{buildroot}%{_mandir}/man1/zimpl.1
# We do this in %%files with the %%license macro # We do this in %%files with the %%license macro
rm -fr %{buildroot}%{_datadir}/licenses 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
%check
# FIXME: Test qubo.zpl (qbo: lp) fails on ppc64le # FIXME: Test qubo.zpl (qbo: lp) fails on ppc64le
%ifnarch %{power64} %ifnarch %{power64}
%check
export LD_LIBRARY_PATH=%{buildroot}%{_libdir} export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
cd check cd check
sh check.sh ../%{_vpath_builddir}/bin/zimpl sh check.sh ../%{_vpath_builddir}/bin/zimpl
@ -115,7 +116,7 @@ cd -
%files -n libzimpl %files -n libzimpl
%doc CHANGELOG README %doc CHANGELOG README
%license LICENSE %license LICENSE
%{_libdir}/libzimpl.so.0* %{_libdir}/libzimpl.so.0{,.*}
%files -n libzimpl-devel %files -n libzimpl-devel
%{_includedir}/zimpl/ %{_includedir}/zimpl/