The package rpms/votca-tools.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/votca-tools.git/commit/?id=72e1621c7... https://src.fedoraproject.org/cgit/rpms/votca-tools.git/commit/?id=276919beb....

Change: +%ifarch armv7hl s390x -%ifarch armv7hl s390x

Thanks.

Full change: ============

commit 5d91d0e0f7aed3427d7f246c812b38e719cd44ee Author: Christoph Junghans junghans@votca.org Date: Sat Apr 18 07:28:48 2020 -0600

Version bump to v1.6 (bug #1825474)

diff --git a/.gitignore b/.gitignore index 2b3f3ee..f827973 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /votca-tools-1.5.1.tar.gz /votca-tools-1.6_rc1.tar.gz /votca-tools-1.6_rc2.tar.gz +/votca-tools-1.6.tar.gz diff --git a/sources b/sources index 03b88a6..72db653 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (votca-tools-1.6_rc2.tar.gz) = 16ddf3892bdd052e0a679b72c99ba804884e4a5d1eff5dfe95fa2b2f023d26046a43d43c818272ad4e46cf0196584d9644061bf4f9d2b61ce68c08e7fb711d1c +SHA512 (votca-tools-1.6.tar.gz) = 0159bc10066e05da8ba0f70e3c70d8cb4cd7b07ebd58edff1ccfeb86504af855eb5cae7184200e5c8ee3a3f6b6b85ec46a045f00dc8e681073ae8fdbbfc3965a diff --git a/votca-tools.spec b/votca-tools.spec index 6ed2b41..9fc5566 100644 --- a/votca-tools.spec +++ b/votca-tools.spec @@ -1,12 +1,12 @@ Name: votca-tools -Version: 1.6~rc2 -%global uversion 1.6_rc2 +Version: 1.6 +%global uversion %{version} %global sover 6 Release: 1%{?dist} Summary: VOTCA tools library License: ASL 2.0 URL: http://www.votca.org -Source0: https://github.com/votca/tools/archive/v%%7Buversion%7D.tar.gz#/%%7Bname%7D-... +Source0: https://github.com/votca/tools/archive/v%%7Buversion%7D.tar.gz#/%%7Bname%7D-...

BuildRequires: gcc-c++ BuildRequires: cmake3 @@ -71,6 +71,9 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs} %{_libdir}/cmake/VOTCA_TOOLS

%changelog +* Sat Apr 18 2020 Christoph Junghans junghans@votca.org - 1.6-1 +- Version bump to v1.6 (bug #1825474) + * Mon Feb 10 2020 Christoph Junghans junghans@votca.org - 1.6~rc2-1 - Version bump to 1.6~rc2 - Drop 196.patch, 197.patch and 199.patch - merged upstream

commit a7a6728f9713f977a89a3d400031bbfccdcb0866 Author: Christoph Junghans junghans@votca.org Date: Mon Feb 10 09:23:08 2020 -0700

Version bump to 1.6~rc2

diff --git a/.gitignore b/.gitignore index 2bf1a40..2b3f3ee 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /votca-tools-1.5.tar.gz /votca-tools-1.5.1.tar.gz /votca-tools-1.6_rc1.tar.gz +/votca-tools-1.6_rc2.tar.gz diff --git a/196.patch b/196.patch deleted file mode 100644 index 5e96d1b..0000000 --- a/196.patch +++ /dev/null @@ -1,83 +0,0 @@ -From b159a9453a9db5ebe8968fd87fc843a18d18f5d1 Mon Sep 17 00:00:00 2001 -From: Jens jenswehner@gmail.com -Date: Thu, 5 Dec 2019 14:56:44 +0100 -Subject: [PATCH] smoothing fixed - ---- - src/libtools/linalg.cc | 4 ++-- - src/libtools/table.cc | 8 ++++---- - src/tests/test_table.cc | 4 ++-- - 3 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/libtools/linalg.cc b/src/libtools/linalg.cc -index 871bfa0f..62ea110a 100644 ---- a/src/libtools/linalg.cc -+++ b/src/libtools/linalg.cc -@@ -34,10 +34,10 @@ Eigen::VectorXd linalg_constrained_qrsolve(const Eigen::MatrixXd &A, - } - } - -- const long int NoVariables = A.cols(); -+ const Index NoVariables = A.cols(); - const Index NoConstrains = - constr.rows(); // number of constraints is number of rows of constr -- const long int deg_of_freedom = NoVariables - NoConstrains; -+ const Index deg_of_freedom = NoVariables - NoConstrains; - - Eigen::HouseholderQREigen::MatrixXd QR(constr.transpose()); - -diff --git a/src/libtools/table.cc b/src/libtools/table.cc -index 907febf1..c86f0b98 100644 ---- a/src/libtools/table.cc -+++ b/src/libtools/table.cc -@@ -198,7 +198,7 @@ void Table::Smooth(Index Nsmooth) { - } - for (Index i = 0; i < Nsmooth; i++) { - _y.segment(1, n_2) = -- 0.25 * (_y.head(n_2) + 2 * _y.segment(1, n_2) + _y.tail(n_2)); -+ (0.25 * (_y.head(n_2) + 2 * _y.segment(1, n_2) + _y.tail(n_2))).eval(); - } - } - -@@ -207,7 +207,7 @@ std::ostream &operator<<(std::ostream &out, const Table &t) { - out.precision(10); - - if (t._has_yerr) { -- for (long int i = 0; i < t._x.size(); ++i) { -+ for (Index i = 0; i < t._x.size(); ++i) { - out << t._x[i] << " " << t._y[i] << " " << t._yerr[i]; - if (t._flags[i] == '\0' || t._flags[i] == ' ') { - out << "\n"; -@@ -216,7 +216,7 @@ std::ostream &operator<<(std::ostream &out, const Table &t) { - } - } - } else { -- for (long int i = 0; i < t._x.size(); ++i) { -+ for (Index i = 0; i < t._x.size(); ++i) { - out << t._x[i] << " " << t._y[i]; - if (t._flags[i] == '\0' || t._flags[i] == ' ') { - out << "\n"; -@@ -231,7 +231,7 @@ std::ostream &operator<<(std::ostream &out, const Table &t) { - - // TODO: modify this function to be able to treat _has_yerr == true - void Table::push_back(double x, double y, char flags) { -- long int n = size(); -+ Index n = size(); - resize(n + 1); - _x[n] = x; - _y[n] = y; -diff --git a/src/tests/test_table.cc b/src/tests/test_table.cc -index 7e17952a..1283bc88 100644 ---- a/src/tests/test_table.cc -+++ b/src/tests/test_table.cc -@@ -144,8 +144,8 @@ BOOST_AUTO_TEST_CASE(smoothing_test) { - tb.y() = tb.x().array().sinh(); - tb.Smooth(2); - Eigen::VectorXd refy = Eigen::VectorXd::Zero(9); -- refy << 1.50946, 1.70621, 1.91527, 2.14055, 2.38962, 2.65963, 2.95959, -- 3.28268, 3.62686; -+ refy << 1.50946, 1.70595, 1.91384, 2.13995, 2.38747, 2.65889, 2.95692, -+ 3.28227, 3.62686; - - bool equal = tb.y().isApprox(refy, 1e-5); - diff --git a/197.patch b/197.patch deleted file mode 100644 index a0e4245..0000000 --- a/197.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 32c497808d3ff52a25cd0367c602f57577d56352 Mon Sep 17 00:00:00 2001 -From: Christoph Junghans junghans@votca.org -Date: Thu, 5 Dec 2019 07:16:02 -0700 -Subject: [PATCH] VOTCA_TOOLSConfig.cmake.in: only add VOTCA::votca_compare - once - ---- - src/libtools/VOTCA_TOOLSConfig.cmake.in | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/libtools/VOTCA_TOOLSConfig.cmake.in b/src/libtools/VOTCA_TOOLSConfig.cmake.in -index c69c0426..b129913f 100644 ---- a/src/libtools/VOTCA_TOOLSConfig.cmake.in -+++ b/src/libtools/VOTCA_TOOLSConfig.cmake.in -@@ -2,8 +2,10 @@ include(CMakeFindDependencyMacro) - find_dependency(Eigen3 NO_MODULE) - find_dependency(Boost 1.53.0 REQUIRED COMPONENTS program_options) - include("${CMAKE_CURRENT_LIST_DIR}/VOTCA_TOOLS_Targets.cmake") --add_executable(VOTCA::votca_compare IMPORTED) --set_property(TARGET VOTCA::votca_compare PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_BINDIR@/votca_compare") -+if(NOT TARGET VOTCA::votca_compare) -+ add_executable(VOTCA::votca_compare IMPORTED) -+ set_property(TARGET VOTCA::votca_compare PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_BINDIR@/votca_compare") -+endif() - if(@MKL_FOUND@) - if(NOT TARGET MKL::MKL) - add_library(MKL::MKL UNKNOWN IMPORTED) diff --git a/199.patch b/199.patch deleted file mode 100644 index 975faa7..0000000 --- a/199.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 3590ea64a5804dcee87e61d8a9a9969d918bff26 Mon Sep 17 00:00:00 2001 -From: Jens jenswehner@gmail.com -Date: Tue, 10 Dec 2019 14:18:15 +0100 -Subject: [PATCH 1/3] changed long int to Eigen::Index - ---- - include/votca/tools/types.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/votca/tools/types.h b/include/votca/tools/types.h -index a87537be..24509216 100644 ---- a/include/votca/tools/types.h -+++ b/include/votca/tools/types.h -@@ -18,9 +18,10 @@ - #ifndef _VOTCA_TOOLS_TYPES_H - #define _VOTCA_TOOLS_TYPES_H - -+#include <votca/tools/eigen.h> - namespace votca { - --using Index = long int; -+using Index = Eigen::Index; - - } // namespace votca - - -From bbee4de3dc74743c2377bc9bdd48fbf70986089f Mon Sep 17 00:00:00 2001 -From: Christoph Junghans junghans@lanl.gov -Date: Tue, 10 Dec 2019 09:27:19 -0700 -Subject: [PATCH 2/3] make Edge::getOtherEndPoint index type - ---- - src/libtools/edge.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libtools/edge.cc b/src/libtools/edge.cc -index 47f12249..562f97cf 100644 ---- a/src/libtools/edge.cc -+++ b/src/libtools/edge.cc -@@ -31,7 +31,7 @@ Edge::Edge(Index ID1, Index ID2) { - vertices_ = vector<Index>{min({ID1, ID2}), max({ID1, ID2})}; - } - --long Edge::getOtherEndPoint(Index ver) const { -+Index Edge::getOtherEndPoint(Index ver) const { - if (ver == vertices_.front()) { - return vertices_.back(); - } else { - -From 8e769a337672db4316bda91425cf814e546e5efe Mon Sep 17 00:00:00 2001 -From: Christoph Junghans junghans@lanl.gov -Date: Tue, 10 Dec 2019 09:59:15 -0700 -Subject: [PATCH 3/3] Graph::getDegree index type - ---- - src/libtools/graph.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libtools/graph.cc b/src/libtools/graph.cc -index fce9fc8e..b30b4456 100644 ---- a/src/libtools/graph.cc -+++ b/src/libtools/graph.cc -@@ -134,7 +134,7 @@ void Graph::calcId_() { - return; - } - --long Graph::getDegree(Index vertex) const { -+Index Graph::getDegree(Index vertex) const { - if (edge_container_.vertexExist(vertex)) { - return edge_container_.getDegree(vertex); - } diff --git a/sources b/sources index bc0be50..03b88a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (votca-tools-1.6_rc1.tar.gz) = 42b0eae148bb93293ac16e193d2595aaa850dcee0dcaab1f6cf0ca8e36a95a1719a03243d421fbfb1034c81baf2ef294768a86530f0d69b59862df95846241ed +SHA512 (votca-tools-1.6_rc2.tar.gz) = 16ddf3892bdd052e0a679b72c99ba804884e4a5d1eff5dfe95fa2b2f023d26046a43d43c818272ad4e46cf0196584d9644061bf4f9d2b61ce68c08e7fb711d1c diff --git a/votca-tools.spec b/votca-tools.spec index f55a7a4..6ed2b41 100644 --- a/votca-tools.spec +++ b/votca-tools.spec @@ -1,17 +1,12 @@ -%global _rcname rc1 -%global _rc _%%_rcname - Name: votca-tools -Version: 1.6 +Version: 1.6~rc2 +%global uversion 1.6_rc2 %global sover 6 -Release: 0.4%{?_rcname}%{?dist} +Release: 1%{?dist} Summary: VOTCA tools library License: ASL 2.0 URL: http://www.votca.org -Source0: https://github.com/votca/tools/archive/v%%7Bversion%7D%%7B?_rc%7D.tar.gz#/%%... -Patch0: https://github.com/votca/tools/pull/196.patch -Patch1: https://github.com/votca/tools/pull/197.patch -Patch2: https://github.com/votca/tools/pull/199.patch +Source0: https://github.com/votca/tools/archive/v%%7Buversion%7D.tar.gz#/%%7Bname%7D-...

BuildRequires: gcc-c++ BuildRequires: cmake3 @@ -46,10 +41,7 @@ This package contains development headers and libraries for votca-tools.

%prep -%setup -qn tools-%{version}%{?_rc} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -qn tools-%{uversion}

%build mkdir %{_target_platform} @@ -61,7 +53,7 @@ pushd %{_target_platform} %make_install -C %{_target_platform}

%check -make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testargs}} +make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}

%ldconfig_scriptlets

@@ -79,6 +71,10 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testarg %{_libdir}/cmake/VOTCA_TOOLS

%changelog +* Mon Feb 10 2020 Christoph Junghans junghans@votca.org - 1.6~rc2-1 +- Version bump to 1.6~rc2 +- Drop 196.patch, 197.patch and 199.patch - merged upstream + * Fri Jan 31 2020 Fedora Release Engineering releng@fedoraproject.org - 1.6-0.4rc1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

commit 7c8284ff5d12a915888aaab3388db9034921295b Author: Fedora Release Engineering releng@fedoraproject.org Date: Fri Jan 31 03:23:03 2020 +0000

- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering releng@fedoraproject.org

diff --git a/votca-tools.spec b/votca-tools.spec index 1576c66..f55a7a4 100644 --- a/votca-tools.spec +++ b/votca-tools.spec @@ -4,7 +4,7 @@ Name: votca-tools Version: 1.6 %global sover 6 -Release: 0.3%{?_rcname}%{?dist} +Release: 0.4%{?_rcname}%{?dist} Summary: VOTCA tools library License: ASL 2.0 URL: http://www.votca.org @@ -79,6 +79,9 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testarg %{_libdir}/cmake/VOTCA_TOOLS

%changelog +* Fri Jan 31 2020 Fedora Release Engineering releng@fedoraproject.org - 1.6-0.4rc1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Dec 12 2019 Christoph Junghans junghans@votca.org - 1.6-0.3rc1 - Added upstream 196.patch to failing table test - Added upstream 199.patch to fix 32bit builds

commit 276919beb39adee57f8a08376b7f39229a02517d Author: Christoph Junghans junghans@votca.org Date: Thu Dec 12 10:56:53 2019 -0700

fix 32bit builds

diff --git a/196.patch b/196.patch new file mode 100644 index 0000000..5e96d1b --- /dev/null +++ b/196.patch @@ -0,0 +1,83 @@ +From b159a9453a9db5ebe8968fd87fc843a18d18f5d1 Mon Sep 17 00:00:00 2001 +From: Jens jenswehner@gmail.com +Date: Thu, 5 Dec 2019 14:56:44 +0100 +Subject: [PATCH] smoothing fixed + +--- + src/libtools/linalg.cc | 4 ++-- + src/libtools/table.cc | 8 ++++---- + src/tests/test_table.cc | 4 ++-- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/libtools/linalg.cc b/src/libtools/linalg.cc +index 871bfa0f..62ea110a 100644 +--- a/src/libtools/linalg.cc ++++ b/src/libtools/linalg.cc +@@ -34,10 +34,10 @@ Eigen::VectorXd linalg_constrained_qrsolve(const Eigen::MatrixXd &A, + } + } + +- const long int NoVariables = A.cols(); ++ const Index NoVariables = A.cols(); + const Index NoConstrains = + constr.rows(); // number of constraints is number of rows of constr +- const long int deg_of_freedom = NoVariables - NoConstrains; ++ const Index deg_of_freedom = NoVariables - NoConstrains; + + Eigen::HouseholderQREigen::MatrixXd QR(constr.transpose()); + +diff --git a/src/libtools/table.cc b/src/libtools/table.cc +index 907febf1..c86f0b98 100644 +--- a/src/libtools/table.cc ++++ b/src/libtools/table.cc +@@ -198,7 +198,7 @@ void Table::Smooth(Index Nsmooth) { + } + for (Index i = 0; i < Nsmooth; i++) { + _y.segment(1, n_2) = +- 0.25 * (_y.head(n_2) + 2 * _y.segment(1, n_2) + _y.tail(n_2)); ++ (0.25 * (_y.head(n_2) + 2 * _y.segment(1, n_2) + _y.tail(n_2))).eval(); + } + } + +@@ -207,7 +207,7 @@ std::ostream &operator<<(std::ostream &out, const Table &t) { + out.precision(10); + + if (t._has_yerr) { +- for (long int i = 0; i < t._x.size(); ++i) { ++ for (Index i = 0; i < t._x.size(); ++i) { + out << t._x[i] << " " << t._y[i] << " " << t._yerr[i]; + if (t._flags[i] == '\0' || t._flags[i] == ' ') { + out << "\n"; +@@ -216,7 +216,7 @@ std::ostream &operator<<(std::ostream &out, const Table &t) { + } + } + } else { +- for (long int i = 0; i < t._x.size(); ++i) { ++ for (Index i = 0; i < t._x.size(); ++i) { + out << t._x[i] << " " << t._y[i]; + if (t._flags[i] == '\0' || t._flags[i] == ' ') { + out << "\n"; +@@ -231,7 +231,7 @@ std::ostream &operator<<(std::ostream &out, const Table &t) { + + // TODO: modify this function to be able to treat _has_yerr == true + void Table::push_back(double x, double y, char flags) { +- long int n = size(); ++ Index n = size(); + resize(n + 1); + _x[n] = x; + _y[n] = y; +diff --git a/src/tests/test_table.cc b/src/tests/test_table.cc +index 7e17952a..1283bc88 100644 +--- a/src/tests/test_table.cc ++++ b/src/tests/test_table.cc +@@ -144,8 +144,8 @@ BOOST_AUTO_TEST_CASE(smoothing_test) { + tb.y() = tb.x().array().sinh(); + tb.Smooth(2); + Eigen::VectorXd refy = Eigen::VectorXd::Zero(9); +- refy << 1.50946, 1.70621, 1.91527, 2.14055, 2.38962, 2.65963, 2.95959, +- 3.28268, 3.62686; ++ refy << 1.50946, 1.70595, 1.91384, 2.13995, 2.38747, 2.65889, 2.95692, ++ 3.28227, 3.62686; + + bool equal = tb.y().isApprox(refy, 1e-5); + diff --git a/199.patch b/199.patch new file mode 100644 index 0000000..975faa7 --- /dev/null +++ b/199.patch @@ -0,0 +1,71 @@ +From 3590ea64a5804dcee87e61d8a9a9969d918bff26 Mon Sep 17 00:00:00 2001 +From: Jens jenswehner@gmail.com +Date: Tue, 10 Dec 2019 14:18:15 +0100 +Subject: [PATCH 1/3] changed long int to Eigen::Index + +--- + include/votca/tools/types.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/votca/tools/types.h b/include/votca/tools/types.h +index a87537be..24509216 100644 +--- a/include/votca/tools/types.h ++++ b/include/votca/tools/types.h +@@ -18,9 +18,10 @@ + #ifndef _VOTCA_TOOLS_TYPES_H + #define _VOTCA_TOOLS_TYPES_H + ++#include <votca/tools/eigen.h> + namespace votca { + +-using Index = long int; ++using Index = Eigen::Index; + + } // namespace votca + + +From bbee4de3dc74743c2377bc9bdd48fbf70986089f Mon Sep 17 00:00:00 2001 +From: Christoph Junghans junghans@lanl.gov +Date: Tue, 10 Dec 2019 09:27:19 -0700 +Subject: [PATCH 2/3] make Edge::getOtherEndPoint index type + +--- + src/libtools/edge.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libtools/edge.cc b/src/libtools/edge.cc +index 47f12249..562f97cf 100644 +--- a/src/libtools/edge.cc ++++ b/src/libtools/edge.cc +@@ -31,7 +31,7 @@ Edge::Edge(Index ID1, Index ID2) { + vertices_ = vector<Index>{min({ID1, ID2}), max({ID1, ID2})}; + } + +-long Edge::getOtherEndPoint(Index ver) const { ++Index Edge::getOtherEndPoint(Index ver) const { + if (ver == vertices_.front()) { + return vertices_.back(); + } else { + +From 8e769a337672db4316bda91425cf814e546e5efe Mon Sep 17 00:00:00 2001 +From: Christoph Junghans junghans@lanl.gov +Date: Tue, 10 Dec 2019 09:59:15 -0700 +Subject: [PATCH 3/3] Graph::getDegree index type + +--- + src/libtools/graph.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libtools/graph.cc b/src/libtools/graph.cc +index fce9fc8e..b30b4456 100644 +--- a/src/libtools/graph.cc ++++ b/src/libtools/graph.cc +@@ -134,7 +134,7 @@ void Graph::calcId_() { + return; + } + +-long Graph::getDegree(Index vertex) const { ++Index Graph::getDegree(Index vertex) const { + if (edge_container_.vertexExist(vertex)) { + return edge_container_.getDegree(vertex); + } diff --git a/votca-tools.spec b/votca-tools.spec index bd53ccd..1576c66 100644 --- a/votca-tools.spec +++ b/votca-tools.spec @@ -4,12 +4,14 @@ Name: votca-tools Version: 1.6 %global sover 6 -Release: 0.2%{?_rcname}%{?dist} +Release: 0.3%{?_rcname}%{?dist} Summary: VOTCA tools library License: ASL 2.0 URL: http://www.votca.org Source0: https://github.com/votca/tools/archive/v%%7Bversion%7D%%7B?_rc%7D.tar.gz#/%%... -Patch0: https://github.com/votca/tools/pull/197.patch +Patch0: https://github.com/votca/tools/pull/196.patch +Patch1: https://github.com/votca/tools/pull/197.patch +Patch2: https://github.com/votca/tools/pull/199.patch

BuildRequires: gcc-c++ BuildRequires: cmake3 @@ -33,6 +35,7 @@ Requires: %{name} = %{version}-%{release} # Programs that build against votca need also these Requires: boost-devel Requires: expat-devel +Requires: fftw-devel

%description devel Versatile Object-oriented Toolkit for Coarse-graining Applications (VOTCA) is @@ -45,6 +48,8 @@ This package contains development headers and libraries for votca-tools. %prep %setup -qn tools-%{version}%{?_rc} %patch0 -p1 +%patch1 -p1 +%patch2 -p1

%build mkdir %{_target_platform} @@ -56,10 +61,6 @@ pushd %{_target_platform} %make_install -C %{_target_platform}

%check -# https://github.com/votca/tools/issues/195 -%ifarch armv7hl s390x -%global testargs ARGS='-E unit_test_table' -%endif make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testargs}}

%ldconfig_scriptlets @@ -78,6 +79,10 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testarg %{_libdir}/cmake/VOTCA_TOOLS

%changelog +* Thu Dec 12 2019 Christoph Junghans junghans@votca.org - 1.6-0.3rc1 +- Added upstream 196.patch to failing table test +- Added upstream 199.patch to fix 32bit builds + * Thu Dec 05 2019 Christoph Junghans junghans@votca.org - 1.6-0.2rc1 - Added upstream 197.patch to fix CMake files

commit 1b168a059dc15976a16cd7c9bb59a0236436b757 Author: Christoph Junghans junghans@votca.org Date: Thu Dec 5 07:22:16 2019 -0700

Added upstream 197.patch to fix CMake files

diff --git a/197.patch b/197.patch new file mode 100644 index 0000000..a0e4245 --- /dev/null +++ b/197.patch @@ -0,0 +1,27 @@ +From 32c497808d3ff52a25cd0367c602f57577d56352 Mon Sep 17 00:00:00 2001 +From: Christoph Junghans junghans@votca.org +Date: Thu, 5 Dec 2019 07:16:02 -0700 +Subject: [PATCH] VOTCA_TOOLSConfig.cmake.in: only add VOTCA::votca_compare + once + +--- + src/libtools/VOTCA_TOOLSConfig.cmake.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/libtools/VOTCA_TOOLSConfig.cmake.in b/src/libtools/VOTCA_TOOLSConfig.cmake.in +index c69c0426..b129913f 100644 +--- a/src/libtools/VOTCA_TOOLSConfig.cmake.in ++++ b/src/libtools/VOTCA_TOOLSConfig.cmake.in +@@ -2,8 +2,10 @@ include(CMakeFindDependencyMacro) + find_dependency(Eigen3 NO_MODULE) + find_dependency(Boost 1.53.0 REQUIRED COMPONENTS program_options) + include("${CMAKE_CURRENT_LIST_DIR}/VOTCA_TOOLS_Targets.cmake") +-add_executable(VOTCA::votca_compare IMPORTED) +-set_property(TARGET VOTCA::votca_compare PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_BINDIR@/votca_compare") ++if(NOT TARGET VOTCA::votca_compare) ++ add_executable(VOTCA::votca_compare IMPORTED) ++ set_property(TARGET VOTCA::votca_compare PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_BINDIR@/votca_compare") ++endif() + if(@MKL_FOUND@) + if(NOT TARGET MKL::MKL) + add_library(MKL::MKL UNKNOWN IMPORTED) diff --git a/votca-tools.spec b/votca-tools.spec index f602f04..bd53ccd 100644 --- a/votca-tools.spec +++ b/votca-tools.spec @@ -3,11 +3,13 @@

Name: votca-tools Version: 1.6 -Release: 0.1%{?_rcname}%{?dist} +%global sover 6 +Release: 0.2%{?_rcname}%{?dist} Summary: VOTCA tools library License: ASL 2.0 URL: http://www.votca.org Source0: https://github.com/votca/tools/archive/v%%7Bversion%7D%%7B?_rc%7D.tar.gz#/%%... +Patch0: https://github.com/votca/tools/pull/197.patch

BuildRequires: gcc-c++ BuildRequires: cmake3 @@ -42,6 +44,7 @@ This package contains development headers and libraries for votca-tools.

%prep %setup -qn tools-%{version}%{?_rc} +%patch0 -p1

%build mkdir %{_target_platform} @@ -65,7 +68,7 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testarg %license LICENSE %doc NOTICE %{_bindir}/votca_* -%{_libdir}/libvotca_tools.so.* +%{_libdir}/libvotca_tools.so.%{sover} %{_mandir}/man1/votca_property.* %{_mandir}/man7/votca-tools.7*

@@ -75,6 +78,9 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testarg %{_libdir}/cmake/VOTCA_TOOLS

%changelog +* Thu Dec 05 2019 Christoph Junghans junghans@votca.org - 1.6-0.2rc1 +- Added upstream 197.patch to fix CMake files + * Thu Dec 05 2019 Christoph Junghans junghans@votca.org - 1.6-0.1rc1 - Version bump to 1.6_rc1 (bug #1779862)

commit 72e1621c7b920a0a6548ac0094d34dfc9486065c Author: Christoph Junghans junghans@votca.org Date: Wed Dec 4 20:43:17 2019 -0700

exclude one test on s390x and armv7hl

diff --git a/votca-tools.spec b/votca-tools.spec index 7a06b4f..f602f04 100644 --- a/votca-tools.spec +++ b/votca-tools.spec @@ -53,7 +53,11 @@ pushd %{_target_platform} %make_install -C %{_target_platform}

%check -make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 +# https://github.com/votca/tools/issues/195 +%ifarch armv7hl s390x +%global testargs ARGS='-E unit_test_table' +%endif +make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testargs}}

%ldconfig_scriptlets

commit ec27a22b5a589bb251a6cb1aca686e62cff14851 Author: Christoph Junghans junghans@votca.org Date: Wed Dec 4 20:30:23 2019 -0700

Version bump to 1.6_rc1 (bug #1779862)

diff --git a/.gitignore b/.gitignore index 0e84d33..2bf1a40 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /votca-tools-1.4.1.tar.gz /votca-tools-1.5.tar.gz /votca-tools-1.5.1.tar.gz +/votca-tools-1.6_rc1.tar.gz diff --git a/sources b/sources index 173a064..bc0be50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (votca-tools-1.5.1.tar.gz) = c8fe4baee0f4586dbe1a9f5b7c33b7d6b16ef0ebc35b50febfdcb049b09cd150dec3a5e9b98b43430db66f866dd01c1776f6777f01d227246c9d7b7ca879ea72 +SHA512 (votca-tools-1.6_rc1.tar.gz) = 42b0eae148bb93293ac16e193d2595aaa850dcee0dcaab1f6cf0ca8e36a95a1719a03243d421fbfb1034c81baf2ef294768a86530f0d69b59862df95846241ed diff --git a/votca-tools.spec b/votca-tools.spec index 6313c8b..7a06b4f 100644 --- a/votca-tools.spec +++ b/votca-tools.spec @@ -1,9 +1,9 @@ -#global _rcname rc1 -#global _rc _%%_rcname +%global _rcname rc1 +%global _rc _%%_rcname

Name: votca-tools -Version: 1.5.1 -Release: 2%{?_rcname}%{?dist} +Version: 1.6 +Release: 0.1%{?_rcname}%{?dist} Summary: VOTCA tools library License: ASL 2.0 URL: http://www.votca.org @@ -15,8 +15,6 @@ BuildRequires: expat-devel BuildRequires: fftw-devel BuildRequires: eigen3-devel BuildRequires: boost-devel -BuildRequires: txt2tags -BuildRequires: sqlite-devel

%description Versatile Object-oriented Toolkit for Coarse-graining Applications (VOTCA) is @@ -33,7 +31,6 @@ Requires: %{name} = %{version}-%{release} # Programs that build against votca need also these Requires: boost-devel Requires: expat-devel -Requires: sqlite-devel

%description devel Versatile Object-oriented Toolkit for Coarse-graining Applications (VOTCA) is @@ -50,7 +47,7 @@ This package contains development headers and libraries for votca-tools. mkdir %{_target_platform} pushd %{_target_platform} %{cmake} .. -DCMAKE_BUILD_TYPE=Release -DWITH_RC_FILES=OFF -DENABLE_TESTING=ON -make %{?_smp_mflags} +%make_build

%install %make_install -C %{_target_platform} @@ -71,9 +68,12 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %files devel %{_includedir}/votca/ %{_libdir}/libvotca_tools.so -%{_libdir}/pkgconfig/libvotca_tools.pc +%{_libdir}/cmake/VOTCA_TOOLS

%changelog +* Thu Dec 05 2019 Christoph Junghans junghans@votca.org - 1.6-0.1rc1 +- Version bump to 1.6_rc1 (bug #1779862) + * Fri Nov 22 2019 Christoph Junghans junghans@votca.org - 1.5.1-2 - Fix python3 shebang