pcpa pushed to coin-or-Blis (master). "Update to latest upstream release (#1209032)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sun Apr 12 17:36:29 UTC 2015
>From 412cb2110b138763b34f382d6c6f53941a31ac34 Mon Sep 17 00:00:00 2001
From: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date: Sun, 12 Apr 2015 14:36:22 -0300
Subject: Update to latest upstream release (#1209032)
diff --git a/.gitignore b/.gitignore
index 1201b6d..5981837 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/Blis-0.93.11.tgz
/Blis-0.94.0.tgz
+/Blis-0.94.1.tgz
diff --git a/coin-or-Blis-docdir.patch b/coin-or-Blis-docdir.patch
index 2235bd5..73421c5 100644
--- a/coin-or-Blis-docdir.patch
+++ b/coin-or-Blis-docdir.patch
@@ -1,7 +1,7 @@
-diff -up Blis-0.93.11/Makefile.in.orig Blis-0.93.11/Makefile.in
---- Blis-0.93.11/Makefile.in.orig 2014-03-13 13:49:55.715660033 -0300
-+++ Blis-0.93.11/Makefile.in 2014-03-13 13:50:08.835660535 -0300
-@@ -329,7 +329,7 @@ EXTRA_DIST = examples/BlisMain.cpp examp
+diff -up Blis-0.94.1/Makefile.in.orig Blis-0.94.1/Makefile.in
+--- Blis-0.94.1/Makefile.in.orig 2015-04-12 14:33:02.947859353 -0300
++++ Blis-0.94.1/Makefile.in 2015-04-12 14:33:31.593860450 -0300
+@@ -340,7 +340,7 @@ EXTRA_DIST = examples/BlisMain.cpp examp
########################################################################
pkgconfiglibdir = $(libdir)/pkgconfig
pkgconfiglib_DATA = blis.pc
@@ -10,12 +10,12 @@ diff -up Blis-0.93.11/Makefile.in.orig Blis-0.93.11/Makefile.in
########################################################################
# Maintainer Stuff #
-@@ -338,7 +338,7 @@ addlibsdir = $(DESTDIR)$(datadir)/coin/d
+@@ -349,7 +349,7 @@ addlibsdir = $(DESTDIR)$(datadir)/coin/d
# 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-Blis-pkgconfig.patch b/coin-or-Blis-pkgconfig.patch
deleted file mode 100644
index 12f7e43..0000000
--- a/coin-or-Blis-pkgconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up Blis-0.93.11/Makefile.in.orig Blis-0.93.11/Makefile.in
---- Blis-0.93.11/Makefile.in.orig 2014-03-13 13:49:11.795658351 -0300
-+++ Blis-0.93.11/Makefile.in 2014-03-13 13:49:15.547658495 -0300
-@@ -823,7 +823,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 blis > $(addlibsdir)/blis_addlibs.txt
- @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libBlis.lib @BLISLIB_LIBS_INSTALLED@" > $(addlibsdir)/blis_addlibs.txt
- @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@ echo -L at abs_lib_dir@ -lBlis @BLISLIB_LIBS_INSTALLED@ > $(addlibsdir)/blis_addlibs.txt
diff --git a/coin-or-Blis.spec b/coin-or-Blis.spec
index 9accc5f..0f2495e 100644
--- a/coin-or-Blis.spec
+++ b/coin-or-Blis.spec
@@ -3,7 +3,7 @@
Name: coin-or-%{module}
Group: Applications/Engineering
Summary: BLIS (BiCePS Linear Integer Solver)
-Version: 0.94.0
+Version: 0.94.1
Release: 2%{?dist}
License: EPL
URL: http://projects.coin-or.org/CHiPPS
@@ -98,6 +98,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> - 0.94.1-1
+- Update to latest upstream release (#1209032)
+
* Sat Feb 21 2015 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 0.94.0-2
- Rebuild to ensure using latest C++ abi changes.
diff --git a/sources b/sources
index f3606f0..fd43d4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59f1e1be13f7b05a6c67b0b978f1deec Blis-0.94.0.tgz
+7aaf80654a322d50ecbd269e69ec6b03 Blis-0.94.1.tgz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/coin-or-Blis.git/commit/?h=master&id=412cb2110b138763b34f382d6c6f53941a31ac34
More information about the scm-commits
mailing list