From 81c89291a937ae9af85f40ae047b3a9aaa78a31e Mon Sep 17 00:00:00 2001 From: pcpa Date: Feb 08 2015 20:36:39 +0000 Subject: Update to latest upstream release (#1157434). --- diff --git a/.gitignore b/.gitignore index 7f9092a..23de26e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /CoinUtils-2.9.7.tgz /CoinUtils-2.9.12.tgz /CoinUtils-2.9.15.tgz +/CoinUtils-2.10.2.tgz diff --git a/coin-or-CoinUtils-pkgconfig.patch b/coin-or-CoinUtils-pkgconfig.patch deleted file mode 100644 index 36d637e..0000000 --- a/coin-or-CoinUtils-pkgconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up CoinUtils-2.9.12/Makefile.in.orig CoinUtils-2.9.12/Makefile.in ---- CoinUtils-2.9.12/Makefile.in.orig 2014-07-16 15:29:13.118592473 -0300 -+++ CoinUtils-2.9.12/Makefile.in 2014-07-16 15:29:27.818593035 -0300 -@@ -834,7 +834,7 @@ uninstall-local: uninstall-doc - - install-data-hook: - @$(mkdir_p) "$(addlibsdir)" --@COIN_HAS_PKGCONFIG_TRUE@ PKG_CONFIG_PATH="@COIN_PKG_CONFIG_PATH@" \ -+@COIN_HAS_PKGCONFIG_TRUE@ PKG_CONFIG_PATH=$(DESTDIR)$(pkgconfiglibdir) \ - @COIN_HAS_PKGCONFIG_TRUE@ "$(PKG_CONFIG)" --libs coinutils > $(addlibsdir)/coinutils_addlibs.txt - @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCoinUtils.lib @COINUTILSLIB_LIBS_INSTALLED@" > $(addlibsdir)/coinutils_addlibs.txt - @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@ echo -L@abs_lib_dir@ -lCoinUtils @COINUTILSLIB_LIBS_INSTALLED@ > $(addlibsdir)/coinutils_addlibs.txt diff --git a/coin-or-CoinUtils.spec b/coin-or-CoinUtils.spec index cb6816f..9e9be85 100644 --- a/coin-or-CoinUtils.spec +++ b/coin-or-CoinUtils.spec @@ -3,8 +3,8 @@ Name: coin-or-%{module} Group: Applications/Engineering Summary: Coin-or Utilities -Version: 2.9.15 -Release: 2%{?dist} +Version: 2.10.2 +Release: 1%{?dist} License: EPL URL: http://projects.coin-or.org/%{module} Source0: http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz @@ -15,17 +15,14 @@ BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: zlib-devel -# Properly handle DESTDIR -Patch0: %{name}-pkgconfig.patch - # Install documentation in standard rpm directory -Patch1: %{name}-docdir.patch +Patch0: %{name}-docdir.patch # Correct undefined non weak symbols -Patch2: %{name}-underlink.patch +Patch1: %{name}-underlink.patch # Correct -Werror=format-security -Patch3: %{name}-format.patch +Patch2: %{name}-format.patch %description CoinUtils (Coin-or Utilities) is an open-source collection of classes @@ -40,9 +37,7 @@ These utilities include: %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: bzip2-devel Requires: coin-or-Sample -Requires: zlib-devel Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -63,7 +58,6 @@ This package contains the documentation for %{name}. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build %configure @@ -98,8 +92,8 @@ make test %doc %{_docdir}/%{name}/html %changelog -* Tue Sep 23 2014 David Tardon - 2.9.15-2 -- require all libs that are listed in .pc file +* Sun Feb 08 2015 pcpa - 2.10.2-1 +- Update to latest upstream release (#1157434). * Sat Aug 30 2014 pcpa - 2.9.15-1 - Update to latest upstream release (#1089925#c2). diff --git a/sources b/sources index e3110b1..f71517b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3f24e79d05d127fc928bfb51dc6faa5c CoinUtils-2.9.15.tgz +8d9a30ec166cdb4575024248141a7be7 CoinUtils-2.10.2.tgz