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

[notifications at fedoraproject.org]

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


diff --git a/.gitignore b/.gitignore
index 912841d..24ba0a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /Cgl-0.58.7.tgz
 /Cgl-0.58.9.tgz
 /Cgl-0.59.1.tgz
+/Cgl-0.59.4.tgz
diff --git a/coin-or-Cgl-docdir.patch b/coin-or-Cgl-docdir.patch
index 5b18f2f..1667833 100644
--- a/coin-or-Cgl-docdir.patch
+++ b/coin-or-Cgl-docdir.patch
@@ -1,7 +1,7 @@
-diff -up Cgl-0.58.5/Makefile.in.orig Cgl-0.58.5/Makefile.in
---- Cgl-0.58.5/Makefile.in.orig	2014-01-08 13:22:38.123522362 -0200
-+++ Cgl-0.58.5/Makefile.in	2014-01-08 13:23:09.068523547 -0200
-@@ -380,7 +380,7 @@ EXTRA_DIST = examples/cgl1.cpp examples/
+diff -up Cgl-0.59.4/Makefile.in.orig Cgl-0.59.4/Makefile.in
+--- Cgl-0.59.4/Makefile.in.orig	2015-04-12 14:11:02.402808785 -0300
++++ Cgl-0.59.4/Makefile.in	2015-04-12 14:11:33.432809973 -0300
+@@ -385,7 +385,7 @@ EXTRA_DIST = examples/cgl1.cpp examples/
  ########################################################################
  pkgconfiglibdir = $(libdir)/pkgconfig
  pkgconfiglib_DATA = cgl.pc
@@ -10,12 +10,12 @@ diff -up Cgl-0.58.5/Makefile.in.orig Cgl-0.58.5/Makefile.in
  
  ########################################################################
  #                         Maintainer Stuff                             #
-@@ -390,7 +390,7 @@ CLEANFILES =
+@@ -395,7 +395,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-Cgl-pkgconfig.patch b/coin-or-Cgl-pkgconfig.patch
deleted file mode 100644
index ab66d56..0000000
--- a/coin-or-Cgl-pkgconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up Cgl-0.58.5/Makefile.in.orig Cgl-0.58.5/Makefile.in
---- Cgl-0.58.5/Makefile.in.orig	2013-11-12 03:44:13.000000000 -0200
-+++ Cgl-0.58.5/Makefile.in	2014-01-08 13:17:43.115511065 -0200
-@@ -878,7 +878,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 cgl > $(addlibsdir)/cgl_addlibs.txt
- @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@	echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCgl.lib @CGLLIB_LIBS_INSTALLED@" > $(addlibsdir)/cgl_addlibs.txt
- @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@	echo -L at abs_lib_dir@ -lCgl @CGLLIB_LIBS_INSTALLED@ > $(addlibsdir)/cgl_addlibs.txt
diff --git a/coin-or-Cgl.spec b/coin-or-Cgl.spec
index bca0a84..6e09f71 100644
--- a/coin-or-Cgl.spec
+++ b/coin-or-Cgl.spec
@@ -3,8 +3,8 @@
 Name:		coin-or-%{module}
 Group:		Applications/Engineering
 Summary:	Cut Generation Library
-Version:	0.59.1
-Release:	2%{?dist}
+Version:	0.59.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
@@ -22,11 +22,8 @@ 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
 
 %description
 The COIN-OR Cut Generation Library (Cgl) is a collection of cut generators
@@ -56,7 +53,6 @@ This package contains the documentation for %{name}.
 %prep
 %setup -q -n %{module}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -91,6 +87,9 @@ make test
 %doc %{_docdir}/%{name}/html
 
 %changelog
+* Sun Apr 12 2015 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 0.59.4-1
+- Update to latest upstream release (#1201066)
+
 * Sat Feb 21 2015 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 0.59.1-2
 - Rebuild to ensure using latest C++ abi changes.
 
diff --git a/sources b/sources
index f73273e..d46cdc7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-949aa0bb86a2e096061fc5cc3b7570f4  Cgl-0.59.1.tgz
+8f408bb620a5c8a0d230580e3e9cb500  Cgl-0.59.4.tgz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/coin-or-Cgl.git/commit/?h=master&id=1f59b42f5f8cb1f1416e777fb10bdcae4cc479a2