diff --git a/.gitignore b/.gitignore index 4364e82..65b7f88 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /Cgl-*.tgz +/Cgl-*.tar.gz diff --git a/coin-or-Cgl-docdir.patch b/coin-or-Cgl-docdir.patch index ecc149c..2e4706e 100644 --- a/coin-or-Cgl-docdir.patch +++ b/coin-or-Cgl-docdir.patch @@ -1,7 +1,7 @@ -diff -up Cgl-0.60.2/configure.orig Cgl-0.60.2/configure ---- Cgl-0.60.2/configure.orig 2019-04-21 22:38:29.000000000 -0600 -+++ Cgl-0.60.2/configure 2019-06-21 11:27:23.029627455 -0600 -@@ -26844,7 +26844,7 @@ echo "${ECHO_T}$doxysrcdir (src)" >&6 +diff -up Cgl-releases-0.60.3/Cgl/configure.orig Cgl-releases-0.60.3/Cgl/configure +--- Cgl-releases-0.60.3/Cgl/configure.orig 2020-01-31 04:11:21.000000000 -0700 ++++ Cgl-releases-0.60.3/Cgl/configure 2020-02-20 11:15:24.436541363 -0700 +@@ -26889,7 +26889,7 @@ echo "${ECHO_T}$doxysrcdir (src)" >&6 fi # Not built, fall back to installed tag file if test $doxyfound = no ; then @@ -10,10 +10,10 @@ diff -up Cgl-0.60.2/configure.orig Cgl-0.60.2/configure # AC_MSG_NOTICE([Considering $doxydir (install)]) # AC_MSG_NOTICE([Subdirs: $coin_subdirs)]) coin_doxy_tagfiles="$coin_doxy_tagfiles $doxydir/$doxytag=$doxydir/html" -diff -up Cgl-0.60.2/Makefile.in.orig Cgl-0.60.2/Makefile.in ---- Cgl-0.60.2/Makefile.in.orig 2016-02-01 14:05:58.000000000 -0700 -+++ Cgl-0.60.2/Makefile.in 2019-06-21 11:26:44.352289564 -0600 -@@ -385,7 +385,7 @@ EXTRA_DIST = examples/cgl1.cpp examples/ +diff -up Cgl-releases-0.60.3/Cgl/Makefile.in.orig Cgl-releases-0.60.3/Cgl/Makefile.in +--- Cgl-releases-0.60.3/Cgl/Makefile.in.orig 2020-01-31 04:11:21.000000000 -0700 ++++ Cgl-releases-0.60.3/Cgl/Makefile.in 2020-02-20 11:15:24.437541346 -0700 +@@ -386,7 +386,7 @@ EXTRA_DIST = examples/cgl1.cpp examples/ ######################################################################## pkgconfiglibdir = $(libdir)/pkgconfig pkgconfiglib_DATA = cgl.pc @@ -22,7 +22,7 @@ diff -up Cgl-0.60.2/Makefile.in.orig Cgl-0.60.2/Makefile.in ######################################################################## # Maintainer Stuff # -@@ -395,7 +395,7 @@ CLEANFILES = +@@ -396,7 +396,7 @@ CLEANFILES = # Files that are generated and should be cleaned with make distclean DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES) DocFiles = README AUTHORS LICENSE diff --git a/coin-or-Cgl-uninit.patch b/coin-or-Cgl-uninit.patch index 372375c..fd7245f 100644 --- a/coin-or-Cgl-uninit.patch +++ b/coin-or-Cgl-uninit.patch @@ -1,6 +1,7 @@ ---- Cgl-0.60.2/src/CglPreProcess/CglPreProcess.cpp.orig 2019-02-15 03:59:50.000000000 -0700 -+++ Cgl-0.60.2/src/CglPreProcess/CglPreProcess.cpp 2019-06-19 13:58:26.240736878 -0600 -@@ -4449,7 +4449,9 @@ CglPreProcess::modified(OsiSolverInterfa +diff -up Cgl-releases-0.60.3/Cgl/src/CglPreProcess/CglPreProcess.cpp.orig Cgl-releases-0.60.3/Cgl/src/CglPreProcess/CglPreProcess.cpp +--- Cgl-releases-0.60.3/Cgl/src/CglPreProcess/CglPreProcess.cpp.orig 2020-01-31 04:11:21.000000000 -0700 ++++ Cgl-releases-0.60.3/Cgl/src/CglPreProcess/CglPreProcess.cpp 2020-02-20 11:15:53.494050170 -0700 +@@ -4458,7 +4458,9 @@ CglPreProcess::modified(OsiSolverInterfa rowNumber[0] = iRow1; rowNumber[1] = iRow2; colLower[0] = 0.0; @@ -10,8 +11,9 @@ #if CBC_USEFUL_PRINTING > 0 binary[0] = 1; int nCol = nBits; ---- Cgl-0.60.2/src/CglTwomir/CglTwomir.cpp.orig 2019-03-15 10:16:04.000000000 -0600 -+++ Cgl-0.60.2/src/CglTwomir/CglTwomir.cpp 2019-06-19 14:00:00.192060362 -0600 +diff -up Cgl-releases-0.60.3/Cgl/src/CglTwomir/CglTwomir.cpp.orig Cgl-releases-0.60.3/Cgl/src/CglTwomir/CglTwomir.cpp +--- Cgl-releases-0.60.3/Cgl/src/CglTwomir/CglTwomir.cpp.orig 2020-01-31 04:11:21.000000000 -0700 ++++ Cgl-releases-0.60.3/Cgl/src/CglTwomir/CglTwomir.cpp 2020-02-20 11:15:53.495050153 -0700 @@ -117,6 +117,7 @@ void CglTwomir::generateCuts(const OsiSo #endif return; diff --git a/coin-or-Cgl.rpmlintrc b/coin-or-Cgl.rpmlintrc new file mode 100644 index 0000000..03f2f25 --- /dev/null +++ b/coin-or-Cgl.rpmlintrc @@ -0,0 +1,5 @@ +# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON +# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors + +# The documentation is in the doc subpackage +addFilter(r'coin-or-Cgl-devel\.[^:]+: W: no-documentation') diff --git a/coin-or-Cgl.spec b/coin-or-Cgl.spec index 26b0acb..8304bd7 100644 --- a/coin-or-Cgl.spec +++ b/coin-or-Cgl.spec @@ -2,17 +2,17 @@ Name: coin-or-%{module} Summary: Cut Generation Library -Version: 0.60.2 -Release: 3%{?dist} +Version: 0.60.3 +Release: 1%{?dist} License: EPL-1.0 URL: https://github.com/coin-or/%{module} -Source0: http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz -BuildRequires: coin-or-Clp-devel +Source0: %{url}/archive/releases/%{version}/%{module}-%{version}.tar.gz BuildRequires: coin-or-CoinUtils-doc -BuildRequires: coin-or-DyLP-devel -BuildRequires: coin-or-Vol-devel BuildRequires: doxygen BuildRequires: gcc-c++ +BuildRequires: pkgconfig(clp) +BuildRequires: pkgconfig(dylp) +BuildRequires: pkgconfig(vol) # Install documentation in standard rpm directory Patch0: %{name}-docdir.patch @@ -45,7 +45,7 @@ BuildArch: noarch This package contains the documentation for %{name}. %prep -%autosetup -p1 -n %{module}-%{version} +%autosetup -p1 -n %{module}-releases-%{version} %build %configure @@ -88,6 +88,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{_docdir}/%{name}/cgl_doxy.tag %changelog +* Fri Feb 21 2020 Jerry James - 0.60.3-1 +- Version 0.60.3 + * Tue Jan 28 2020 Fedora Release Engineering - 0.60.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 82772b5..04eefb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Cgl-0.60.2.tgz) = 36fedb46d483f8fbdb9f35650f22665e17cb5bf97f037dde94b931435a718f0f9eae2ebe1a03ceab9e581625f78b652fbbf6b6c01b490d3207ee4e52cf63c2cc +SHA512 (Cgl-0.60.3.tar.gz) = e34080b893cfe46f99ffee093235618679ed47b6bed9798ea2d0dc0678716d9b8d947a66f6a6b283fe41807eb323dfcb512ba39d8d73fda1efafad92c408be9d