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

[notifications at fedoraproject.org]

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


diff --git a/.gitignore b/.gitignore
index acf1959..625143b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /DyLP-1.9.4.tgz
+/DyLP-1.10.1.tgz
diff --git a/coin-or-DyLP-docdir.patch b/coin-or-DyLP-docdir.patch
index 1516146..2886fb3 100644
--- a/coin-or-DyLP-docdir.patch
+++ b/coin-or-DyLP-docdir.patch
@@ -1,7 +1,7 @@
-diff -up DyLP-1.9.4/Makefile.in.orig DyLP-1.9.4/Makefile.in
---- DyLP-1.9.4/Makefile.in.orig	2014-03-28 13:47:28.177187739 -0300
-+++ DyLP-1.9.4/Makefile.in	2014-03-28 13:47:51.834188645 -0300
-@@ -351,7 +351,7 @@ EXTRA_DIST = AUTHORS LICENSE README NEWS
+diff -up DyLP-1.10.1/Makefile.in.orig DyLP-1.10.1/Makefile.in
+--- DyLP-1.10.1/Makefile.in.orig	2015-04-12 14:48:42.651895338 -0300
++++ DyLP-1.10.1/Makefile.in	2015-04-12 14:49:31.569897211 -0300
+@@ -356,7 +356,7 @@ EXTRA_DIST = AUTHORS LICENSE README NEWS
  ########################################################################
  pkgconfiglibdir = $(libdir)/pkgconfig
  pkgconfiglib_DATA = dylp.pc $(am__append_3)
@@ -10,12 +10,12 @@ diff -up DyLP-1.9.4/Makefile.in.orig DyLP-1.9.4/Makefile.in
  
  ########################################################################
  #                         Maintainer Stuff                             #
-@@ -363,7 +363,7 @@ ACLOCAL_AMFLAGS = -I m4
+@@ -368,7 +368,7 @@ ACLOCAL_AMFLAGS = -I m4
  # Files that are generated and should be cleaned with make distclean
  DISTCLEANFILES = $(am__append_5) $(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-DyLP-pkgconfig.patch b/coin-or-DyLP-pkgconfig.patch
deleted file mode 100644
index 2dd4507..0000000
--- a/coin-or-DyLP-pkgconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up DyLP-1.9.4/Makefile.in.orig DyLP-1.9.4/Makefile.in
---- DyLP-1.9.4/Makefile.in.orig	2013-11-15 00:38:40.000000000 -0200
-+++ DyLP-1.9.4/Makefile.in	2014-03-28 13:47:28.177187739 -0300
-@@ -875,7 +875,7 @@ maintainer-clean-local: distclean-local
- 
- 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 dylp > $(addlibsdir)/dylp_addlibs.txt
- @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@	echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libDyLP.lib @DYLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/dylp_addlibs.txt
- @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@	echo -L at abs_lib_dir@ -lDyLP @DYLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/dylp_addlibs.txt
diff --git a/coin-or-DyLP.spec b/coin-or-DyLP.spec
index 38f118e..7f2768f 100644
--- a/coin-or-DyLP.spec
+++ b/coin-or-DyLP.spec
@@ -3,8 +3,8 @@
 Name:		coin-or-%{module}
 Group:		Applications/Engineering
 Summary:	Implementation of the dynamic simplex algorithm
-Version:	1.9.4
-Release:	4%{?dist}
+Version:	1.10.1
+Release:	1%{?dist}
 License:	EPL
 URL:		http://projects.coin-or.org/%{module}
 Source0:	http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz
@@ -21,11 +21,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
 DyLP is an implementation of the dynamic simplex algorithm. Briefly, dynamic
@@ -57,7 +54,6 @@ This package contains the documentation for %{name}.
 %prep
 %setup -q -n %{module}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 # silence doxygen deprecation warnings
 sed -i 's/^\(SYMBOL_CACHE_SIZE\|SHOW_DIRECTORIES\|HTML_ALIGN_MEMBERS\|USE_INLINE_TREES\|DOT_FONTNAME\)/#\1/g' doxydoc/doxygen.conf.in
@@ -95,6 +91,9 @@ make test
 %doc %{_docdir}/%{name}/html
 
 %changelog
+* Sun Apr 12 2015 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 1.10.1-1
+- Update to latest upstream release (#1089926)
+
 * Sat Feb 21 2015 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 1.9.4-4
 - Rebuild to ensure using latest C++ abi changes.
 
diff --git a/sources b/sources
index 0e76962..00804b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1375fdc61a294f35da3e52585f497c6a  DyLP-1.9.4.tgz
+f95896b55c87e373cc9bd4909b741d3d  DyLP-1.10.1.tgz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/coin-or-DyLP.git/commit/?h=master&id=16e91e581c512c105b08b9209df796f888d81482