Notification time stamped 2021-01-19 22:22:15 UTC
From 430019e7440a38f6d40ff0e1d92403813c1bb460 Mon Sep 17 00:00:00 2001 From: Jerry James loganjerry@gmail.com Date: Jan 19 2021 22:21:55 +0000 Subject: Version 5.0.
- Drop upstreamed -sagemath patch. - Verify the source tarball.
---
diff --git a/.gitignore b/.gitignore index cf7ec57..7265dca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .build-*fc*.log /glpk-*.tar.gz +/glpk-*.tar.gz.sig diff --git a/glpk-4.65-sagemath.patch b/glpk-4.65-sagemath.patch deleted file mode 100644 index ea2f98d..0000000 --- a/glpk-4.65-sagemath.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urN glpk-4.65.orig/src/draft/glpios03.c glpk-4.65/src/draft/glpios03.c ---- glpk-4.65.orig/src/draft/glpios03.c 2018-02-16 00:00:00.000000000 -0700 -+++ glpk-4.65/src/draft/glpios03.c 2018-05-20 19:12:13.883278772 -0600 -@@ -920,13 +920,10 @@ int ios_driver(glp_tree *T) - #if 0 - ((glp_iocp *)T->parm)->msg_lev = GLP_MSG_DBG; - #endif --#if 1 /* 16/III-2016 */ -+#if 1 /* 01/III-2018 */ - if (((glp_iocp *)T->parm)->flip) --#if 0 /* 20/I-2018 */ -- xprintf("WARNING: LONG-STEP DUAL SIMPLEX WILL BE USED\n"); --#else -- xprintf("Long-step dual simplex will be used\n"); --#endif -+ if (T->parm->msg_lev >= GLP_MSG_ALL) -+ xprintf("Long-step dual simplex will be used\n"); - #endif - /* on entry to the B&B driver it is assumed that the active list - contains the only active (i.e. root) subproblem, which is the diff --git a/glpk-4.65-unbundle-zlib.patch b/glpk-4.65-unbundle-zlib.patch index 9d36877..7760235 100644 --- a/glpk-4.65-unbundle-zlib.patch +++ b/glpk-4.65-unbundle-zlib.patch @@ -1,6 +1,6 @@ -diff -urN glpk-4.65.orig/doc/glpk11.tex glpk-4.65/doc/glpk11.tex ---- glpk-4.65.orig/doc/glpk11.tex 2018-02-16 00:00:00.000000000 -0700 -+++ glpk-4.65/doc/glpk11.tex 2018-05-20 18:44:07.252528992 -0600 +diff -urN glpk-5.0/doc/glpk11.tex.orig glpk-5.0/doc/glpk11.tex +--- glpk-5.0/doc/glpk11.tex.orig 2020-12-16 02:00:00.000000000 -0700 ++++ glpk-5.0/doc/glpk11.tex 2020-12-16 12:09:41.511487499 -0700 @@ -158,50 +158,4 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE \noindent \url{http://www.cs.chalmers.se/Cs/Research/FormalMethods/MiniSat%7D @@ -52,10 +52,10 @@ diff -urN glpk-4.65.orig/doc/glpk11.tex glpk-4.65/doc/glpk11.tex -\url{http://www.zlib.net/%7D - %* eof *% -diff -urN glpk-4.65.orig/src/env/stream.c glpk-4.65/src/env/stream.c ---- glpk-4.65.orig/src/env/stream.c 2018-02-16 00:00:00.000000000 -0700 -+++ glpk-4.65/src/env/stream.c 2018-05-20 18:44:07.252528992 -0600 -@@ -22,7 +22,7 @@ +diff -urN glpk-5.0/src/env/stream.c.orig glpk-5.0/src/env/stream.c +--- glpk-5.0/src/env/stream.c.orig 2020-12-16 02:00:00.000000000 -0700 ++++ glpk-5.0/src/env/stream.c 2020-12-16 12:09:41.512487497 -0700 +@@ -20,7 +20,7 @@ ***********************************************************************/
#include "env.h" @@ -64,9 +64,9 @@ diff -urN glpk-4.65.orig/src/env/stream.c glpk-4.65/src/env/stream.c
struct glp_file { /* sequential stream descriptor */ -diff -urN glpk-4.65.orig/src/Makefile.am glpk-4.65/src/Makefile.am ---- glpk-4.65.orig/src/Makefile.am 2018-02-16 00:00:00.000000000 -0700 -+++ glpk-4.65/src/Makefile.am 2018-05-20 18:45:01.472363924 -0600 +diff -urN glpk-5.0/src/Makefile.am.orig glpk-5.0/src/Makefile.am +--- glpk-5.0/src/Makefile.am.orig 2020-12-16 02:00:00.000000000 -0700 ++++ glpk-5.0/src/Makefile.am 2020-12-16 12:10:39.371368555 -0700 @@ -18,14 +18,15 @@ libglpk_la_CPPFLAGS = \ -I$(srcdir)/mpl \ -I$(srcdir)/npp \ @@ -76,7 +76,7 @@ diff -urN glpk-4.65.orig/src/Makefile.am glpk-4.65/src/Makefile.am +-I$(srcdir)/simplex
libglpk_la_LDFLAGS = \ - -version-info 43:0:3 \ + -version-info 43:1:3 \ -export-symbols-regex '^glp_*' \ ${NOUNDEFINED}
diff --git a/glpk.spec b/glpk.spec index 60086a9..5b35c2d 100644 --- a/glpk.spec +++ b/glpk.spec @@ -1,11 +1,14 @@ Name: glpk -Version: 4.65 -Release: 7%{?dist} +Version: 5.0 +Release: 1%{?dist} Summary: GNU Linear Programming Kit
License: GPLv3+ -URL: http://www.gnu.org/software/glpk/glpk.html -Source0: ftp://ftp.gnu.org/gnu/glpk/glpk-%{version}.tar.gz +URL: https://www.gnu.org/software/glpk/glpk.html +Source0: https://ftp.gnu.org/gnu/glpk/glpk-%%7Bversion%7D.tar.gz +Source1: https://ftp.gnu.org/gnu/glpk/glpk-%%7Bversion%7D.tar.gz.sig +# Public key 0x5981E818, Andrew Makhorin mao@mai2.rcnet.ru +Source2: gpgkey-D17BF2305981E818.gpg # Un-bundle zlib (#1102855). Upstream won't accept; they want to be # ANSI-compatible, and zlib makes POSIX assumptions. Patch0: %{name}-4.65-unbundle-zlib.patch @@ -13,13 +16,12 @@ Patch0: %{name}-4.65-unbundle-zlib.patch Patch1: %{name}-4.65-unbundle-suitesparse.patch # Fix violations of the ANSI C strict aliasing rules Patch2: %{name}-4.65-alias.patch -# See http://lists.gnu.org/archive/html/bug-glpk/2018-03/msg00000.html -Patch3: %{name}-4.65-sagemath.patch
BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: gmp-devel +BuildRequires: gnupg2 BuildRequires: make BuildRequires: pkgconfig(libiodbc) BuildRequires: pkgconfig(mariadb) @@ -72,13 +74,13 @@ that uses GLPK (GNU Linear Programming Kit).
%prep -%setup -q -%patch0 -p1 -b .system-zlib -rm -rf src/zlib -%patch1 -p1 -b .system-suitesparse -rm -fr src/{amd,colamd} -%patch2 -p1 -b .alias -%patch3 -p1 -b .sagemath +# Verify the source file +%{gpgverify} --data=%{SOURCE0} --signature=%{SOURCE1} --keyring=%{SOURCE2} + +%autosetup -p1 + +# Unbundle zlib and suitesparse +rm -fr src/{amd,colamd,zlib}
%build export LIBS=-ldl @@ -107,27 +109,30 @@ make check ## Clean up directories that are included in docs rm -Rf examples/{.deps,.libs,Makefile*,glpsol,glpsol.o} doc/*.tex
-%ldconfig_scriptlets - %files %doc README %license COPYING -%{_libdir}/*.so.* +%{_libdir}/libglpk.so.40* %exclude %{_libdir}/*.la
%files devel %doc ChangeLog AUTHORS NEWS %{_includedir}/glpk.h -%{_libdir}/*.so +%{_libdir}/libglpk.so
%files utils -%{_bindir}/* +%{_bindir}/glpsol
%files doc %doc doc examples
%changelog +* Tue Jan 19 2021 Jerry James loganjerry@gmail.com - 5.0-1 +- Version 5.0 +- Drop upstreamed -sagemath patch +- Verify the source tarball + * Sat Aug 01 2020 Fedora Release Engineering releng@fedoraproject.org - 4.65-7 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/gpgkey-D17BF2305981E818.gpg b/gpgkey-D17BF2305981E818.gpg new file mode 100644 index 0000000..4df1cc3 Binary files /dev/null and b/gpgkey-D17BF2305981E818.gpg differ diff --git a/sources b/sources index 28f12ce..8e08923 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (glpk-4.65.tar.gz) = 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375 +SHA512 (glpk-5.0.tar.gz) = 4e92195fa058c707146f2690f3a38b46c33add948c852f67659ca005a6aa980bbf97be96528b0f8391690facb880ac2126cd60198c6c175e7f3f06cca7e29f9d +SHA512 (glpk-5.0.tar.gz.sig) = ca3103b4531880b081b53ead74ecedce9ddcd0567d33455ddfbe33f92a8a71ebe74d83c192afd15b6d88f5ca22c82611f7a24f1ed34ad5f3d40d728e87813fef
https://src.fedoraproject.org/rpms/glpk/c/430019e7440a38f6d40ff0e1d92403813c...
scm-commits@lists.fedoraproject.org