pcpa pushed to coin-or-Cbc (master). "Update to latest upstream release (#1201062)"

[notifications at fedoraproject.org]

>From fbd8dac9f9c4cfc360376d6a1617f804c5b5c922 Mon Sep 17 00:00:00 2001
From: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date: Sun, 12 Apr 2015 14:45:26 -0300
Subject: Update to latest upstream release (#1201062)


diff --git a/.gitignore b/.gitignore
index cdea36b..350fdb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /Cbc-2.8.10.tgz
 /Cbc-2.8.12.tgz
 /Cbc-2.9.2.tgz
+/Cbc-2.9.4.tgz
diff --git a/coin-or-Cbc-docdir.patch b/coin-or-Cbc-docdir.patch
index 8e38170..c4d663d 100644
--- a/coin-or-Cbc-docdir.patch
+++ b/coin-or-Cbc-docdir.patch
@@ -1,7 +1,7 @@
-diff -up Cbc-2.8.9/Makefile.in.orig Cbc-2.8.9/Makefile.in
---- Cbc-2.8.9/Makefile.in.orig	2014-03-28 13:17:13.816118260 -0300
-+++ Cbc-2.8.9/Makefile.in	2014-03-28 13:17:35.884119105 -0300
-@@ -478,7 +478,7 @@ EXTRA_DIST = doc/authors.xml doc/cbcexe.
+diff -up Cbc-2.9.4/Makefile.in.orig Cbc-2.9.4/Makefile.in
+--- Cbc-2.9.4/Makefile.in.orig	2015-04-12 14:40:29.731876462 -0300
++++ Cbc-2.9.4/Makefile.in	2015-04-12 14:40:53.497877372 -0300
+@@ -483,7 +483,7 @@ EXTRA_DIST = doc/authors.xml doc/cbcexe.
  ########################################################################
  pkgconfiglibdir = $(libdir)/pkgconfig
  pkgconfiglib_DATA = cbc.pc osi-cbc.pc
@@ -10,12 +10,12 @@ diff -up Cbc-2.8.9/Makefile.in.orig Cbc-2.8.9/Makefile.in
  
  ########################################################################
  #                         Maintainer Stuff                             #
-@@ -488,7 +488,7 @@ CLEANFILES =
+@@ -493,7 +493,7 @@ CLEANFILES =
  # Files that are generated and should be cleaned with make distclean
  DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
- DocFiles = README AUTHORS LICENSE
+ DocFiles = README AUTHORS LICENSE 
 -DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
 +DocInstallDir = $(datadir)/doc/coin-or-$(PACKAGE_NAME)
+ COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE at TRUE
+ COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE at TRUE
  all: all-recursive
- 
- .SUFFIXES:
diff --git a/coin-or-Cbc-pkgconfig.patch b/coin-or-Cbc-pkgconfig.patch
deleted file mode 100644
index f2a28f7..0000000
--- a/coin-or-Cbc-pkgconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up Cbc-2.8.9/Makefile.in.orig Cbc-2.8.9/Makefile.in
---- Cbc-2.8.9/Makefile.in.orig	2014-03-28 13:16:30.738116611 -0300
-+++ Cbc-2.8.9/Makefile.in	2014-03-28 13:16:54.532117522 -0300
-@@ -980,7 +980,7 @@ uninstall-local: uninstall-doc
- 
- install-data-hook:
- 	@$(mkdir_p) "$(addlibsdir)"
-- at COIN_HAS_PKGCONFIG_TRUE@	PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
-+ at COIN_HAS_PKGCONFIG_TRUE@	PKG_CONFIG_PATH=$(DESTDIR)$(pkgconfiglibdir) \
- @COIN_HAS_PKGCONFIG_TRUE@	$(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
- @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@	echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs.txt
- @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@	echo -L at abs_lib_dir@ -lCbcSolver -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
diff --git a/coin-or-Cbc-svnversion.patch b/coin-or-Cbc-svnversion.patch
index 5328919..13fd63b 100644
--- a/coin-or-Cbc-svnversion.patch
+++ b/coin-or-Cbc-svnversion.patch
@@ -1,7 +1,7 @@
-diff -up Cbc-2.8.9/src/CbcSolver.cpp.orig Cbc-2.8.9/src/CbcSolver.cpp
---- Cbc-2.8.9/src/CbcSolver.cpp.orig	2014-03-28 13:18:14.586120587 -0300
-+++ Cbc-2.8.9/src/CbcSolver.cpp	2014-03-28 13:18:48.302121879 -0300
-@@ -1862,8 +1862,8 @@ int CbcMain1 (int argc, const char *argv
+diff -up Cbc-2.9.4/src/CbcSolver.cpp.orig Cbc-2.9.4/src/CbcSolver.cpp
+--- Cbc-2.9.4/src/CbcSolver.cpp.orig	2015-04-12 14:41:21.421878442 -0300
++++ Cbc-2.9.4/src/CbcSolver.cpp	2015-04-12 14:41:31.088878812 -0300
+@@ -1877,8 +1877,8 @@ int CbcMain1 (int argc, const char *argv
  	    sprintf(generalPrint + strlen(generalPrint),
  		    "Build Date: %s \n", __DATE__);
  #ifdef CBC_SVN_REV
diff --git a/coin-or-Cbc.spec b/coin-or-Cbc.spec
index 5b0b80c..46844e9 100644
--- a/coin-or-Cbc.spec
+++ b/coin-or-Cbc.spec
@@ -3,8 +3,8 @@
 Name:		coin-or-%{module}
 Group:		Applications/Engineering
 Summary:	Coin-or branch and cut
-Version:	2.9.2
-Release:	5%{?dist}
+Version:	2.9.4
+Release:	1%{?dist}
 License:	EPL
 URL:		http://projects.coin-or.org/%{module}
 Source0:	http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz
@@ -111,6 +111,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test
 %doc %{_docdir}/%{name}/html
 
 %changelog
+* Sun Apr 12 2015 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 2.9.4-1
+- Update to latest upstream release (#1201062)
+
 * Sun Mar  1 2015 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 2.9.2-5
 - Install CbcParam.hpp not CbcParam.cpp.
 
diff --git a/sources b/sources
index 535cb0c..3cc54cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1cd4f7891f7478f9e1b8df3b326fb5ce  Cbc-2.9.2.tgz
+b23597f160acb4beb7e3bd815ffd6c50  Cbc-2.9.4.tgz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/coin-or-Cbc.git/commit/?h=master&id=fbd8dac9f9c4cfc360376d6a1617f804c5b5c922