From ec27a22b5a589bb251a6cb1aca686e62cff14851 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Wed, 4 Dec 2019 20:30:23 -0700
Subject: [PATCH 01/27] Version bump to 1.6_rc1 (bug #1779862)

---
 .gitignore       |  1 +
 sources          |  2 +-
 votca-tools.spec | 18 +++++++++---------
 3 files changed, 11 insertions(+), 10 deletions(-)

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
 

From 72e1621c7b920a0a6548ac0094d34dfc9486065c Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Wed, 4 Dec 2019 20:43:17 -0700
Subject: [PATCH 02/27] exclude one test on s390x and armv7hl

---
 votca-tools.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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
 

From 1b168a059dc15976a16cd7c9bb59a0236436b757 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Thu, 5 Dec 2019 07:22:16 -0700
Subject: [PATCH 03/27] Added upstream 197.patch to fix CMake files

---
 197.patch        | 27 +++++++++++++++++++++++++++
 votca-tools.spec | 10 ++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 197.patch

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%{version}%{?_rc}.tar.gz#/%{name}-%{version}%{?_rc}.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)
 

From 276919beb39adee57f8a08376b7f39229a02517d Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Thu, 12 Dec 2019 10:56:53 -0700
Subject: [PATCH 04/27] fix 32bit builds

---
 196.patch        | 83 ++++++++++++++++++++++++++++++++++++++++++++++++
 199.patch        | 71 +++++++++++++++++++++++++++++++++++++++++
 votca-tools.spec | 17 ++++++----
 3 files changed, 165 insertions(+), 6 deletions(-)
 create mode 100644 196.patch
 create mode 100644 199.patch

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::HouseholderQR<Eigen::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%{version}%{?_rc}.tar.gz#/%{name}-%{version}%{?_rc}.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
 

From 7c8284ff5d12a915888aaab3388db9034921295b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jan 2020 03:23:03 +0000
Subject: [PATCH 05/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 votca-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

From a7a6728f9713f977a89a3d400031bbfccdcb0866 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Mon, 10 Feb 2020 09:23:08 -0700
Subject: [PATCH 06/27] Version bump to 1.6~rc2

---
 .gitignore       |  1 +
 196.patch        | 83 ------------------------------------------------
 197.patch        | 27 ----------------
 199.patch        | 71 -----------------------------------------
 sources          |  2 +-
 votca-tools.spec | 24 ++++++--------
 6 files changed, 12 insertions(+), 196 deletions(-)
 delete mode 100644 196.patch
 delete mode 100644 197.patch
 delete mode 100644 199.patch

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::HouseholderQR<Eigen::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%{version}%{?_rc}.tar.gz#/%{name}-%{version}%{?_rc}.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%{uversion}.tar.gz#/%{name}-%{uversion}%{?_rc}.tar.gz
 
 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
 

From 5d91d0e0f7aed3427d7f246c812b38e719cd44ee Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Sat, 18 Apr 2020 07:28:48 -0600
Subject: [PATCH 07/27] Version bump to v1.6 (bug #1825474)

---
 .gitignore       | 1 +
 sources          | 2 +-
 votca-tools.spec | 9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

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%{uversion}.tar.gz#/%{name}-%{uversion}%{?_rc}.tar.gz
+Source0:        https://github.com/votca/tools/archive/v%{uversion}.tar.gz#/%{name}-%{uversion}.tar.gz
 
 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

From fe3373c0c7d5ce168ec59358f197f0eccdc35d6b Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 28 May 2020 18:36:46 +0100
Subject: [PATCH 08/27] Rebuilt for Boost 1.73

---
 votca-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/votca-tools.spec b/votca-tools.spec
index 9fc5566..9877a7f 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -2,7 +2,7 @@ Name:           votca-tools
 Version:        1.6
 %global         uversion %{version}
 %global         sover 6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        VOTCA tools library
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -71,6 +71,9 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Thu May 28 2020 Jonathan Wakely <jwakely@redhat.com> - 1.6-2
+- Rebuilt for Boost 1.73
+
 * Sat Apr 18 2020 Christoph Junghans <junghans@votca.org> - 1.6-1
 - Version bump to v1.6 (bug #1825474)
 

From f3e2d9622209ed6a95b256414a48a1e8a50ccbf6 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Sun, 21 Jun 2020 09:49:06 -0600
Subject: [PATCH 09/27] Version bump to v1.6.1

---
 .gitignore       | 1 +
 sources          | 2 +-
 votca-tools.spec | 9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f827973..008a6dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /votca-tools-1.6_rc1.tar.gz
 /votca-tools-1.6_rc2.tar.gz
 /votca-tools-1.6.tar.gz
+/votca-tools-1.6.1.tar.gz
diff --git a/sources b/sources
index 72db653..cb8a3be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (votca-tools-1.6.tar.gz) = 0159bc10066e05da8ba0f70e3c70d8cb4cd7b07ebd58edff1ccfeb86504af855eb5cae7184200e5c8ee3a3f6b6b85ec46a045f00dc8e681073ae8fdbbfc3965a
+SHA512 (votca-tools-1.6.1.tar.gz) = e7dc03df46670f83139c0283824a630d8bec6cda5da156bc09e35e3c373f1cc65359ddb912e6bf19431a588acc5569ad57000045083d155fcc15c93980cfd26e
diff --git a/votca-tools.spec b/votca-tools.spec
index 9877a7f..1d73fcf 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -1,8 +1,8 @@
 Name:           votca-tools
-Version:        1.6
+Version:        1.6.1
 %global         uversion %{version}
 %global         sover 6
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        VOTCA tools library
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -59,7 +59,7 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
 
 %files
 %license LICENSE
-%doc NOTICE
+%doc NOTICE CHANGELOG.md README.md
 %{_bindir}/votca_*
 %{_libdir}/libvotca_tools.so.%{sover}
 %{_mandir}/man1/votca_property.*
@@ -71,6 +71,9 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Sun Jun 21 2020 Christoph Junghans <junghans@votca.org> - 1.6.1-1
+- Version bump to v1.6.1
+
 * Thu May 28 2020 Jonathan Wakely <jwakely@redhat.com> - 1.6-2
 - Rebuilt for Boost 1.73
 

From b61e3f7e6dd40e6a6a157f29c39bce37cc34706f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jul 2020 13:53:09 +0000
Subject: [PATCH 10/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 votca-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/votca-tools.spec b/votca-tools.spec
index 1d73fcf..5debd29 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -2,7 +2,7 @@ Name:           votca-tools
 Version:        1.6.1
 %global         uversion %{version}
 %global         sover 6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        VOTCA tools library
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -71,6 +71,9 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Sun Jun 21 2020 Christoph Junghans <junghans@votca.org> - 1.6.1-1
 - Version bump to v1.6.1
 

From c0d040b130fd03bdceee534e3b2d261e0ee14af3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 1 Aug 2020 09:36:40 +0000
Subject: [PATCH 11/27] - Second attempt - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 votca-tools.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/votca-tools.spec b/votca-tools.spec
index 5debd29..028f5ae 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -2,7 +2,7 @@ Name:           votca-tools
 Version:        1.6.1
 %global         uversion %{version}
 %global         sover 6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        VOTCA tools library
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -71,6 +71,10 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From ea7e0573f1ad8a1e61da3822f654bb46ab6341d5 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Mon, 3 Aug 2020 19:30:44 -0600
Subject: [PATCH 12/27] Fix out-of-source build on F33 (bug#1865610)

---
 votca-tools.spec | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/votca-tools.spec b/votca-tools.spec
index 028f5ae..a4959e8 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -2,7 +2,7 @@ Name:           votca-tools
 Version:        1.6.1
 %global         uversion %{version}
 %global         sover 6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        VOTCA tools library
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -44,16 +44,14 @@ This package contains development headers and libraries for votca-tools.
 %setup -qn tools-%{uversion}
 
 %build
-mkdir %{_target_platform}
-pushd %{_target_platform}
-%{cmake} .. -DCMAKE_BUILD_TYPE=Release -DWITH_RC_FILES=OFF -DENABLE_TESTING=ON
-%make_build
+%{cmake} -DCMAKE_BUILD_TYPE=Release -DWITH_RC_FILES=OFF -DENABLE_TESTING=ON
+%cmake_build
 
 %install
-%make_install -C %{_target_platform}
+%cmake_install
 
 %check
-make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
+%ctest
 
 %ldconfig_scriptlets
 
@@ -71,6 +69,9 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Tue Aug 04 2020 Christoph Junghans <junghans@votca.org> - 1.6.1-4
+- Fix out-of-source build on F33 (bug#1865610)
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-3
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

From 7bb49031628649ded7bae1e1a49a10e031c35bca Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Sat, 22 Aug 2020 09:28:01 -0600
Subject: [PATCH 13/27] Version bump to v1.6.2 (bug #1871342)

---
 .gitignore       | 1 +
 sources          | 2 +-
 votca-tools.spec | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 008a6dd..43e984b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /votca-tools-1.6_rc2.tar.gz
 /votca-tools-1.6.tar.gz
 /votca-tools-1.6.1.tar.gz
+/votca-tools-1.6.2.tar.gz
diff --git a/sources b/sources
index cb8a3be..d4ba6fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (votca-tools-1.6.1.tar.gz) = e7dc03df46670f83139c0283824a630d8bec6cda5da156bc09e35e3c373f1cc65359ddb912e6bf19431a588acc5569ad57000045083d155fcc15c93980cfd26e
+SHA512 (votca-tools-1.6.2.tar.gz) = 03139591e934ae97b6c0ddcd0fa9480b4b9d28c05882489b9067b9519727a97a1589a645c3d9ad959d65fa622e3845e8d1d5141f210e2704907d7d6f0bff2abc
diff --git a/votca-tools.spec b/votca-tools.spec
index a4959e8..09935d7 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -1,8 +1,8 @@
 Name:           votca-tools
-Version:        1.6.1
+Version:        1.6.2
 %global         uversion %{version}
 %global         sover 6
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        VOTCA tools library
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -69,6 +69,9 @@ This package contains development headers and libraries for votca-tools.
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Sat Aug 22 2020 Christoph Junghans <junghans@votca.org> - 1.6.2-1
+- Version bump to v1.6.2 (bug #1871342)
+
 * Tue Aug 04 2020 Christoph Junghans <junghans@votca.org> - 1.6.1-4
 - Fix out-of-source build on F33 (bug#1865610)
 

From bc5fba3ee8d9052270bd32613c12863f10aad0f2 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Wed, 9 Dec 2020 16:40:59 -0700
Subject: [PATCH 14/27] Version bump to 1.6.3 (bug #1905833)

---
 .gitignore       | 1 +
 sources          | 2 +-
 votca-tools.spec | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 43e984b..2b2941d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /votca-tools-1.6.tar.gz
 /votca-tools-1.6.1.tar.gz
 /votca-tools-1.6.2.tar.gz
+/votca-tools-1.6.3.tar.gz
diff --git a/sources b/sources
index d4ba6fd..3ea9639 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (votca-tools-1.6.2.tar.gz) = 03139591e934ae97b6c0ddcd0fa9480b4b9d28c05882489b9067b9519727a97a1589a645c3d9ad959d65fa622e3845e8d1d5141f210e2704907d7d6f0bff2abc
+SHA512 (votca-tools-1.6.3.tar.gz) = 2bc780f7b852e0d63ef1a6ff697c75aa67666121b8192a965442b62167fe33f69b0d4c18fb6b255326d02ba3cffd02c6af8f5d67364fafd9de597897ab30e349
diff --git a/votca-tools.spec b/votca-tools.spec
index 09935d7..678d311 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -1,5 +1,5 @@
 Name:           votca-tools
-Version:        1.6.2
+Version:        1.6.3
 %global         uversion %{version}
 %global         sover 6
 Release:        1%{?dist}
@@ -69,6 +69,9 @@ This package contains development headers and libraries for votca-tools.
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Wed Dec  9 16:38:14 MST 2020 Christoph Junghans <junghans@votca.org> - 1.6.3-1
+- Version bump to 1.6.3 (bug #1905833)
+
 * Sat Aug 22 2020 Christoph Junghans <junghans@votca.org> - 1.6.2-1
 - Version bump to v1.6.2 (bug #1871342)
 

From bded868a59f1985382711287f69e46d710dd2c3c Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Tue, 12 Jan 2021 14:21:58 -0700
Subject: [PATCH 15/27] Version bump to v1.6.4 (bug #1915543)

---
 .gitignore       | 1 +
 sources          | 2 +-
 votca-tools.spec | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2b2941d..c37e94a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /votca-tools-1.6.1.tar.gz
 /votca-tools-1.6.2.tar.gz
 /votca-tools-1.6.3.tar.gz
+/votca-tools-1.6.4.tar.gz
diff --git a/sources b/sources
index 3ea9639..1979843 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (votca-tools-1.6.3.tar.gz) = 2bc780f7b852e0d63ef1a6ff697c75aa67666121b8192a965442b62167fe33f69b0d4c18fb6b255326d02ba3cffd02c6af8f5d67364fafd9de597897ab30e349
+SHA512 (votca-tools-1.6.4.tar.gz) = 7a334071086e755960a3bd938c1baa1979c4cc9cd8f865af00540fa45365bf1c3153ffb8a5a5948618c47ebafcda9ecc62850d44ea06b7f35ac4587bd423439a
diff --git a/votca-tools.spec b/votca-tools.spec
index 678d311..d20f053 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -1,5 +1,5 @@
 Name:           votca-tools
-Version:        1.6.3
+Version:        1.6.4
 %global         uversion %{version}
 %global         sover 6
 Release:        1%{?dist}
@@ -69,6 +69,9 @@ This package contains development headers and libraries for votca-tools.
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Tue Jan 12 14:13:20 MST 2021 Christoph Junghans <junghans@votca.org> - 1.6.4-1
+- Version bump #1915543
+
 * Wed Dec  9 16:38:14 MST 2020 Christoph Junghans <junghans@votca.org> - 1.6.3-1
 - Version bump to 1.6.3 (bug #1905833)
 

From 724ccbcf5e328ca8c0c7cdc5f3553b03c2bfab29 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Tue, 12 Jan 2021 14:24:15 -0700
Subject: [PATCH 16/27] fix changelog

---
 votca-tools.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/votca-tools.spec b/votca-tools.spec
index d20f053..27e18cd 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -70,7 +70,7 @@ This package contains development headers and libraries for votca-tools.
 
 %changelog
 * Tue Jan 12 14:13:20 MST 2021 Christoph Junghans <junghans@votca.org> - 1.6.4-1
-- Version bump #1915543
+- Version bump to v1.6.4 (bug #1915543)
 
 * Wed Dec  9 16:38:14 MST 2020 Christoph Junghans <junghans@votca.org> - 1.6.3-1
 - Version bump to 1.6.3 (bug #1905833)

From 8fc68ec47e7c5bda0465fe40c6b8d3918d3e3ba4 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Sun, 17 Jan 2021 14:41:31 -0700
Subject: [PATCH 17/27] Version bump to 2021~rc1 (bug #1916971)

---
 .gitignore       |  1 +
 sources          |  2 +-
 votca-tools.spec | 11 +++++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index c37e94a..97fdec6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /votca-tools-1.6.2.tar.gz
 /votca-tools-1.6.3.tar.gz
 /votca-tools-1.6.4.tar.gz
+/votca-tools-2021-rc.1.tar.gz
diff --git a/sources b/sources
index 1979843..941459e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (votca-tools-1.6.4.tar.gz) = 7a334071086e755960a3bd938c1baa1979c4cc9cd8f865af00540fa45365bf1c3153ffb8a5a5948618c47ebafcda9ecc62850d44ea06b7f35ac4587bd423439a
+SHA512 (votca-tools-2021-rc.1.tar.gz) = 91751c50a7c249367fc26a6f219089e977edace337b06cab266e58a1fed522d7ce043c961bdc0aabd80794bc4e8519a8e14b28f57852a630621deadf7f53aa9b
diff --git a/votca-tools.spec b/votca-tools.spec
index 27e18cd..a87d636 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -1,7 +1,7 @@
 Name:           votca-tools
-Version:        1.6.4
-%global         uversion %{version}
-%global         sover 6
+Version:        2021~rc1
+%global         uversion 2021-rc.1
+%global         sover 2021
 Release:        1%{?dist}
 Summary:        VOTCA tools library
 License:        ASL 2.0
@@ -44,7 +44,7 @@ This package contains development headers and libraries for votca-tools.
 %setup -qn tools-%{uversion}
 
 %build
-%{cmake} -DCMAKE_BUILD_TYPE=Release -DWITH_RC_FILES=OFF -DENABLE_TESTING=ON
+%{cmake} -DCMAKE_BUILD_TYPE=Release -DINSTALL_RC_FILES=OFF -DENABLE_TESTING=ON
 %cmake_build
 
 %install
@@ -69,6 +69,9 @@ This package contains development headers and libraries for votca-tools.
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Sun Jan 17 14:40:32 MST 2021 Christoph Junghans <junghans@votca.org> - 2021~rc1-1
+- Version bump to 2021~rc1 (bug #1916971)
+
 * Tue Jan 12 14:13:20 MST 2021 Christoph Junghans <junghans@votca.org> - 1.6.4-1
 - Version bump to v1.6.4 (bug #1915543)
 

From 6efa341e0d0fba519077c08f59b7a4ae6ecf9218 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Thu, 21 Jan 2021 12:27:34 -0700
Subject: [PATCH 18/27] install: fix a typo

---
 votca-tools.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/votca-tools.spec b/votca-tools.spec
index a87d636..f4b4a0a 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -57,7 +57,7 @@ This package contains development headers and libraries for votca-tools.
 
 %files
 %license LICENSE
-%doc NOTICE CHANGELOG.md README.md
+%doc NOTICE CHANGELOG.rst README.rst
 %{_bindir}/votca_*
 %{_libdir}/libvotca_tools.so.%{sover}
 %{_mandir}/man1/votca_property.*

From 3661908474127039b94bdd24246ee3e09db14aae Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 22 Jan 2021 20:53:55 +0000
Subject: [PATCH 19/27] Rebuilt for Boost 1.75

---
 votca-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/votca-tools.spec b/votca-tools.spec
index f4b4a0a..f2d6bde 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -2,7 +2,7 @@ Name:           votca-tools
 Version:        2021~rc1
 %global         uversion 2021-rc.1
 %global         sover 2021
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        VOTCA tools library
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -69,6 +69,9 @@ This package contains development headers and libraries for votca-tools.
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 2021~rc1-2
+- Rebuilt for Boost 1.75
+
 * Sun Jan 17 14:40:32 MST 2021 Christoph Junghans <junghans@votca.org> - 2021~rc1-1
 - Version bump to 2021~rc1 (bug #1916971)
 

From f86d058a41396334a099b9e0c4ccfb48c8d26bd1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 27 Jan 2021 23:14:43 +0000
Subject: [PATCH 20/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 votca-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/votca-tools.spec b/votca-tools.spec
index f2d6bde..14c40de 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -2,7 +2,7 @@ Name:           votca-tools
 Version:        2021~rc1
 %global         uversion 2021-rc.1
 %global         sover 2021
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        VOTCA tools library
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -69,6 +69,9 @@ This package contains development headers and libraries for votca-tools.
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021~rc1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 2021~rc1-2
 - Rebuilt for Boost 1.75
 

From 8ebc27245fc9874095ad255dc2383a930ea3531f Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Sat, 13 Mar 2021 11:31:44 -0700
Subject: [PATCH 21/27] Version bump to v2021 (bug #1938407)

---
 .gitignore       | 1 +
 sources          | 2 +-
 votca-tools.spec | 9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 97fdec6..236587e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /votca-tools-1.6.3.tar.gz
 /votca-tools-1.6.4.tar.gz
 /votca-tools-2021-rc.1.tar.gz
+/votca-tools-2021.tar.gz
diff --git a/sources b/sources
index 941459e..4a24646 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (votca-tools-2021-rc.1.tar.gz) = 91751c50a7c249367fc26a6f219089e977edace337b06cab266e58a1fed522d7ce043c961bdc0aabd80794bc4e8519a8e14b28f57852a630621deadf7f53aa9b
+SHA512 (votca-tools-2021.tar.gz) = 5ddcbe49b1898713fa292655efbb2a1c081a7f98c9bae3ef37b273e0db49eecb3800b865221883d610802923132d57d5847cc35ddb008de4eb180f4c30db3dbf
diff --git a/votca-tools.spec b/votca-tools.spec
index 14c40de..500c0b3 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -1,8 +1,8 @@
 Name:           votca-tools
-Version:        2021~rc1
-%global         uversion 2021-rc.1
+Version:        2021
+%global         uversion %version
 %global         sover 2021
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        VOTCA tools library
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -69,6 +69,9 @@ This package contains development headers and libraries for votca-tools.
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Sat Mar 13 2021 Christoph Junghans <junghans@votca.org> - 2021-1
+- Version bump to v2021 (bug #1938407)
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021~rc1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From a68368228a66ef20d21347fd84ec8d08cb78dbd2 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Sun, 18 Jul 2021 07:42:04 -0600
Subject: [PATCH 22/27] Version bump to v2021.1 (bug #1983385)

---
 .gitignore       | 1 +
 sources          | 2 +-
 votca-tools.spec | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 236587e..f95329a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /votca-tools-1.6.4.tar.gz
 /votca-tools-2021-rc.1.tar.gz
 /votca-tools-2021.tar.gz
+/votca-tools-2021.1.tar.gz
diff --git a/sources b/sources
index 4a24646..646228f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (votca-tools-2021.tar.gz) = 5ddcbe49b1898713fa292655efbb2a1c081a7f98c9bae3ef37b273e0db49eecb3800b865221883d610802923132d57d5847cc35ddb008de4eb180f4c30db3dbf
+SHA512 (votca-tools-2021.1.tar.gz) = 9770f1e96b489413577e41858e659f11c0adc79070ae1058102c2ad2a771c3222fcdffd8646bae75b5d05450a7fa3b49eee7fce1ae16718dd809ff729b3dd25e
diff --git a/votca-tools.spec b/votca-tools.spec
index 500c0b3..8e4d263 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -1,5 +1,5 @@
 Name:           votca-tools
-Version:        2021
+Version:        2021.1
 %global         uversion %version
 %global         sover 2021
 Release:        1%{?dist}
@@ -69,6 +69,9 @@ This package contains development headers and libraries for votca-tools.
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Sun Jul 18 2021 Christoph Junghans <junghans@votca.org> - 2021.1-1
+- Version bump to v2021.1 (bug #1983385)
+
 * Sat Mar 13 2021 Christoph Junghans <junghans@votca.org> - 2021-1
 - Version bump to v2021 (bug #1938407)
 

From 92e9868ec81f7db7de7a7b91724f335e4df2462f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 20:40:05 +0000
Subject: [PATCH 23/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 votca-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/votca-tools.spec b/votca-tools.spec
index 8e4d263..83c0dc8 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -2,7 +2,7 @@ Name:           votca-tools
 Version:        2021.1
 %global         uversion %version
 %global         sover 2021
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        VOTCA tools library
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -69,6 +69,9 @@ This package contains development headers and libraries for votca-tools.
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Sun Jul 18 2021 Christoph Junghans <junghans@votca.org> - 2021.1-1
 - Version bump to v2021.1 (bug #1983385)
 

From 641a33bcf0af943e97cf36bf1c0ae178df07873c Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Sat, 7 Aug 2021 04:10:32 +0100
Subject: [PATCH 24/27] Rebuilt for Boost 1.76

---
 votca-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/votca-tools.spec b/votca-tools.spec
index 83c0dc8..0eef86c 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -2,7 +2,7 @@ Name:           votca-tools
 Version:        2021.1
 %global         uversion %version
 %global         sover 2021
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        VOTCA tools library
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -69,6 +69,9 @@ This package contains development headers and libraries for votca-tools.
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Sat Aug 07 2021 Jonathan Wakely <jwakely@redhat.com> - 2021.1-3
+- Rebuilt for Boost 1.76
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 32df6b8de21a33a3497b794155730a935578991c Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Mon, 20 Sep 2021 03:36:18 -0600
Subject: [PATCH 25/27] version bump to v2021.2 (bug #2005702)

---
 .gitignore       | 1 +
 sources          | 2 +-
 votca-tools.spec | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f95329a..3adefa8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /votca-tools-2021-rc.1.tar.gz
 /votca-tools-2021.tar.gz
 /votca-tools-2021.1.tar.gz
+/votca-tools-2021.2.tar.gz
diff --git a/sources b/sources
index 646228f..3507325 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (votca-tools-2021.1.tar.gz) = 9770f1e96b489413577e41858e659f11c0adc79070ae1058102c2ad2a771c3222fcdffd8646bae75b5d05450a7fa3b49eee7fce1ae16718dd809ff729b3dd25e
+SHA512 (votca-tools-2021.2.tar.gz) = 84e756df4c6e355e149fd105835cfb0fd03935c824e2f7e4149ad92ed6fa81d5a43a7dd6aa532b5ee6e4a79794a94db08f8533e9f0cf99afa604c5ad9f7cb133
diff --git a/votca-tools.spec b/votca-tools.spec
index 0eef86c..657d5aa 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -1,8 +1,8 @@
 Name:           votca-tools
-Version:        2021.1
+Version:        2021.2
 %global         uversion %version
 %global         sover 2021
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        VOTCA tools library
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -69,6 +69,9 @@ This package contains development headers and libraries for votca-tools.
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Mon Sep 20 2021 Christoph Junghans <junghans@votca.org> - 2021.2-1
+- version bump to v2021.2 (bug #2005702)
+
 * Sat Aug 07 2021 Jonathan Wakely <jwakely@redhat.com> - 2021.1-3
 - Rebuilt for Boost 1.76
 

From c0223678469d293f547fa81fc68278beee9d82b1 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Tue, 30 Nov 2021 11:35:20 -0700
Subject: [PATCH 26/27] Version bump to 2022-rc.1

---
 .gitignore       |  1 +
 sources          |  2 +-
 votca-tools.spec | 20 ++++++++++++--------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3adefa8..3504f74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /votca-tools-2021.tar.gz
 /votca-tools-2021.1.tar.gz
 /votca-tools-2021.2.tar.gz
+/votca-2022-rc.1.tar.gz
diff --git a/sources b/sources
index 3507325..bafebfc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (votca-tools-2021.2.tar.gz) = 84e756df4c6e355e149fd105835cfb0fd03935c824e2f7e4149ad92ed6fa81d5a43a7dd6aa532b5ee6e4a79794a94db08f8533e9f0cf99afa604c5ad9f7cb133
+SHA512 (votca-2022-rc.1.tar.gz) = 46a9dbbac663f3e3cceeb5803af108d623a1774d916347c9e6e8cbcbd05297d980132a4ee4508c42e98e567ca8bd38f301aeab4a3bf2f3dcf056333dbe667c97
diff --git a/votca-tools.spec b/votca-tools.spec
index 657d5aa..641917a 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -1,12 +1,12 @@
 Name:           votca-tools
-Version:        2021.2
-%global         uversion %version
-%global         sover 2021
+Version:        2022~rc1
+%global         uversion 2022-rc.1
+%global         sover 2022
 Release:        1%{?dist}
 Summary:        VOTCA tools library
 License:        ASL 2.0
 URL:            http://www.votca.org
-Source0:        https://github.com/votca/tools/archive/v%{uversion}.tar.gz#/%{name}-%{uversion}.tar.gz
+Source0:        https://github.com/votca/votca/archive/v%{uversion}.tar.gz#/votca-%{uversion}.tar.gz
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake3
@@ -41,9 +41,10 @@ This package contains development headers and libraries for votca-tools.
 
 
 %prep
-%setup -qn tools-%{uversion}
+%setup -qn votca-%{uversion}
 
 %build
+%global _vpath_srcdir tools
 %{cmake} -DCMAKE_BUILD_TYPE=Release -DINSTALL_RC_FILES=OFF -DENABLE_TESTING=ON
 %cmake_build
 
@@ -56,11 +57,11 @@ This package contains development headers and libraries for votca-tools.
 %ldconfig_scriptlets
 
 %files
-%license LICENSE
-%doc NOTICE CHANGELOG.rst README.rst
+%license tools/LICENSE
+%doc tools/NOTICE CHANGELOG.rst README.rst
 %{_bindir}/votca_*
 %{_libdir}/libvotca_tools.so.%{sover}
-%{_mandir}/man1/votca_property.*
+%{_mandir}/man1/votca*.1*
 %{_mandir}/man7/votca-tools.7*
 
 %files devel
@@ -69,6 +70,9 @@ This package contains development headers and libraries for votca-tools.
 %{_libdir}/cmake/VOTCA_TOOLS
 
 %changelog
+* Tue Nov 30 2021 Christoph Junghans <junghans@votca.org> - 2022~rc1-1
+- Version bump to 2022-rc.1
+
 * Mon Sep 20 2021 Christoph Junghans <junghans@votca.org> - 2021.2-1
 - version bump to v2021.2 (bug #2005702)
 

From 415dddb96baa7aa84ad51fa1d408f8e7e189f740 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Wed, 12 Jan 2022 19:36:03 -0700
Subject: [PATCH 27/27] Replaced by 'votca' package

---
 .gitignore       |  25 ----
 dead.package     |   1 +
 sources          |   1 -
 votca-tools.spec | 317 -----------------------------------------------
 4 files changed, 1 insertion(+), 343 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 dead.package
 delete mode 100644 sources
 delete mode 100644 votca-tools.spec

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 3504f74..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-/votca-tools-*.src.rpm
-/votca-tools-1.0.1.tar.gz
-/votca-tools-1.1_pristine.tar.gz
-/votca-tools-1.2.3_pristine.tar.gz
-/votca-tools-1.2.4_pristine.tar.gz
-/v1.3_rc1.tar.gz
-/v1.3.tar.gz
-/v1.3.1.tar.gz
-/votca-tools-1.4_rc1.tar.gz
-/votca-tools-1.4.tar.gz
-/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
-/votca-tools-1.6_rc2.tar.gz
-/votca-tools-1.6.tar.gz
-/votca-tools-1.6.1.tar.gz
-/votca-tools-1.6.2.tar.gz
-/votca-tools-1.6.3.tar.gz
-/votca-tools-1.6.4.tar.gz
-/votca-tools-2021-rc.1.tar.gz
-/votca-tools-2021.tar.gz
-/votca-tools-2021.1.tar.gz
-/votca-tools-2021.2.tar.gz
-/votca-2022-rc.1.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..7134a13
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Replaced by 'votca' package
diff --git a/sources b/sources
deleted file mode 100644
index bafebfc..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (votca-2022-rc.1.tar.gz) = 46a9dbbac663f3e3cceeb5803af108d623a1774d916347c9e6e8cbcbd05297d980132a4ee4508c42e98e567ca8bd38f301aeab4a3bf2f3dcf056333dbe667c97
diff --git a/votca-tools.spec b/votca-tools.spec
deleted file mode 100644
index 641917a..0000000
--- a/votca-tools.spec
+++ /dev/null
@@ -1,317 +0,0 @@
-Name:           votca-tools
-Version:        2022~rc1
-%global         uversion 2022-rc.1
-%global         sover 2022
-Release:        1%{?dist}
-Summary:        VOTCA tools library
-License:        ASL 2.0
-URL:            http://www.votca.org
-Source0:        https://github.com/votca/votca/archive/v%{uversion}.tar.gz#/votca-%{uversion}.tar.gz
-
-BuildRequires:  gcc-c++
-BuildRequires:  cmake3
-BuildRequires:  expat-devel
-BuildRequires:  fftw-devel
-BuildRequires:  eigen3-devel
-BuildRequires:  boost-devel
-
-%description
-Versatile Object-oriented Toolkit for Coarse-graining Applications (VOTCA) is
-a package intended to reduce the amount of routine work when doing systematic
-coarse-graining of various systems. The core is written in C++.
-
-This package contains the basic tools library of VOTCA.
-
-
-%package devel
-Summary:        Development headers and libraries for votca-tools
-Requires:       pkgconfig
-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
-a package intended to reduce the amount of routine work when doing systematic
-coarse-graining of various systems. The core is written in C++.
-
-This package contains development headers and libraries for votca-tools.
-
-
-%prep
-%setup -qn votca-%{uversion}
-
-%build
-%global _vpath_srcdir tools
-%{cmake} -DCMAKE_BUILD_TYPE=Release -DINSTALL_RC_FILES=OFF -DENABLE_TESTING=ON
-%cmake_build
-
-%install
-%cmake_install
-
-%check
-%ctest
-
-%ldconfig_scriptlets
-
-%files
-%license tools/LICENSE
-%doc tools/NOTICE CHANGELOG.rst README.rst
-%{_bindir}/votca_*
-%{_libdir}/libvotca_tools.so.%{sover}
-%{_mandir}/man1/votca*.1*
-%{_mandir}/man7/votca-tools.7*
-
-%files devel
-%{_includedir}/votca/
-%{_libdir}/libvotca_tools.so
-%{_libdir}/cmake/VOTCA_TOOLS
-
-%changelog
-* Tue Nov 30 2021 Christoph Junghans <junghans@votca.org> - 2022~rc1-1
-- Version bump to 2022-rc.1
-
-* Mon Sep 20 2021 Christoph Junghans <junghans@votca.org> - 2021.2-1
-- version bump to v2021.2 (bug #2005702)
-
-* Sat Aug 07 2021 Jonathan Wakely <jwakely@redhat.com> - 2021.1-3
-- Rebuilt for Boost 1.76
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sun Jul 18 2021 Christoph Junghans <junghans@votca.org> - 2021.1-1
-- Version bump to v2021.1 (bug #1983385)
-
-* Sat Mar 13 2021 Christoph Junghans <junghans@votca.org> - 2021-1
-- Version bump to v2021 (bug #1938407)
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021~rc1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 2021~rc1-2
-- Rebuilt for Boost 1.75
-
-* Sun Jan 17 14:40:32 MST 2021 Christoph Junghans <junghans@votca.org> - 2021~rc1-1
-- Version bump to 2021~rc1 (bug #1916971)
-
-* Tue Jan 12 14:13:20 MST 2021 Christoph Junghans <junghans@votca.org> - 1.6.4-1
-- Version bump to v1.6.4 (bug #1915543)
-
-* Wed Dec  9 16:38:14 MST 2020 Christoph Junghans <junghans@votca.org> - 1.6.3-1
-- Version bump to 1.6.3 (bug #1905833)
-
-* Sat Aug 22 2020 Christoph Junghans <junghans@votca.org> - 1.6.2-1
-- Version bump to v1.6.2 (bug #1871342)
-
-* Tue Aug 04 2020 Christoph Junghans <junghans@votca.org> - 1.6.1-4
-- Fix out-of-source build on F33 (bug#1865610)
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-3
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Jun 21 2020 Christoph Junghans <junghans@votca.org> - 1.6.1-1
-- Version bump to v1.6.1
-
-* Thu May 28 2020 Jonathan Wakely <jwakely@redhat.com> - 1.6-2
-- Rebuilt for Boost 1.73
-
-* 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
-
-* 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
-
-* 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)
-
-* Fri Nov 22 2019 Christoph Junghans <junghans@votca.org> - 1.5.1-2
-- Fix python3 shebang
-
-* Thu Nov 21 2019 Christoph Junghans <junghans@votca.org> - 1.5.1-1
-- Version bump to 1.5.1 (bug #1774849)
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Christoph Junghans <junghans@votca.org> - 1.5-1
-- Version bump to v1.5
-
-* Fri Jan 25 2019 Jonathan Wakely <jwakely@redhat.com> - 1.4.1-1.4
-- Rebuilt for Boost 1.69
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-1.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-1.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Jan 23 2018 Jonathan Wakely <jwakely@redhat.com> - 1.4.1-1.1
-- Rebuilt for Boost 1.66
-
-* Sun Sep 03 2017 Christoph Junghans <junghans@votca.org> - 1.4.1-1
-- Update to 1.4.1
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-1.7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Sun Jul 30 2017 Florian Weimer <fweimer@redhat.com> - 1.4-1.6
-- Rebuild with binutils fix for ppc64le (#1475636)
-
-* Tue Jul 25 2017 Christoph Junghans <junghans@votca.org> - 1.4-1.5
-- Rebuild for gsl 2.4
-
-* Mon Jul 24 2017 Björn Esser <besser82@fedoraproject.org> - 1.4-1.4
-- Rebuilt for Boost 1.64
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-1.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-1.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 1.4-1.1
-- Rebuilt for Boost 1.63
-
-* Sun Oct 30 2016 Christoph Junghans <junghans@votca.org> - 1.4-1
-- Update to 1.4
-
-* Mon Oct 03 2016 Christoph Junghans <junghans@votca.org> - 1.4-0.2rc1
-- clean up, don't install RC files
-
-* Wed Sep 28 2016 Christoph Junghans <junghans@votca.org> - 1.4-0.1rc1
-- Update to 1.4_rc1
-
-* Mon Aug 22 2016 Christoph Junghans <junghans@votca.org> - 1.3.1-1
-- Update to 1.3.1
-- Drop obsolete patch
-
-* Mon Feb 22 2016 Orion Poplawski <orion@cora.nwra.com> - 1.3-1.2
-- Rebuild for gsl 2.1
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jan 20 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.3-1
-- Update to 1.3
-- cleanup spec
-- Add patch to add shebangs to scripts
-
-* Sat Jan 16 2016 Jonathan Wakely <jwakely@redhat.com> - 1.3-0.2rc1
-- Rebuilt for Boost 1.60
-
-* Mon Nov 09 2015 Thomas Spura <tomspur@fedoraproject.org> - 1.3-0.1.rc1
-- update to 1.3_rc1
-- cleanup spec
-
-* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 1.2.4-8
-- Rebuilt for Boost 1.59
-
-* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.4-7
-- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
-
-* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 1.2.4-6
-- rebuild for Boost 1.58
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Apr 24 2015 Thomas Spura <tomspur@fedoraproject.org> - 1.2.4-4
-- Rebuilt with new gcc
-
-* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 1.2.4-3
-- Rebuild for boost 1.57.0
-
-* Sun Sep  7 2014 Thomas Spura <tomspur@fedoraproject.org> - 1.2.4-2
-- correct source url
-
-* Fri Sep 05 2014 Christoph Junghans <junghans@votca.org> - 1.2.4-1
-- Update to 1.2.4
-- Drop obsolete patch
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu May 22 2014 Petr Machata <pmachata@redhat.com> - 1.2.3-4
-- Rebuild for boost 1.55.0
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Sat Jul 27 2013 pmachata@redhat.com - 1.2.3-2
-- Rebuild for boost 1.54.0
-
-* Sun Feb 10 2013 Susi Lehtola <jussilehtola@fedoraproject.org> - 1.2.3-1
-- Update to 1.2.3, fix build in rawhide.
-
-* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.2.1-6.1
-- Rebuild for Boost-1.53.0
-
-* Tue Aug 14 2012 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.2.1-5.1
-- Bump due to boost update.
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-4.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-3.1
-- Rebuilt for c++ ABI breakage
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-2.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Sun Nov 20 2011 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.2.1-1.1
-- Bump due to boost update.
-
-* Thu Aug 25 2011 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.2.1-1
-- Update to 1.2.1.
-
-* Fri Jul 22 2011 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.1-3
-- Bump spec due to new boost.
-
-* Wed Apr 06 2011 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.1-2
-- Bump spec due to Boost upgrade.
-
-* Sun Feb 20 2011 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.1-1
-- Update to 1.1.
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sun Feb 06 2011 Thomas Spura <tomspur@fedoraproject.org> - 1.0.1-4
-- rebuild for new boost
-
-* Sun Dec 26 2010 Dan Horák <dan[at]danny.cz> - 1.0.1-3
-- fix build on non-x86 64-bit architectures (ax_boost_base.m4 is wrong)
-
-* Tue Dec 14 2010 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.0.1-2
-- Preserve timestamps on install.
-- Added Requires: pkgconfig in -devel for EPEL support.
-
-* Tue Dec 07 2010 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.0.1-1
-- Update to 1.0.1.
-- Drop bash completion (moved to votca-csg).
-- Disable rc files.
-- Added expat-devel and boost-devel as Requires in -devel.
-
-* Thu Nov 25 2010 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.0-1
-- First release.