From 9bf9193c6cc3e43283a6f69d149c221ec4514986 Mon Sep 17 00:00:00 2001 From: sagitter Date: Apr 22 2019 09:47:01 +0000 Subject: Release 2.11.2|Avoid mixed use of %%doc and %%_pkgdocdir --- diff --git a/.gitignore b/.gitignore index c1166fa..4aea5dc 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /CoinUtils-2.10.11.tgz /CoinUtils-2.10.13.tgz /CoinUtils-2.10.14.tgz +/CoinUtils-2.11.2.tgz diff --git a/coin-or-CoinUtils-docdir.patch b/coin-or-CoinUtils-docdir.patch index 679ae52..ce174fe 100644 --- a/coin-or-CoinUtils-docdir.patch +++ b/coin-or-CoinUtils-docdir.patch @@ -1,6 +1,6 @@ -diff -up CoinUtils-2.10.7/Makefile.in.orig CoinUtils-2.10.7/Makefile.in ---- CoinUtils-2.10.7/Makefile.in.orig 2015-04-12 12:41:33.400603187 -0300 -+++ CoinUtils-2.10.7/Makefile.in 2015-04-12 12:42:12.574604687 -0300 +diff -up a/CoinUtils/Makefile.in.orig b/CoinUtils/Makefile.in +--- a/CoinUtils/Makefile.in.orig 2015-04-12 12:41:33.400603187 -0300 ++++ b/CoinUtils/Makefile.in 2015-04-12 12:42:12.574604687 -0300 @@ -343,7 +343,7 @@ EXTRA_DIST = $(am__append_2) ######################################################################## pkgconfiglibdir = $(libdir)/pkgconfig diff --git a/coin-or-CoinUtils-underlink.patch b/coin-or-CoinUtils-underlink.patch index 8ac7ce4..f02b2b7 100644 --- a/coin-or-CoinUtils-underlink.patch +++ b/coin-or-CoinUtils-underlink.patch @@ -1,6 +1,6 @@ -diff -up CoinUtils-2.9.12/src/Makefile.in.orig CoinUtils-2.9.12/src/Makefile.in ---- CoinUtils-2.9.12/src/Makefile.in.orig 2014-07-16 15:31:03.486596699 -0300 -+++ CoinUtils-2.9.12/src/Makefile.in 2014-07-16 15:38:13.610613170 -0300 +diff -up a/CoinUtils/src/Makefile.in.orig b/CoinUtils/src/Makefile.in +--- a/CoinUtils/src/Makefile.in.orig 2014-07-16 15:31:03.486596699 -0300 ++++ b/CoinUtils/src/Makefile.in 2014-07-16 15:38:13.610613170 -0300 @@ -67,6 +67,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = @DEPENDENCY_LINKING_TRUE@libCoinUtils_la_DEPENDENCIES = \ diff --git a/coin-or-CoinUtils.spec b/coin-or-CoinUtils.spec index 3cd58c1..5aec14b 100644 --- a/coin-or-CoinUtils.spec +++ b/coin-or-CoinUtils.spec @@ -2,16 +2,16 @@ Name: coin-or-%{module} Summary: Coin-or Utilities -Version: 2.10.14 -Release: 3%{?dist} -License: EPL +Version: 2.11.2 +Release: 1%{?dist} +License: EPL-1.0 URL: http://projects.coin-or.org/%{module} Source0: http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz BuildRequires: bzip2-devel BuildRequires: coin-or-Sample BuildRequires: doxygen BuildRequires: gcc, gcc-c++ -BuildRequires: pkgconfig +BuildRequires: pkgconf-pkg-config BuildRequires: readline-devel BuildRequires: zlib-devel @@ -69,8 +69,8 @@ make test %ldconfig_scriptlets %files -%{_docdir}/%{name}/ -%exclude %{_docdir}/%{name}/html +%{_pkgdocdir}/ +%exclude %{_pkgdocdir}/html %license LICENSE %{_libdir}/*.so.* @@ -78,11 +78,17 @@ make test %{_includedir}/coin %{_libdir}/*.so %{_libdir}/pkgconfig/* +%exclude %{_datadir}/coin %files doc -%doc %{_docdir}/%{name}/html +%{_pkgdocdir}/html/ %changelog +* Mon Apr 22 2019 Antonio Trande - 2.11.2-1 +- Release 2.11.2 +- Avoid mixed use of %%doc and %%_pkgdocdir +- Exclude installation of coin/DATA directory + * Thu Jan 31 2019 Fedora Release Engineering - 2.10.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 4d99141..e31b97f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (CoinUtils-2.10.14.tgz) = 307acf65f7c6ba2d11f612bc12403e39aa9ce01688e91b69462bcdd78b744a1a64d77604b414cf0629297bdcfe29978bf20c221b245509d3e78765535610063f +SHA512 (CoinUtils-2.11.2.tgz) = 3382ee08aa351feedffece870763bac4d2b224b8b698b2ff78b3fe7d44230b767d480050f4da37ec97ca28840df9ce517eac1f990d471f9a0446b5840fab3d36