From 3ad536579b48929c3818ac13bd26999fb4a002e377cda7ae0d907d248d6edf0f Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 22 Jan 2021 07:32:04 +0000 Subject: [PATCH] Accepting request 865494 from home:alois:branches:science - Update to version 5.0 * The copyright was transferred to the Free Software Foundation. * To fix some licensing problems the routines in the following files were disabled by replacing with dummy ones that print an error message: + src/api/gridgen.c + src/api/netgen.c + src/api/rmfgen.c + src/misc/qmd.c + src/misc/relax4.c + Note that this change does not affect the main functionality of the package. * Some minor bugs were fixed. - Added pkgconfig file OBS-URL: https://build.opensuse.org/request/show/865494 OBS-URL: https://build.opensuse.org/package/show/science/glpk?expand=0&rev=50 --- glpk-4.65.tar.gz | 3 --- glpk-4.65.tar.gz.sig | Bin 65 -> 0 bytes glpk-5.0.tar.gz | 3 +++ glpk-5.0.tar.gz.sig | Bin 0 -> 65 bytes glpk.changes | 18 ++++++++++++++++++ glpk.keyring | 1 + glpk.spec | 23 +++++++++++++++++++---- 7 files changed, 41 insertions(+), 7 deletions(-) delete mode 100644 glpk-4.65.tar.gz delete mode 100644 glpk-4.65.tar.gz.sig create mode 100644 glpk-5.0.tar.gz create mode 100644 glpk-5.0.tar.gz.sig diff --git a/glpk-4.65.tar.gz b/glpk-4.65.tar.gz deleted file mode 100644 index 1e4385b..0000000 --- a/glpk-4.65.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4281e29b628864dfe48d393a7bedd781e5b475387c20d8b0158f329994721a10 -size 4167110 diff --git a/glpk-4.65.tar.gz.sig b/glpk-4.65.tar.gz.sig deleted file mode 100644 index 789922c3508c9d8f788228061575522b2a046a08d0a74895c93943712c759bd8..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmV-H0KWf-KLZ5-T85s~(R=bRS%K&n5d!D<0G$*M$Q2jCmyT~WZ1d!rWOL~F0(StP Xc+*Bu0U10TqYZlVXKzO6vCySupHdw~ diff --git a/glpk-5.0.tar.gz b/glpk-5.0.tar.gz new file mode 100644 index 0000000..d257e4c --- /dev/null +++ b/glpk-5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a1013eebb50f728fc601bdd833b0b2870333c3b3e5a816eeba921d95bec6f15 +size 4132649 diff --git a/glpk-5.0.tar.gz.sig b/glpk-5.0.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..3cc950e49f7335fbd1933486b003ae31fcc4a638012ba895a22eded6256cd9ee GIT binary patch literal 65 zcmV-H0KWf-KLZ5-U)mQZ(R=bRS%K&n5d!J_0H1JQ*vU^QO0JtS5TG#i5-Y!XSFiw} Xm7)YR!0%rC=M}nXG0bL~j4>52f;Aji literal 0 HcmV?d00001 diff --git a/glpk.changes b/glpk.changes index d0712bb..8c644ea 100644 --- a/glpk.changes +++ b/glpk.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Jan 21 18:31:45 UTC 2021 - Luigi Baldoni + +- Update to version 5.0 + * The copyright was transferred to the Free Software Foundation. + * To fix some licensing problems the routines in the following + files were disabled by replacing with dummy ones that print an + error message: + + src/api/gridgen.c + + src/api/netgen.c + + src/api/rmfgen.c + + src/misc/qmd.c + + src/misc/relax4.c + + Note that this change does not affect the main functionality + of the package. + * Some minor bugs were fixed. +- Added pkgconfig file + ------------------------------------------------------------------- Mon Feb 3 15:28:09 UTC 2020 - Martin Pluskal diff --git a/glpk.keyring b/glpk.keyring index fc6a78d..059ec21 100644 --- a/glpk.keyring +++ b/glpk.keyring @@ -1,3 +1,4 @@ +GPG keys of Andrew Makhorin -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.2.2 (MingW32) diff --git a/glpk.spec b/glpk.spec index abf2414..3131aff 100644 --- a/glpk.spec +++ b/glpk.spec @@ -1,7 +1,7 @@ # # spec file for package glpk # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define sover 40 %define lname libglpk%{sover} Name: glpk -Version: 4.65 +Version: 5.0 Release: 0 Summary: GNU Linear Programming Kit License: GPL-3.0-only @@ -34,6 +34,7 @@ BuildRequires: gmp-devel BuildRequires: libiodbc-devel BuildRequires: libmariadb-devel BuildRequires: libtool +BuildRequires: pkgconfig BuildRequires: texlive %description @@ -66,9 +67,7 @@ callable library. %package doc Summary: GNU Linear Programming Kit Group: Documentation/Other -%if 0%{?suse_version} >= 1120 || 0%{?fedora_version} BuildArch: noarch -%endif %description doc The GLPK package is intended for solving large-scale linear @@ -101,6 +100,21 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %make_install find %{buildroot} -type f -name "*.la" -delete -print +# creates support file for pkg-config +mkdir -p %{buildroot}/%{_libdir}/pkgconfig +tee %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc << "EOF" +prefix=%{_prefix} +exec_prefix=${prefix} +libdir=${exec_prefix}/%{_lib} +includedir=${prefix}/include + +Name: %{name} +Description: GNU Linear Programming Kit +Version: %{version} +Libs: -lglpk +Cflags: -I${includedir} +EOF + %check make %{?_smp_mflags} check @@ -117,6 +131,7 @@ make %{?_smp_mflags} check %files devel %{_includedir}/* %{_libdir}/libglpk.so +%{_libdir}/pkgconfig/%{name}.pc %files doc %doc ChangeLog NEWS README