From b059fdc2d48408af5abc96fc202b9f45284a3f9e Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Thu, 5 Dec 2019 03:48:45 -0700
Subject: [PATCH 01/29] Version bump to 1.6_rc1 (bug #1779848)

---
 .gitignore     |  2 ++
 sources        |  4 ++--
 votca-csg.spec | 28 +++++++++++-----------------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 75047bb..7ea7757 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@
 /votca-csg-manual-1.5.pdf
 /votca-csg-1.5.1.tar.gz
 /votca-csg-manual-1.5.1.pdf
+/votca-csg-1.6_rc1.tar.gz
+/votca-csg-manual-1.6_rc1.pdf
diff --git a/sources b/sources
index 8bd24e8..140a5b3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (votca-csg-1.5.1.tar.gz) = 3559452182c325d5df72918ec6e12122c8214df9733d779c123ff199597fe47fc493fd75adf1f5dbc6b55016373863378ba3cc69fb6b61bc1531c6e591d8131c
-SHA512 (votca-csg-manual-1.5.1.pdf) = 7d9fb4c635383e1b9c9547691f8729e19f273fcafc4dab2a6b438b3ce98ea05bd31887d09bc4edc86ceb0b04d71a4371aed7aadc3ba6864f7be2ef3328ede642
+SHA512 (votca-csg-1.6_rc1.tar.gz) = 6622648ddc3308ca2f8e98d6dbcd28e33a4e0fb44d96ef94ebcaa2e87e5ba3ca2ab83dcc1de4fd0803dbc20ba7192f5fdd2c935b364ed4e2122b5948c10d4936
+SHA512 (votca-csg-manual-1.6_rc1.pdf) = 2514bd2fee4bae787a3f8c07d1f1d90061a2b503255efe0730ed164bb002c7e7ad7309ccd3b5b931994f70b7ed99afde28955d9ea1b34c86df21bfcb8bfb39bb
diff --git a/votca-csg.spec b/votca-csg.spec
index b88754b..937f805 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -1,9 +1,9 @@
-#global _rcname rc1
-#global _rc _%%_rcname
+%global _rcname rc1
+%global _rc _%%_rcname
 
 Name:           votca-csg
-Version:        1.5.1
-Release:        1%{?_rcname}%{?dist}
+Version:        1.6
+Release:        0.1%{?_rcname}%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -96,32 +96,23 @@ This package contains architecture independent documentation for VOTCA CSG.
 
 %prep
 %setup -qn csg-%{version}%{?_rc}
-%if 0%{?rhel}
-sed -i '/Boost/s/1.57.0/1.53.0/' src/tests/CMakeLists.txt
-%endif
 
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake3} .. -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=ON -DREGRESSIONTEST_TOLERANCE="2e-5"
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install -C %{_target_platform}
 # Install bash completion file
-install -D -p -m 644 scripts/csg-completion.bash %{buildroot}%{_datadir}/bash_completion/votca
-sed -i '1s@env @@' %{buildroot}/%{_datadir}/votca/scripts/inverse/*.py
+mkdir -p %{buildroot}%{_datadir}/bash_completion
+mv %{buildroot}%{_datadir}/votca/rc/csg-completion.bash %{buildroot}%{_datadir}/bash_completion/votca
 
 mkdir -p %{buildroot}%{_docdir}/%{name}
 cp %{S:1} %{buildroot}%{_docdir}/%{name}
 
 %check
-%if 0%{?rhel}
-%ifarch ppc64le
-# Boost testing broken on ppc64le
-%global testargs ARGS='-E .'
-%endif
-%endif
 make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testargs}}
 
 %ldconfig_scriptlets libs
@@ -147,12 +138,15 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testarg
 %files devel
 %{_includedir}/votca/csg/
 %{_libdir}/libvotca_csg.so
-%{_libdir}/pkgconfig/libvotca_csg.pc
+%{_libdir}/cmake/VOTCA_CSG
 
 %files bash
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Thu Dec 05 2019 Christoph Junghans <junghans@votca.org> - 1.6-0.1rc1
+- Version bump to 1.6_rc1 (bug #1779848)
+
 * Fri Nov 22 2019 Christoph Junghans <junghans@votca.org> - 1.5.1-1
 - Version bump to 1.5.1 (bug #1774830)
 

From 9231cc4dd9d314a9ed98ab6756e333ab4a222b96 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Thu, 5 Dec 2019 06:48:54 -0700
Subject: [PATCH 02/29] added sover

---
 votca-csg.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/votca-csg.spec b/votca-csg.spec
index 937f805..fadc4bc 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -3,6 +3,7 @@
 
 Name:           votca-csg
 Version:        1.6
+%global         sover 6
 Release:        0.1%{?_rcname}%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
@@ -45,6 +46,7 @@ This package contains libraries for the VOTCA coarse-graining engine.
 %package devel
 Summary:    Development headers and libraries for VOTCA coarse-graining Engine
 Requires:   %{name}-libs = %{version}-%{release}
+Requires:   %{name} = %{version}-%{release}
 Requires:   votca-tools-devel
 
 %description devel
@@ -133,7 +135,7 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testarg
 
 %files libs
 %license LICENSE
-%{_libdir}/libvotca_csg.so.*
+%{_libdir}/libvotca_csg.so.%{sover}
 
 %files devel
 %{_includedir}/votca/csg/

From 60b1b10967c5ab914396e299e46834dfb0dc6268 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Thu, 12 Dec 2019 12:04:51 -0700
Subject: [PATCH 03/29] Added upstream 473.patch to fix 32bit build

---
 473.patch      | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++
 votca-csg.spec |  7 +++-
 2 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 473.patch

diff --git a/473.patch b/473.patch
new file mode 100644
index 0000000..a53350a
--- /dev/null
+++ b/473.patch
@@ -0,0 +1,96 @@
+From 5203ea650ba0b61b2742560d3b9278b70ed2078f Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@votca.org>
+Date: Tue, 10 Dec 2019 10:08:31 -0700
+Subject: [PATCH 1/3] BeadList: Long -> Index
+
+---
+ src/libcsg/beadlist.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libcsg/beadlist.cc b/src/libcsg/beadlist.cc
+index 6c4c8732..c2b051a5 100644
+--- a/src/libcsg/beadlist.cc
++++ b/src/libcsg/beadlist.cc
+@@ -24,7 +24,7 @@ namespace csg {
+ 
+ using namespace std;
+ 
+-long BeadList::Generate(Topology &top, const string &select) {
++Index BeadList::Generate(Topology &top, const string &select) {
+   _topology = &top;
+   bool selectByName = false;
+   string pSelect;  // parsed selection string
+@@ -51,7 +51,7 @@ long BeadList::Generate(Topology &top, const string &select) {
+   return size();
+ }
+ 
+-long BeadList::GenerateInSphericalSubvolume(Topology &top, const string &select,
++Index BeadList::GenerateInSphericalSubvolume(Topology &top, const string &select,
+                                             Eigen::Vector3d ref,
+                                             double radius) {
+   _topology = &top;
+
+From 38665d2d24fcfefa40ac61cab8e9c9a55c596b42 Mon Sep 17 00:00:00 2001
+From: Jens <jenswehner@gmail.com>
+Date: Tue, 10 Dec 2019 18:15:08 +0100
+Subject: [PATCH 2/3] more long
+
+---
+ src/libcsg/molecule.cc | 2 +-
+ src/libcsg/topology.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libcsg/molecule.cc b/src/libcsg/molecule.cc
+index 677523a9..ebf15826 100644
+--- a/src/libcsg/molecule.cc
++++ b/src/libcsg/molecule.cc
+@@ -31,7 +31,7 @@ void Molecule::AddBead(Bead *bead, const string &name) {
+   bead->setMolecule(this);
+ }
+ 
+-long Molecule::getBeadByName(const string &name) {
++Index Molecule::getBeadByName(const string &name) {
+   map<string, Index>::iterator iter = _beadmap.find(name);
+   if (iter == _beadmap.end()) {
+     std::cout << "cannot find: <" << name << "> in " << _name << "\n";
+diff --git a/src/libcsg/topology.cc b/src/libcsg/topology.cc
+index d9218fab..785b3216 100644
+--- a/src/libcsg/topology.cc
++++ b/src/libcsg/topology.cc
+@@ -199,7 +199,7 @@ void Topology::CopyTopologyData(Topology *top) {
+   }
+ }
+ 
+-long Topology::getBeadTypeId(string type) const {
++Index Topology::getBeadTypeId(string type) const {
+   assert(beadtypes_.count(type));
+   return beadtypes_.at(type);
+ }
+
+From 6180aafd370b15bd453f999d3896c339603dfb58 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@votca.org>
+Date: Tue, 10 Dec 2019 15:15:51 -0700
+Subject: [PATCH 3/3] make format
+
+---
+ src/libcsg/beadlist.cc | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/libcsg/beadlist.cc b/src/libcsg/beadlist.cc
+index c2b051a5..519c6d81 100644
+--- a/src/libcsg/beadlist.cc
++++ b/src/libcsg/beadlist.cc
+@@ -51,9 +51,10 @@ Index BeadList::Generate(Topology &top, const string &select) {
+   return size();
+ }
+ 
+-Index BeadList::GenerateInSphericalSubvolume(Topology &top, const string &select,
+-                                            Eigen::Vector3d ref,
+-                                            double radius) {
++Index BeadList::GenerateInSphericalSubvolume(Topology &top,
++                                             const string &select,
++                                             Eigen::Vector3d ref,
++                                             double radius) {
+   _topology = &top;
+   bool selectByName = false;
+   string pSelect;  // parsed selection string
diff --git a/votca-csg.spec b/votca-csg.spec
index fadc4bc..e5569e0 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -4,12 +4,13 @@
 Name:           votca-csg
 Version:        1.6
 %global         sover 6
-Release:        0.1%{?_rcname}%{?dist}
+Release:        0.2%{?_rcname}%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
 Source0:        https://github.com/votca/csg/archive/v%{version}%{?_rc}.tar.gz#/%{name}-%{version}%{?_rc}.tar.gz
 Source1:        https://github.com/votca/csg/releases/download/v%{version}%{?_rc}/votca-csg-manual-%{version}%{?_rc}.pdf
+Patch0:         https://github.com/votca/csg/pull/473.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake3
@@ -98,6 +99,7 @@ This package contains architecture independent documentation for VOTCA CSG.
 
 %prep
 %setup -qn csg-%{version}%{?_rc}
+%patch0 -p1
 
 %build
 mkdir %{_target_platform}
@@ -146,6 +148,9 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testarg
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Thu Dec 12 2019 Christoph Junghans <junghans@votca.org> - 1.6-0.2rc1
+- Added upstream 473.patch to fix 32bit build
+
 * Thu Dec 05 2019 Christoph Junghans <junghans@votca.org> - 1.6-0.1rc1
 - Version bump to 1.6_rc1 (bug #1779848)
 

From d61e5cdabf57c4a8b348337018b49be885f026ca Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jan 2020 03:22:51 +0000
Subject: [PATCH 04/29] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

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

diff --git a/votca-csg.spec b/votca-csg.spec
index e5569e0..73842ae 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -4,7 +4,7 @@
 Name:           votca-csg
 Version:        1.6
 %global         sover 6
-Release:        0.2%{?_rcname}%{?dist}
+Release:        0.3%{?_rcname}%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -148,6 +148,9 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testarg
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-0.3rc1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Thu Dec 12 2019 Christoph Junghans <junghans@votca.org> - 1.6-0.2rc1
 - Added upstream 473.patch to fix 32bit build
 

From c87ef65188d1d5d98721de0ce89a22302734eb7c Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Mon, 10 Feb 2020 10:04:22 -0700
Subject: [PATCH 05/29] Version bump to 1.6~rc2

---
 .gitignore     |  2 ++
 473.patch      | 96 --------------------------------------------------
 sources        |  4 +--
 votca-csg.spec | 22 ++++++------
 4 files changed, 15 insertions(+), 109 deletions(-)
 delete mode 100644 473.patch

diff --git a/.gitignore b/.gitignore
index 7ea7757..6ea1862 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@
 /votca-csg-manual-1.5.1.pdf
 /votca-csg-1.6_rc1.tar.gz
 /votca-csg-manual-1.6_rc1.pdf
+/votca-csg-1.6_rc2.tar.gz
+/votca-csg-manual-1.6_rc2.pdf
diff --git a/473.patch b/473.patch
deleted file mode 100644
index a53350a..0000000
--- a/473.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 5203ea650ba0b61b2742560d3b9278b70ed2078f Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Tue, 10 Dec 2019 10:08:31 -0700
-Subject: [PATCH 1/3] BeadList: Long -> Index
-
----
- src/libcsg/beadlist.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libcsg/beadlist.cc b/src/libcsg/beadlist.cc
-index 6c4c8732..c2b051a5 100644
---- a/src/libcsg/beadlist.cc
-+++ b/src/libcsg/beadlist.cc
-@@ -24,7 +24,7 @@ namespace csg {
- 
- using namespace std;
- 
--long BeadList::Generate(Topology &top, const string &select) {
-+Index BeadList::Generate(Topology &top, const string &select) {
-   _topology = &top;
-   bool selectByName = false;
-   string pSelect;  // parsed selection string
-@@ -51,7 +51,7 @@ long BeadList::Generate(Topology &top, const string &select) {
-   return size();
- }
- 
--long BeadList::GenerateInSphericalSubvolume(Topology &top, const string &select,
-+Index BeadList::GenerateInSphericalSubvolume(Topology &top, const string &select,
-                                             Eigen::Vector3d ref,
-                                             double radius) {
-   _topology = &top;
-
-From 38665d2d24fcfefa40ac61cab8e9c9a55c596b42 Mon Sep 17 00:00:00 2001
-From: Jens <jenswehner@gmail.com>
-Date: Tue, 10 Dec 2019 18:15:08 +0100
-Subject: [PATCH 2/3] more long
-
----
- src/libcsg/molecule.cc | 2 +-
- src/libcsg/topology.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libcsg/molecule.cc b/src/libcsg/molecule.cc
-index 677523a9..ebf15826 100644
---- a/src/libcsg/molecule.cc
-+++ b/src/libcsg/molecule.cc
-@@ -31,7 +31,7 @@ void Molecule::AddBead(Bead *bead, const string &name) {
-   bead->setMolecule(this);
- }
- 
--long Molecule::getBeadByName(const string &name) {
-+Index Molecule::getBeadByName(const string &name) {
-   map<string, Index>::iterator iter = _beadmap.find(name);
-   if (iter == _beadmap.end()) {
-     std::cout << "cannot find: <" << name << "> in " << _name << "\n";
-diff --git a/src/libcsg/topology.cc b/src/libcsg/topology.cc
-index d9218fab..785b3216 100644
---- a/src/libcsg/topology.cc
-+++ b/src/libcsg/topology.cc
-@@ -199,7 +199,7 @@ void Topology::CopyTopologyData(Topology *top) {
-   }
- }
- 
--long Topology::getBeadTypeId(string type) const {
-+Index Topology::getBeadTypeId(string type) const {
-   assert(beadtypes_.count(type));
-   return beadtypes_.at(type);
- }
-
-From 6180aafd370b15bd453f999d3896c339603dfb58 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Tue, 10 Dec 2019 15:15:51 -0700
-Subject: [PATCH 3/3] make format
-
----
- src/libcsg/beadlist.cc | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/libcsg/beadlist.cc b/src/libcsg/beadlist.cc
-index c2b051a5..519c6d81 100644
---- a/src/libcsg/beadlist.cc
-+++ b/src/libcsg/beadlist.cc
-@@ -51,9 +51,10 @@ Index BeadList::Generate(Topology &top, const string &select) {
-   return size();
- }
- 
--Index BeadList::GenerateInSphericalSubvolume(Topology &top, const string &select,
--                                            Eigen::Vector3d ref,
--                                            double radius) {
-+Index BeadList::GenerateInSphericalSubvolume(Topology &top,
-+                                             const string &select,
-+                                             Eigen::Vector3d ref,
-+                                             double radius) {
-   _topology = &top;
-   bool selectByName = false;
-   string pSelect;  // parsed selection string
diff --git a/sources b/sources
index 140a5b3..21442fd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (votca-csg-1.6_rc1.tar.gz) = 6622648ddc3308ca2f8e98d6dbcd28e33a4e0fb44d96ef94ebcaa2e87e5ba3ca2ab83dcc1de4fd0803dbc20ba7192f5fdd2c935b364ed4e2122b5948c10d4936
-SHA512 (votca-csg-manual-1.6_rc1.pdf) = 2514bd2fee4bae787a3f8c07d1f1d90061a2b503255efe0730ed164bb002c7e7ad7309ccd3b5b931994f70b7ed99afde28955d9ea1b34c86df21bfcb8bfb39bb
+SHA512 (votca-csg-1.6_rc2.tar.gz) = e0e0be7cdee7a4e7bfe10c0fce7ec56e29cb1a9a65f40ca3195b0ee9d972a9463fd8690bd7a166eeaaeaaf3eb4444f50bf3bcb22c96878b958cc9df03f57ddde
+SHA512 (votca-csg-manual-1.6_rc2.pdf) = 26d0d9cecc6c450cb3fdef91de9f59f61541d17e06308ddf157124f9c9b28f79df262be8ac7e896fa3dc5a7494d5266777dc458d44ba63b3983bd2a552321ebd
diff --git a/votca-csg.spec b/votca-csg.spec
index 73842ae..a374666 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -1,16 +1,13 @@
-%global _rcname rc1
-%global _rc _%%_rcname
-
 Name:           votca-csg
-Version:        1.6
+Version:        1.6~rc2
+%global         uversion 1.6_rc2
 %global         sover 6
-Release:        0.3%{?_rcname}%{?dist}
+Release:        1%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
-Source0:        https://github.com/votca/csg/archive/v%{version}%{?_rc}.tar.gz#/%{name}-%{version}%{?_rc}.tar.gz
-Source1:        https://github.com/votca/csg/releases/download/v%{version}%{?_rc}/votca-csg-manual-%{version}%{?_rc}.pdf
-Patch0:         https://github.com/votca/csg/pull/473.patch
+Source0:        https://github.com/votca/csg/archive/v%{uversion}.tar.gz#/%{name}-%{uversion}.tar.gz
+Source1:        https://github.com/votca/csg/releases/download/v%{uversion}/votca-csg-manual-%{uversion}.pdf
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake3
@@ -98,8 +95,7 @@ This package contains architecture independent documentation for VOTCA CSG.
 
 
 %prep
-%setup -qn csg-%{version}%{?_rc}
-%patch0 -p1
+%setup -qn csg-%{uversion}
 
 %build
 mkdir %{_target_platform}
@@ -117,7 +113,7 @@ mkdir -p %{buildroot}%{_docdir}/%{name}
 cp %{S:1} %{buildroot}%{_docdir}/%{name}
 
 %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 libs
 
@@ -148,6 +144,10 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testarg
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Mon Feb 10 2020 Christoph Junghans <junghans@votca.org> - 1.6~rc2-1
+- Version bump to 1.6~rc2
+- Drop 473.patch - merged upstream
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-0.3rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From a3ba81092fc766397dbbf2dc06631711031bb854 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Mon, 10 Feb 2020 10:24:24 -0700
Subject: [PATCH 06/29] increase test tolerance of aarch64

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

diff --git a/votca-csg.spec b/votca-csg.spec
index a374666..be22888 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -100,7 +100,7 @@ This package contains architecture independent documentation for VOTCA CSG.
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake3} .. -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=ON -DREGRESSIONTEST_TOLERANCE="2e-5"
+%{cmake3} .. -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=ON -DREGRESSIONTEST_TOLERANCE="3e-5"
 %make_build
 
 %install

From d025dfac7bafac2c43cdbf181b6d295acbf9a7c9 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Sat, 18 Apr 2020 07:54:32 -0600
Subject: [PATCH 07/29] Version bump to v1.6 (bug #1825473)

---
 .gitignore     | 2 ++
 sources        | 4 ++--
 votca-csg.spec | 7 +++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6ea1862..18da685 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@
 /votca-csg-manual-1.6_rc1.pdf
 /votca-csg-1.6_rc2.tar.gz
 /votca-csg-manual-1.6_rc2.pdf
+/votca-csg-1.6.tar.gz
+/votca-csg-manual-1.6.pdf
diff --git a/sources b/sources
index 21442fd..a85a8c2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (votca-csg-1.6_rc2.tar.gz) = e0e0be7cdee7a4e7bfe10c0fce7ec56e29cb1a9a65f40ca3195b0ee9d972a9463fd8690bd7a166eeaaeaaf3eb4444f50bf3bcb22c96878b958cc9df03f57ddde
-SHA512 (votca-csg-manual-1.6_rc2.pdf) = 26d0d9cecc6c450cb3fdef91de9f59f61541d17e06308ddf157124f9c9b28f79df262be8ac7e896fa3dc5a7494d5266777dc458d44ba63b3983bd2a552321ebd
+SHA512 (votca-csg-1.6.tar.gz) = 76cda93023d46a66ae31edcec0ece709ddc70a9be9d098721b945006c197ed3b6cbd1e643158797be518c4fe66f7b23d3e8d8735cbd9e155db3db0d79929cfbe
+SHA512 (votca-csg-manual-1.6.pdf) = e91d4b8397b67808c9671b9adbaad41fd9a0ede90066e220839d86f21a9bbcd4e433534faf1dfbca106d55af5a6cce0425a5bdfa3eb30ebe14469594da0129ca
diff --git a/votca-csg.spec b/votca-csg.spec
index be22888..f616583 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -1,6 +1,6 @@
 Name:           votca-csg
-Version:        1.6~rc2
-%global         uversion 1.6_rc2
+Version:        1.6
+%global         uversion %{version}
 %global         sover 6
 Release:        1%{?dist}
 Summary:        VOTCA coarse-graining engine
@@ -144,6 +144,9 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Sat Apr 18 2020 Christoph Junghans <junghans@votca.org> - 1.6-1
+- Version bump to v1.6 (bug #1825473)
+
 * Mon Feb 10 2020 Christoph Junghans <junghans@votca.org> - 1.6~rc2-1
 - Version bump to 1.6~rc2
 - Drop 473.patch - merged upstream

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

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

diff --git a/votca-csg.spec b/votca-csg.spec
index f616583..67a1a75 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -2,7 +2,7 @@ Name:           votca-csg
 Version:        1.6
 %global         uversion %{version}
 %global         sover 6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -144,6 +144,9 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
 %{_datadir}/bash_completion/votca
 
 %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 #1825473)
 

From 216e0abc0f1d47004b8852fb0d16dede9447043a Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Sun, 21 Jun 2020 10:43:50 -0600
Subject: [PATCH 09/29] Version bump to v1.6.1

---
 .gitignore     | 2 ++
 sources        | 4 ++--
 votca-csg.spec | 7 +++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 18da685..25c8f9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@
 /votca-csg-manual-1.6_rc2.pdf
 /votca-csg-1.6.tar.gz
 /votca-csg-manual-1.6.pdf
+/votca-csg-1.6.1.tar.gz
+/votca-csg-manual-1.6.1.pdf
diff --git a/sources b/sources
index a85a8c2..35189d1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (votca-csg-1.6.tar.gz) = 76cda93023d46a66ae31edcec0ece709ddc70a9be9d098721b945006c197ed3b6cbd1e643158797be518c4fe66f7b23d3e8d8735cbd9e155db3db0d79929cfbe
-SHA512 (votca-csg-manual-1.6.pdf) = e91d4b8397b67808c9671b9adbaad41fd9a0ede90066e220839d86f21a9bbcd4e433534faf1dfbca106d55af5a6cce0425a5bdfa3eb30ebe14469594da0129ca
+SHA512 (votca-csg-1.6.1.tar.gz) = b8f0f1bf2ca57ee9e2050b4a76e1d725ccb0908314886415f36d4e4554953b4e1c93f7c05502afb77f9b7b5ef3059ebbf7f223b965ba72ae45736798fa2e6ad9
+SHA512 (votca-csg-manual-1.6.1.pdf) = d627a9c7a71b8ac5e8d6ca109f0ea56978706b0dd1408aaf10b75b4b52f40b6150063248477ca2b5922f603e8d582ddd4dec3de73b3991db5fbb7bf204d347a3
diff --git a/votca-csg.spec b/votca-csg.spec
index 67a1a75..31506eb 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -1,8 +1,8 @@
 Name:           votca-csg
-Version:        1.6
+Version:        1.6.1
 %global         uversion %{version}
 %global         sover 6
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -144,6 +144,9 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
 %{_datadir}/bash_completion/votca
 
 %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 1fbf4fd2b80e4b455d6a8b5b2b82cce87429f0cf Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Thu, 25 Jun 2020 14:30:31 -0600
Subject: [PATCH 10/29] Rebuild for hdf5 1.10.6

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

diff --git a/votca-csg.spec b/votca-csg.spec
index 31506eb..3cdb7a3 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -2,7 +2,7 @@ Name:           votca-csg
 Version:        1.6.1
 %global         uversion %{version}
 %global         sover 6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -144,6 +144,9 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Thu Jun 25 2020 Orion Poplawski <orion@cora.nwra.com> - 1.6.1-2
+- Rebuild for hdf5 1.10.6
+
 * Sun Jun 21 2020 Christoph Junghans <junghans@votca.org> - 1.6.1-1
 - Version bump to v1.6.1
 

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

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

diff --git a/votca-csg.spec b/votca-csg.spec
index 3cdb7a3..3f395d6 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -2,7 +2,7 @@ Name:           votca-csg
 Version:        1.6.1
 %global         uversion %{version}
 %global         sover 6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -144,6 +144,9 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Thu Jun 25 2020 Orion Poplawski <orion@cora.nwra.com> - 1.6.1-2
 - Rebuild for hdf5 1.10.6
 

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

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

diff --git a/votca-csg.spec b/votca-csg.spec
index 3f395d6..2e82b86 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -2,7 +2,7 @@ Name:           votca-csg
 Version:        1.6.1
 %global         uversion %{version}
 %global         sover 6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -144,6 +144,10 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-4
+- 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-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From c5999f12d010f0e7edc6f90a3f5b59587b4729c4 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Mon, 3 Aug 2020 23:48:54 -0600
Subject: [PATCH 13/29] Fix out-of-source build on F33 (bug#1865609)

---
 573.patch      | 28 ++++++++++++++++++++++++++++
 votca-csg.spec | 17 ++++++++++-------
 2 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 573.patch

diff --git a/573.patch b/573.patch
new file mode 100644
index 0000000..60d6c60
--- /dev/null
+++ b/573.patch
@@ -0,0 +1,28 @@
+From 65df20fe4499239284fe69d912922584e9a575f2 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@votca.org>
+Date: Mon, 3 Aug 2020 23:24:49 -0600
+Subject: [PATCH] cmake: fix test dependencies for parallel ctest
+
+---
+ src/tools/CMakeLists.txt | 6 +++---
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
+index ba266f9e4..870bd8da1 100644
+--- a/src/tools/CMakeLists.txt
++++ b/src/tools/CMakeLists.txt
+@@ -93,11 +93,11 @@
+   add_test(NAME integration_Compare_csg_fmatch_3body_output1 COMMAND $<TARGET_FILE:VOTCA::votca_compare> --etol ${REGRESSIONTEST_TOLERANCE} -f1 CG-CG.force -f2 ${REFPATH}/CG-CG.force.fmatch_3body WORKING_DIRECTORY ${RUNPATH})
+   add_test(NAME integration_Compare_csg_fmatch_3body_output2 COMMAND $<TARGET_FILE:VOTCA::votca_compare> --etol ${REGRESSIONTEST_TOLERANCE} -f1 CG-CG-CG.force -f2 ${REFPATH}/CG-CG-CG.force.fmatch_3body WORKING_DIRECTORY ${RUNPATH})
+   add_test(NAME integration_Compare_csg_fmatch_3body_output3 COMMAND $<TARGET_FILE:VOTCA::votca_compare> --etol ${REGRESSIONTEST_TOLERANCE} -f1 CG-CG-CG.pot -f2 ${REFPATH}/CG-CG-CG.pot.fmatch_3body WORKING_DIRECTORY ${RUNPATH})
+-  set_tests_properties(integration_Compare_csg_fmatch_3body_output1 PROPERTIES DEPENDS integration_Run_csg_fmatch)
++  set_tests_properties(integration_Compare_csg_fmatch_3body_output1 PROPERTIES DEPENDS integration_Run_csg_fmatch_3body)
+   set_tests_properties(integration_Compare_csg_fmatch_3body_output1 PROPERTIES LABELS "csg;tools;votca;integration")
+-  set_tests_properties(integration_Compare_csg_fmatch_3body_output2 PROPERTIES DEPENDS integration_Run_csg_fmatch)
++  set_tests_properties(integration_Compare_csg_fmatch_3body_output2 PROPERTIES DEPENDS integration_Run_csg_fmatch_3body)
+   set_tests_properties(integration_Compare_csg_fmatch_3body_output2 PROPERTIES LABELS "csg;tools;votca;integration")
+-  set_tests_properties(integration_Compare_csg_fmatch_3body_output3 PROPERTIES DEPENDS integration_Run_csg_fmatch)
++  set_tests_properties(integration_Compare_csg_fmatch_3body_output3 PROPERTIES DEPENDS integration_Run_csg_fmatch_3body)
+   set_tests_properties(integration_Compare_csg_fmatch_3body_output3 PROPERTIES LABELS "csg;tools;votca;integration")
+ 
+   set(RUNPATH ${CMAKE_CURRENT_BINARY_DIR}/Run_csg_map)
diff --git a/votca-csg.spec b/votca-csg.spec
index 2e82b86..27e09c4 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -2,12 +2,13 @@ Name:           votca-csg
 Version:        1.6.1
 %global         uversion %{version}
 %global         sover 6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
 Source0:        https://github.com/votca/csg/archive/v%{uversion}.tar.gz#/%{name}-%{uversion}.tar.gz
 Source1:        https://github.com/votca/csg/releases/download/v%{uversion}/votca-csg-manual-%{uversion}.pdf
+Patch0:         573.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake3
@@ -96,15 +97,14 @@ This package contains architecture independent documentation for VOTCA CSG.
 
 %prep
 %setup -qn csg-%{uversion}
+%patch -p1
 
 %build
-mkdir %{_target_platform}
-pushd %{_target_platform}
-%{cmake3} .. -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=ON -DREGRESSIONTEST_TOLERANCE="3e-5"
-%make_build
+%{cmake3} -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=ON -DREGRESSIONTEST_TOLERANCE="3e-5"
+%cmake_build
 
 %install
-%make_install -C %{_target_platform}
+%cmake_install
 # Install bash completion file
 mkdir -p %{buildroot}%{_datadir}/bash_completion
 mv %{buildroot}%{_datadir}/votca/rc/csg-completion.bash %{buildroot}%{_datadir}/bash_completion/votca
@@ -113,7 +113,7 @@ mkdir -p %{buildroot}%{_docdir}/%{name}
 cp %{S:1} %{buildroot}%{_docdir}/%{name}
 
 %check
-make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
+%ctest
 
 %ldconfig_scriptlets libs
 
@@ -144,6 +144,9 @@ make -C %{_target_platform} test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Tue Aug 04 2020 Christoph Junghans <junghans@votca.org> - 1.6.1-5
+- Fix out-of-source build on F33 (bug#1865609)
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-4
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

From 675821204de967031cb05e6f496e8c8fcd1a450b Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Sat, 22 Aug 2020 12:13:20 -0600
Subject: [PATCH 14/29] Version bump to v1.6.2 (bug #1871344)

---
 .gitignore     |  1 +
 573.patch      | 28 ----------------------------
 585.patch      | 32 ++++++++++++++++++++++++++++++++
 sources        |  3 +--
 votca-csg.spec | 11 +++++++----
 5 files changed, 41 insertions(+), 34 deletions(-)
 delete mode 100644 573.patch
 create mode 100644 585.patch

diff --git a/.gitignore b/.gitignore
index 25c8f9b..acbae62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /votca-csg-manual-1.6.pdf
 /votca-csg-1.6.1.tar.gz
 /votca-csg-manual-1.6.1.pdf
+/votca-csg-1.6.2.tar.gz
diff --git a/573.patch b/573.patch
deleted file mode 100644
index 60d6c60..0000000
--- a/573.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 65df20fe4499239284fe69d912922584e9a575f2 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Mon, 3 Aug 2020 23:24:49 -0600
-Subject: [PATCH] cmake: fix test dependencies for parallel ctest
-
----
- src/tools/CMakeLists.txt | 6 +++---
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index ba266f9e4..870bd8da1 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -93,11 +93,11 @@
-   add_test(NAME integration_Compare_csg_fmatch_3body_output1 COMMAND $<TARGET_FILE:VOTCA::votca_compare> --etol ${REGRESSIONTEST_TOLERANCE} -f1 CG-CG.force -f2 ${REFPATH}/CG-CG.force.fmatch_3body WORKING_DIRECTORY ${RUNPATH})
-   add_test(NAME integration_Compare_csg_fmatch_3body_output2 COMMAND $<TARGET_FILE:VOTCA::votca_compare> --etol ${REGRESSIONTEST_TOLERANCE} -f1 CG-CG-CG.force -f2 ${REFPATH}/CG-CG-CG.force.fmatch_3body WORKING_DIRECTORY ${RUNPATH})
-   add_test(NAME integration_Compare_csg_fmatch_3body_output3 COMMAND $<TARGET_FILE:VOTCA::votca_compare> --etol ${REGRESSIONTEST_TOLERANCE} -f1 CG-CG-CG.pot -f2 ${REFPATH}/CG-CG-CG.pot.fmatch_3body WORKING_DIRECTORY ${RUNPATH})
--  set_tests_properties(integration_Compare_csg_fmatch_3body_output1 PROPERTIES DEPENDS integration_Run_csg_fmatch)
-+  set_tests_properties(integration_Compare_csg_fmatch_3body_output1 PROPERTIES DEPENDS integration_Run_csg_fmatch_3body)
-   set_tests_properties(integration_Compare_csg_fmatch_3body_output1 PROPERTIES LABELS "csg;tools;votca;integration")
--  set_tests_properties(integration_Compare_csg_fmatch_3body_output2 PROPERTIES DEPENDS integration_Run_csg_fmatch)
-+  set_tests_properties(integration_Compare_csg_fmatch_3body_output2 PROPERTIES DEPENDS integration_Run_csg_fmatch_3body)
-   set_tests_properties(integration_Compare_csg_fmatch_3body_output2 PROPERTIES LABELS "csg;tools;votca;integration")
--  set_tests_properties(integration_Compare_csg_fmatch_3body_output3 PROPERTIES DEPENDS integration_Run_csg_fmatch)
-+  set_tests_properties(integration_Compare_csg_fmatch_3body_output3 PROPERTIES DEPENDS integration_Run_csg_fmatch_3body)
-   set_tests_properties(integration_Compare_csg_fmatch_3body_output3 PROPERTIES LABELS "csg;tools;votca;integration")
- 
-   set(RUNPATH ${CMAKE_CURRENT_BINARY_DIR}/Run_csg_map)
diff --git a/585.patch b/585.patch
new file mode 100644
index 0000000..4f75bf0
--- /dev/null
+++ b/585.patch
@@ -0,0 +1,32 @@
+From 2b90649fc2d48ff2f4822d4698f3c9163892b8e4 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@votca.org>
+Date: Sat, 22 Aug 2020 11:48:07 -0600
+Subject: [PATCH] cmake: fix test deps
+
+---
+ src/tools/CMakeLists.txt | 7 +++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
+index b030664a1..1217b2cf4 100644
+--- a/src/tools/CMakeLists.txt
++++ b/src/tools/CMakeLists.txt
+@@ -210,15 +210,14 @@ if(ENABLE_TESTING)
+                    --options ${REFPATH}/settings_imc.xml
+     WORKING_DIRECTORY ${RUNPATH})
+   set_tests_properties(integration_Run_csg_stat_imc_multi PROPERTIES LABELS "csg;tools;votca;integration")
+-  set_tests_properties(integration_Run_csg_stat_imc_multi PROPERTIES DEPENDS integration_Run_gmx_mdrun_multi)
+   add_test(NAME integration_Compare_csg_stat-imc_multi_output COMMAND $<TARGET_FILE:VOTCA::votca_compare> --etol ${REGRESSIONTEST_TOLERANCE} -f1 all.imc -f2 ${REFPATH}/all.imc WORKING_DIRECTORY ${RUNPATH})
+-  set_tests_properties(integration_Compare_csg_stat-imc_multi_output PROPERTIES DEPENDS integration_Run_csg_stat-imc)
++  set_tests_properties(integration_Compare_csg_stat-imc_multi_output PROPERTIES DEPENDS integration_Run_csg_stat_imc_multi)
+   set_tests_properties(integration_Compare_csg_stat-imc_multi_output PROPERTIES LABELS "csg;tools;votca;integration")
+   add_test(NAME integration_Compare_csg_stat-imc_multi_output_2 COMMAND $<TARGET_FILE:VOTCA::votca_compare> --etol ${REGRESSIONTEST_TOLERANCE} -f1 all.gmc -f2 ${REFPATH}/all.gmc WORKING_DIRECTORY ${RUNPATH})
+-  set_tests_properties(integration_Compare_csg_stat-imc_multi_output_2 PROPERTIES DEPENDS integration_Run_csg_stat-imc)
++  set_tests_properties(integration_Compare_csg_stat-imc_multi_output_2 PROPERTIES DEPENDS integration_Run_csg_stat_imc_multi)
+   set_tests_properties(integration_Compare_csg_stat-imc_multi_output_2 PROPERTIES LABELS "csg;tools;votca;integration")
+   add_test(NAME integration_Compare_csg_stat-imc_multi_output_3 COMMAND ${CMAKE_COMMAND} -E compare_files all.idx ${REFPATH}/all.idx WORKING_DIRECTORY ${RUNPATH})
+-  set_tests_properties(integration_Compare_csg_stat-imc_multi_output_3 PROPERTIES DEPENDS integration_Run_csg_stat-imc)
++  set_tests_properties(integration_Compare_csg_stat-imc_multi_output_3 PROPERTIES DEPENDS integration_Run_csg_stat_imc_multi)
+   set_tests_properties(integration_Compare_csg_stat-imc_multi_output_3 PROPERTIES LABELS "csg;tools;votca;integration")
+ 
+   set(RUNPATH ${CMAKE_CURRENT_BINARY_DIR}/Run_csg_resample)
diff --git a/sources b/sources
index 35189d1..c56afed 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (votca-csg-1.6.1.tar.gz) = b8f0f1bf2ca57ee9e2050b4a76e1d725ccb0908314886415f36d4e4554953b4e1c93f7c05502afb77f9b7b5ef3059ebbf7f223b965ba72ae45736798fa2e6ad9
-SHA512 (votca-csg-manual-1.6.1.pdf) = d627a9c7a71b8ac5e8d6ca109f0ea56978706b0dd1408aaf10b75b4b52f40b6150063248477ca2b5922f603e8d582ddd4dec3de73b3991db5fbb7bf204d347a3
+SHA512 (votca-csg-1.6.2.tar.gz) = e1d88cc9d18718f323355736afaf309940234001abb39414dd4990f1ff231ef3e8f71d51c78929c422c296b96f304fa17f6c9671071148ff1446bdc1eb442708
diff --git a/votca-csg.spec b/votca-csg.spec
index 27e09c4..1d4d133 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -1,14 +1,14 @@
 Name:           votca-csg
-Version:        1.6.1
+Version:        1.6.2
 %global         uversion %{version}
 %global         sover 6
-Release:        5%{?dist}
+Release:        1%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
 Source0:        https://github.com/votca/csg/archive/v%{uversion}.tar.gz#/%{name}-%{uversion}.tar.gz
 Source1:        https://github.com/votca/csg/releases/download/v%{uversion}/votca-csg-manual-%{uversion}.pdf
-Patch0:         573.patch
+Patch0:         585.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake3
@@ -97,7 +97,7 @@ This package contains architecture independent documentation for VOTCA CSG.
 
 %prep
 %setup -qn csg-%{uversion}
-%patch -p1
+%patch0 -p1
 
 %build
 %{cmake3} -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=ON -DREGRESSIONTEST_TOLERANCE="3e-5"
@@ -144,6 +144,9 @@ cp %{S:1} %{buildroot}%{_docdir}/%{name}
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Sat Aug 22 2020 Christoph Junghans <junghans@votca.org> - 1.6.2-1
+- Version bump to v1.6.2 (bug #1871344)
+
 * Tue Aug 04 2020 Christoph Junghans <junghans@votca.org> - 1.6.1-5
 - Fix out-of-source build on F33 (bug#1865609)
 

From 6a3edcec013db3447d984d42284626bce18a9606 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Sat, 22 Aug 2020 12:22:15 -0600
Subject: [PATCH 15/29] added missing source

---
 .gitignore | 1 +
 sources    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index acbae62..5d1bf88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
 /votca-csg-1.6.1.tar.gz
 /votca-csg-manual-1.6.1.pdf
 /votca-csg-1.6.2.tar.gz
+/votca-csg-manual-1.6.2.pdf
diff --git a/sources b/sources
index c56afed..2d64432 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (votca-csg-1.6.2.tar.gz) = e1d88cc9d18718f323355736afaf309940234001abb39414dd4990f1ff231ef3e8f71d51c78929c422c296b96f304fa17f6c9671071148ff1446bdc1eb442708
+SHA512 (votca-csg-manual-1.6.2.pdf) = a85094bfa9ae2fcef52f42af162eb1a94ed30de9d7785aac03d7591177f6982dd315874566ce2671df508a3139ce8816c6becf0e0c1d0bfb9b675063810eb3e7

From a48ad416b2398afc4f528e71c2272723e09cd0b3 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Wed, 9 Dec 2020 17:16:27 -0700
Subject: [PATCH 16/29] Version bump to 1.6.3 (bug #1905832)

---
 .gitignore     |  2 ++
 585.patch      | 32 --------------------------------
 sources        |  4 ++--
 votca-csg.spec |  7 ++++---
 4 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 585.patch

diff --git a/.gitignore b/.gitignore
index 5d1bf88..1dfb65b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,5 @@
 /votca-csg-manual-1.6.1.pdf
 /votca-csg-1.6.2.tar.gz
 /votca-csg-manual-1.6.2.pdf
+/votca-csg-1.6.3.tar.gz
+/votca-csg-manual-1.6.3.pdf
diff --git a/585.patch b/585.patch
deleted file mode 100644
index 4f75bf0..0000000
--- a/585.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2b90649fc2d48ff2f4822d4698f3c9163892b8e4 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Sat, 22 Aug 2020 11:48:07 -0600
-Subject: [PATCH] cmake: fix test deps
-
----
- src/tools/CMakeLists.txt | 7 +++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index b030664a1..1217b2cf4 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -210,15 +210,14 @@ if(ENABLE_TESTING)
-                    --options ${REFPATH}/settings_imc.xml
-     WORKING_DIRECTORY ${RUNPATH})
-   set_tests_properties(integration_Run_csg_stat_imc_multi PROPERTIES LABELS "csg;tools;votca;integration")
--  set_tests_properties(integration_Run_csg_stat_imc_multi PROPERTIES DEPENDS integration_Run_gmx_mdrun_multi)
-   add_test(NAME integration_Compare_csg_stat-imc_multi_output COMMAND $<TARGET_FILE:VOTCA::votca_compare> --etol ${REGRESSIONTEST_TOLERANCE} -f1 all.imc -f2 ${REFPATH}/all.imc WORKING_DIRECTORY ${RUNPATH})
--  set_tests_properties(integration_Compare_csg_stat-imc_multi_output PROPERTIES DEPENDS integration_Run_csg_stat-imc)
-+  set_tests_properties(integration_Compare_csg_stat-imc_multi_output PROPERTIES DEPENDS integration_Run_csg_stat_imc_multi)
-   set_tests_properties(integration_Compare_csg_stat-imc_multi_output PROPERTIES LABELS "csg;tools;votca;integration")
-   add_test(NAME integration_Compare_csg_stat-imc_multi_output_2 COMMAND $<TARGET_FILE:VOTCA::votca_compare> --etol ${REGRESSIONTEST_TOLERANCE} -f1 all.gmc -f2 ${REFPATH}/all.gmc WORKING_DIRECTORY ${RUNPATH})
--  set_tests_properties(integration_Compare_csg_stat-imc_multi_output_2 PROPERTIES DEPENDS integration_Run_csg_stat-imc)
-+  set_tests_properties(integration_Compare_csg_stat-imc_multi_output_2 PROPERTIES DEPENDS integration_Run_csg_stat_imc_multi)
-   set_tests_properties(integration_Compare_csg_stat-imc_multi_output_2 PROPERTIES LABELS "csg;tools;votca;integration")
-   add_test(NAME integration_Compare_csg_stat-imc_multi_output_3 COMMAND ${CMAKE_COMMAND} -E compare_files all.idx ${REFPATH}/all.idx WORKING_DIRECTORY ${RUNPATH})
--  set_tests_properties(integration_Compare_csg_stat-imc_multi_output_3 PROPERTIES DEPENDS integration_Run_csg_stat-imc)
-+  set_tests_properties(integration_Compare_csg_stat-imc_multi_output_3 PROPERTIES DEPENDS integration_Run_csg_stat_imc_multi)
-   set_tests_properties(integration_Compare_csg_stat-imc_multi_output_3 PROPERTIES LABELS "csg;tools;votca;integration")
- 
-   set(RUNPATH ${CMAKE_CURRENT_BINARY_DIR}/Run_csg_resample)
diff --git a/sources b/sources
index 2d64432..2397e8d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (votca-csg-1.6.2.tar.gz) = e1d88cc9d18718f323355736afaf309940234001abb39414dd4990f1ff231ef3e8f71d51c78929c422c296b96f304fa17f6c9671071148ff1446bdc1eb442708
-SHA512 (votca-csg-manual-1.6.2.pdf) = a85094bfa9ae2fcef52f42af162eb1a94ed30de9d7785aac03d7591177f6982dd315874566ce2671df508a3139ce8816c6becf0e0c1d0bfb9b675063810eb3e7
+SHA512 (votca-csg-1.6.3.tar.gz) = 7804d17f5c79ab6420653e1f1007539edb8c22dab47b0a9c776d726c9ac955ae2e3740bcfa171d9a347b074692be81499329a54e9dcfa53a173a7be082739525
+SHA512 (votca-csg-manual-1.6.3.pdf) = a631670100dd1f26f2fa815b714dc51c7551f2d92d2072af210778cc380bfdcbc70d01c0a47b88b0ea351d73a5fd334db1da8463d21c933d7af3d7af3b10ccc2
diff --git a/votca-csg.spec b/votca-csg.spec
index 1d4d133..f654d3f 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -1,5 +1,5 @@
 Name:           votca-csg
-Version:        1.6.2
+Version:        1.6.3
 %global         uversion %{version}
 %global         sover 6
 Release:        1%{?dist}
@@ -8,7 +8,6 @@ License:        ASL 2.0
 URL:            http://www.votca.org
 Source0:        https://github.com/votca/csg/archive/v%{uversion}.tar.gz#/%{name}-%{uversion}.tar.gz
 Source1:        https://github.com/votca/csg/releases/download/v%{uversion}/votca-csg-manual-%{uversion}.pdf
-Patch0:         585.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake3
@@ -97,7 +96,6 @@ This package contains architecture independent documentation for VOTCA CSG.
 
 %prep
 %setup -qn csg-%{uversion}
-%patch0 -p1
 
 %build
 %{cmake3} -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=ON -DREGRESSIONTEST_TOLERANCE="3e-5"
@@ -144,6 +142,9 @@ cp %{S:1} %{buildroot}%{_docdir}/%{name}
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Wed Dec  9 17:14:58 MST 2020 Christoph Junghans <junghans@votca.org> - 1.6.3-1
+- Version bump to 1.6.3 (bug #1905832)
+
 * Sat Aug 22 2020 Christoph Junghans <junghans@votca.org> - 1.6.2-1
 - Version bump to v1.6.2 (bug #1871344)
 

From ebe0a583e047f73a886df286051683948f9e33c8 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Tue, 12 Jan 2021 14:47:01 -0700
Subject: [PATCH 17/29] Version bump to v1.6.4 (bug #1915545)

---
 .gitignore     | 2 ++
 sources        | 4 ++--
 votca-csg.spec | 5 ++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1dfb65b..3684705 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@
 /votca-csg-manual-1.6.2.pdf
 /votca-csg-1.6.3.tar.gz
 /votca-csg-manual-1.6.3.pdf
+/votca-csg-1.6.4.tar.gz
+/votca-csg-manual-1.6.4.pdf
diff --git a/sources b/sources
index 2397e8d..5d86cdc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (votca-csg-1.6.3.tar.gz) = 7804d17f5c79ab6420653e1f1007539edb8c22dab47b0a9c776d726c9ac955ae2e3740bcfa171d9a347b074692be81499329a54e9dcfa53a173a7be082739525
-SHA512 (votca-csg-manual-1.6.3.pdf) = a631670100dd1f26f2fa815b714dc51c7551f2d92d2072af210778cc380bfdcbc70d01c0a47b88b0ea351d73a5fd334db1da8463d21c933d7af3d7af3b10ccc2
+SHA512 (votca-csg-1.6.4.tar.gz) = 4cdbf6c0a593720675f48f574ff9a93d038a48037543c1e09a4559d3eb262a2d8bf83d5f5dab85b4820a541e0c57f7cca78315d5b3382763e8acd8cc0fcb65ac
+SHA512 (votca-csg-manual-1.6.4.pdf) = 36956acd24a21cb0a1dd26d6640b41b7473132948327c05856191b4f9531b4d1d5f98be68a9d1a847935d47633d483e87c2300634233a6e617a010c1fb563690
diff --git a/votca-csg.spec b/votca-csg.spec
index f654d3f..4fe6d00 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -1,5 +1,5 @@
 Name:           votca-csg
-Version:        1.6.3
+Version:        1.6.4
 %global         uversion %{version}
 %global         sover 6
 Release:        1%{?dist}
@@ -142,6 +142,9 @@ cp %{S:1} %{buildroot}%{_docdir}/%{name}
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Tue Jan 12 14:46:09 MST 2021 Christoph Junghans <junghans@lanl.gov> - 1.6.4-1
+- Version bump to v1.6.4 (bug #1915545)
+
 * Wed Dec  9 17:14:58 MST 2020 Christoph Junghans <junghans@votca.org> - 1.6.3-1
 - Version bump to 1.6.3 (bug #1905832)
 

From 3c944f5a571c64c6acdf03cc97f8bc5326a7b2ce Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Thu, 21 Jan 2021 16:58:53 -0700
Subject: [PATCH 18/29] Version bump to 2021~rc1 (bug #1916964)

---
 .gitignore     |  1 +
 sources        |  3 +--
 votca-csg.spec | 40 ++++++++++++----------------------------
 3 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3684705..08a8d4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
 /votca-csg-manual-1.6.3.pdf
 /votca-csg-1.6.4.tar.gz
 /votca-csg-manual-1.6.4.pdf
+/votca-csg-2021-rc.1.tar.gz
diff --git a/sources b/sources
index 5d86cdc..6889d87 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (votca-csg-1.6.4.tar.gz) = 4cdbf6c0a593720675f48f574ff9a93d038a48037543c1e09a4559d3eb262a2d8bf83d5f5dab85b4820a541e0c57f7cca78315d5b3382763e8acd8cc0fcb65ac
-SHA512 (votca-csg-manual-1.6.4.pdf) = 36956acd24a21cb0a1dd26d6640b41b7473132948327c05856191b4f9531b4d1d5f98be68a9d1a847935d47633d483e87c2300634233a6e617a010c1fb563690
+SHA512 (votca-csg-2021-rc.1.tar.gz) = 90909cab9193474a5dab03d0b1aab6d0ca30ceb8b951d1fe3262df863404704dc53026d378e106c8c0b75583f044b1ef0af6558ef7e9106f674ebfc652dd963c
diff --git a/votca-csg.spec b/votca-csg.spec
index 4fe6d00..2a6c9b6 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -1,13 +1,12 @@
 Name:           votca-csg
-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 coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
 Source0:        https://github.com/votca/csg/archive/v%{uversion}.tar.gz#/%{name}-%{uversion}.tar.gz
-Source1:        https://github.com/votca/csg/releases/download/v%{uversion}/votca-csg-manual-%{uversion}.pdf
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake3
@@ -22,6 +21,8 @@ BuildRequires:  txt2tags
 
 Requires:   %{name}-common = %{version}-%{release}
 Requires:   %{name}-libs = %{version}-%{release}
+# no more pdf manual
+Obsoletes:  votca-csg-doc < 2021
 
 %description
 Versatile Object-oriented Toolkit for Coarse-graining Applications (VOTCA) is
@@ -81,24 +82,11 @@ coarse-graining of various systems. The core is written in C++.
 This package contains bash completion support for the VOTCA coarse-graining
 engine.
 
-%package doc
-Summary:        Architecture independent doc files for VOTCA CSG
-BuildArch:      noarch
-Requires:       votca-csg-common = %{version}
-
-%description doc
-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 architecture independent documentation for VOTCA CSG.
-
-
 %prep
 %setup -qn csg-%{uversion}
 
 %build
-%{cmake3} -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=ON -DREGRESSIONTEST_TOLERANCE="3e-5"
+%{cmake3} -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=ON -DBUILD_CSGAPPS=ON
 %cmake_build
 
 %install
@@ -107,9 +95,6 @@ This package contains architecture independent documentation for VOTCA CSG.
 mkdir -p %{buildroot}%{_datadir}/bash_completion
 mv %{buildroot}%{_datadir}/votca/rc/csg-completion.bash %{buildroot}%{_datadir}/bash_completion/votca
 
-mkdir -p %{buildroot}%{_docdir}/%{name}
-cp %{S:1} %{buildroot}%{_docdir}/%{name}
-
 %check
 %ctest
 
@@ -120,17 +105,13 @@ cp %{S:1} %{buildroot}%{_docdir}/%{name}
 %{_mandir}/man1/csg_*.1.*
 %{_mandir}/man7/votca-csg.7.*
 
-%files doc
-%doc CHANGELOG.md NOTICE README.md
-%license LICENSE
-%{_docdir}/%{name}
-
 %files common
-%license LICENSE
+%doc CHANGELOG.rst NOTICE.rst README.rst
+%license LICENSE.rst
 %{_datadir}/votca
 
 %files libs
-%license LICENSE
+%license LICENSE.rst
 %{_libdir}/libvotca_csg.so.%{sover}
 
 %files devel
@@ -142,6 +123,9 @@ cp %{S:1} %{buildroot}%{_docdir}/%{name}
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Thu Jan 21 12:41:40 MST 2021 Christoph Junghans <junghans@lanl.gov> - 2021~rc1-1
+- Version bump to 2021~rc1 (bug #1916964)
+
 * Tue Jan 12 14:46:09 MST 2021 Christoph Junghans <junghans@lanl.gov> - 1.6.4-1
 - Version bump to v1.6.4 (bug #1915545)
 

From bab71eca392f7a361319e3c87a6e4fcf3db11595 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 22 Jan 2021 21:03:42 +0000
Subject: [PATCH 19/29] Rebuilt for Boost 1.75

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

diff --git a/votca-csg.spec b/votca-csg.spec
index 2a6c9b6..cdae723 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -2,7 +2,7 @@ Name:           votca-csg
 Version:        2021~rc1
 %global         uversion 2021-rc.1
 %global         sover 2021
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -123,6 +123,9 @@ mv %{buildroot}%{_datadir}/votca/rc/csg-completion.bash %{buildroot}%{_datadir}/
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 2021~rc1-2
+- Rebuilt for Boost 1.75
+
 * Thu Jan 21 12:41:40 MST 2021 Christoph Junghans <junghans@lanl.gov> - 2021~rc1-1
 - Version bump to 2021~rc1 (bug #1916964)
 

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

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

diff --git a/votca-csg.spec b/votca-csg.spec
index cdae723..1ed1fb4 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -2,7 +2,7 @@ Name:           votca-csg
 Version:        2021~rc1
 %global         uversion 2021-rc.1
 %global         sover 2021
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -123,6 +123,9 @@ mv %{buildroot}%{_datadir}/votca/rc/csg-completion.bash %{buildroot}%{_datadir}/
 %{_datadir}/bash_completion/votca
 
 %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 216042d9545aa43e25e8cf5c0903406e4f0d2065 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Sat, 13 Mar 2021 12:13:51 -0700
Subject: [PATCH 21/29] Version bump to v2021 (bug #1916964)

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

diff --git a/.gitignore b/.gitignore
index 08a8d4c..78ea41b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
 /votca-csg-1.6.4.tar.gz
 /votca-csg-manual-1.6.4.pdf
 /votca-csg-2021-rc.1.tar.gz
+/votca-csg-2021.tar.gz
diff --git a/sources b/sources
index 6889d87..2ac8a96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (votca-csg-2021-rc.1.tar.gz) = 90909cab9193474a5dab03d0b1aab6d0ca30ceb8b951d1fe3262df863404704dc53026d378e106c8c0b75583f044b1ef0af6558ef7e9106f674ebfc652dd963c
+SHA512 (votca-csg-2021.tar.gz) = 8eacf4045ddc13d33e853cd35a67d03dfb63da60c3e879ea4f16e63f27a92aa13cbf4e367d9258778c9c09462443e4bb2b937c247c6246377ceeecf56bc6fc12
diff --git a/votca-csg.spec b/votca-csg.spec
index 1ed1fb4..5cc73fe 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -1,8 +1,8 @@
 Name:           votca-csg
-Version:        2021~rc1
-%global         uversion 2021-rc.1
+Version:        2021
+%global         uversion %version
 %global         sover 2021
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -123,6 +123,9 @@ mv %{buildroot}%{_datadir}/votca/rc/csg-completion.bash %{buildroot}%{_datadir}/
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Sat Mar 13 2021 Christoph Junghans <junghans@votca.org> - 2021-1
+- Version bump to v2021 (bug #1916964)
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021~rc1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 3e53b559c3e960a601d7cc31227b610ffc123e46 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Sun, 18 Jul 2021 08:24:06 -0600
Subject: [PATCH 22/29] Version bump to v2021.1 (bug #1983384)

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

diff --git a/.gitignore b/.gitignore
index 78ea41b..2bc2d7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
 /votca-csg-manual-1.6.4.pdf
 /votca-csg-2021-rc.1.tar.gz
 /votca-csg-2021.tar.gz
+/votca-csg-2021.1.tar.gz
diff --git a/sources b/sources
index 2ac8a96..c421219 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (votca-csg-2021.tar.gz) = 8eacf4045ddc13d33e853cd35a67d03dfb63da60c3e879ea4f16e63f27a92aa13cbf4e367d9258778c9c09462443e4bb2b937c247c6246377ceeecf56bc6fc12
+SHA512 (votca-csg-2021.1.tar.gz) = e1abdd34a3d88aea253cc10e7832a18d2cffc44286e4591c5a1239bf34e68d6c40054d3eb907a902e5ab6af5a9dea4ec266ff5ce59073b500413f4e122885e94
diff --git a/votca-csg.spec b/votca-csg.spec
index 5cc73fe..a28de34 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -1,5 +1,5 @@
 Name:           votca-csg
-Version:        2021
+Version:        2021.1
 %global         uversion %version
 %global         sover 2021
 Release:        1%{?dist}
@@ -123,6 +123,9 @@ mv %{buildroot}%{_datadir}/votca/rc/csg-completion.bash %{buildroot}%{_datadir}/
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Sun Jul 18 2021 Christoph Junghans <junghans@votca.org> - 2021.1-1
+- Version bump to v2021.1 (bug #1983384)
+
 * Sat Mar 13 2021 Christoph Junghans <junghans@votca.org> - 2021-1
 - Version bump to v2021 (bug #1916964)
 

From 3f2f46e4ecfc4c792f0c038b1fad86658a10a4cb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 20:39:56 +0000
Subject: [PATCH 23/29] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

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

diff --git a/votca-csg.spec b/votca-csg.spec
index a28de34..9d9f4f4 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -2,7 +2,7 @@ Name:           votca-csg
 Version:        2021.1
 %global         uversion %version
 %global         sover 2021
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -123,6 +123,9 @@ mv %{buildroot}%{_datadir}/votca/rc/csg-completion.bash %{buildroot}%{_datadir}/
 %{_datadir}/bash_completion/votca
 
 %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 #1983384)
 

From 341568d0343090d43341b7a06559f21ecfd8a671 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Sat, 7 Aug 2021 05:21:01 +0100
Subject: [PATCH 24/29] Rebuilt for Boost 1.76

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

diff --git a/votca-csg.spec b/votca-csg.spec
index 9d9f4f4..12ce75e 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -2,7 +2,7 @@ Name:           votca-csg
 Version:        2021.1
 %global         uversion %version
 %global         sover 2021
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -123,6 +123,9 @@ mv %{buildroot}%{_datadir}/votca/rc/csg-completion.bash %{buildroot}%{_datadir}/
 %{_datadir}/bash_completion/votca
 
 %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 4ba58851474b5bd8e6c169fb4bdd69d5dab8d74d Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Mon, 9 Aug 2021 20:15:44 -0600
Subject: [PATCH 25/29] Rebuild for hdf5 1.10.7

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

diff --git a/votca-csg.spec b/votca-csg.spec
index 12ce75e..42cbf79 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -2,7 +2,7 @@ Name:           votca-csg
 Version:        2021.1
 %global         uversion %version
 %global         sover 2021
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -123,6 +123,9 @@ mv %{buildroot}%{_datadir}/votca/rc/csg-completion.bash %{buildroot}%{_datadir}/
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 2021.1-4
+- Rebuild for hdf5 1.10.7
+
 * Sat Aug 07 2021 Jonathan Wakely <jwakely@redhat.com> - 2021.1-3
 - Rebuilt for Boost 1.76
 

From 8e215dc78bc0c4a900e1dd6c378892fb937645cf Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Mon, 20 Sep 2021 04:06:10 -0600
Subject: [PATCH 26/29] version bump to v2021.2 (bug #2005700)

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

diff --git a/.gitignore b/.gitignore
index 2bc2d7c..730d70c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
 /votca-csg-2021-rc.1.tar.gz
 /votca-csg-2021.tar.gz
 /votca-csg-2021.1.tar.gz
+/votca-csg-2021.2.tar.gz
diff --git a/sources b/sources
index c421219..81e82e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (votca-csg-2021.1.tar.gz) = e1abdd34a3d88aea253cc10e7832a18d2cffc44286e4591c5a1239bf34e68d6c40054d3eb907a902e5ab6af5a9dea4ec266ff5ce59073b500413f4e122885e94
+SHA512 (votca-csg-2021.2.tar.gz) = 5808edd96199cad6e5fc803a0e489f3d2f376da3d64f565536cc37561a0fcd22960563af7d3f86522bcc7336c8d6f7c7f6501b36feb960aae5168904156bfbf6
diff --git a/votca-csg.spec b/votca-csg.spec
index 42cbf79..ccb0b1d 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -1,8 +1,8 @@
 Name:           votca-csg
-Version:        2021.1
+Version:        2021.2
 %global         uversion %version
 %global         sover 2021
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -123,6 +123,9 @@ mv %{buildroot}%{_datadir}/votca/rc/csg-completion.bash %{buildroot}%{_datadir}/
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Mon Sep 20 2021 Christoph Junghans <junghans@votca.org> - 2021.2-1
+- version bump to v2021.2 (bug #2005700)
+
 * Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 2021.1-4
 - Rebuild for hdf5 1.10.7
 

From 69bdb31fe6aead8ec79b42b1fe7981856ac284a9 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Sat, 20 Nov 2021 21:43:10 -0700
Subject: [PATCH 27/29] Rebuild for hdf5 1.12.1

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

diff --git a/votca-csg.spec b/votca-csg.spec
index ccb0b1d..811c744 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -2,7 +2,7 @@ Name:           votca-csg
 Version:        2021.2
 %global         uversion %version
 %global         sover 2021
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
@@ -123,6 +123,9 @@ mv %{buildroot}%{_datadir}/votca/rc/csg-completion.bash %{buildroot}%{_datadir}/
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Sun Nov 21 2021 Orion Poplawski <orion@nwra.com> - 2021.2-2
+- Rebuild for hdf5 1.12.1
+
 * Mon Sep 20 2021 Christoph Junghans <junghans@votca.org> - 2021.2-1
 - version bump to v2021.2 (bug #2005700)
 

From 98bf12be072c919d6fb4d3216a881b03d6ddc532 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Tue, 30 Nov 2021 13:49:21 -0700
Subject: [PATCH 28/29] Version bump to 2022-rc.1

---
 .gitignore     |  1 +
 sources        |  2 +-
 votca-csg.spec | 22 +++++++++++++---------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 730d70c..48a4433 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /votca-csg-2021.tar.gz
 /votca-csg-2021.1.tar.gz
 /votca-csg-2021.2.tar.gz
+/votca-2022-rc.1.tar.gz
diff --git a/sources b/sources
index 81e82e0..bafebfc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (votca-csg-2021.2.tar.gz) = 5808edd96199cad6e5fc803a0e489f3d2f376da3d64f565536cc37561a0fcd22960563af7d3f86522bcc7336c8d6f7c7f6501b36feb960aae5168904156bfbf6
+SHA512 (votca-2022-rc.1.tar.gz) = 46a9dbbac663f3e3cceeb5803af108d623a1774d916347c9e6e8cbcbd05297d980132a4ee4508c42e98e567ca8bd38f301aeab4a3bf2f3dcf056333dbe667c97
diff --git a/votca-csg.spec b/votca-csg.spec
index 811c744..2883e14 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -1,12 +1,12 @@
 Name:           votca-csg
-Version:        2021.2
-%global         uversion %version
-%global         sover 2021
-Release:        2%{?dist}
+Version:        2022~rc1
+%global         uversion 2022-rc.1
+%global         sover 2022
+Release:        1%{?dist}
 Summary:        VOTCA coarse-graining engine
 License:        ASL 2.0
 URL:            http://www.votca.org
-Source0:        https://github.com/votca/csg/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
@@ -83,9 +83,10 @@ This package contains bash completion support for the VOTCA coarse-graining
 engine.
 
 %prep
-%setup -qn csg-%{uversion}
+%setup -qn votca-%{uversion}
 
 %build
+%global _vpath_srcdir csg
 %{cmake3} -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=ON -DBUILD_CSGAPPS=ON
 %cmake_build
 
@@ -106,12 +107,12 @@ mv %{buildroot}%{_datadir}/votca/rc/csg-completion.bash %{buildroot}%{_datadir}/
 %{_mandir}/man7/votca-csg.7.*
 
 %files common
-%doc CHANGELOG.rst NOTICE.rst README.rst
-%license LICENSE.rst
+%doc CHANGELOG.rst csg/NOTICE.rst README.rst
+%license csg/LICENSE.rst
 %{_datadir}/votca
 
 %files libs
-%license LICENSE.rst
+%license csg/LICENSE.rst
 %{_libdir}/libvotca_csg.so.%{sover}
 
 %files devel
@@ -123,6 +124,9 @@ mv %{buildroot}%{_datadir}/votca/rc/csg-completion.bash %{buildroot}%{_datadir}/
 %{_datadir}/bash_completion/votca
 
 %changelog
+* Tue Nov 30 2021 Christoph Junghans <junghans@votca.org> - 2022~rc1-1
+- Version bump to 2022-rc.1
+
 * Sun Nov 21 2021 Orion Poplawski <orion@nwra.com> - 2021.2-2
 - Rebuild for hdf5 1.12.1
 

From 069b58c4815290bbf1212c44567a4342a4602f0d Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Wed, 12 Jan 2022 19:35:37 -0700
Subject: [PATCH 29/29] Replaced by 'votca' package

---
 .gitignore     |  36 -----
 dead.package   |   1 +
 sources        |   1 -
 votca-csg.spec | 398 -------------------------------------------------
 4 files changed, 1 insertion(+), 435 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 dead.package
 delete mode 100644 sources
 delete mode 100644 votca-csg.spec

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 48a4433..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,36 +0,0 @@
-/votca-csg*.src.rpm
-/votca-csg-1.0.1.tar.gz
-/votca-csg-1.1.tar.gz
-/votca-csg-1.2.3.tar.gz
-/votca-csg-1.2.4.tar.gz
-/v1.3_rc1.tar.gz
-/v1.3.tar.gz
-/v1.3.1.tar.gz
-/votca-csg-1.4_rc1.tar.gz
-/votca-csg-1.4.tar.gz
-/votca-csg-manual-1.4.pdf
-/votca-csg-1.4.1.tar.gz
-/votca-csg-manual-1.4.1.pdf
-/votca-csg-1.5.tar.gz
-/votca-csg-manual-1.5.pdf
-/votca-csg-1.5.1.tar.gz
-/votca-csg-manual-1.5.1.pdf
-/votca-csg-1.6_rc1.tar.gz
-/votca-csg-manual-1.6_rc1.pdf
-/votca-csg-1.6_rc2.tar.gz
-/votca-csg-manual-1.6_rc2.pdf
-/votca-csg-1.6.tar.gz
-/votca-csg-manual-1.6.pdf
-/votca-csg-1.6.1.tar.gz
-/votca-csg-manual-1.6.1.pdf
-/votca-csg-1.6.2.tar.gz
-/votca-csg-manual-1.6.2.pdf
-/votca-csg-1.6.3.tar.gz
-/votca-csg-manual-1.6.3.pdf
-/votca-csg-1.6.4.tar.gz
-/votca-csg-manual-1.6.4.pdf
-/votca-csg-2021-rc.1.tar.gz
-/votca-csg-2021.tar.gz
-/votca-csg-2021.1.tar.gz
-/votca-csg-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-csg.spec b/votca-csg.spec
deleted file mode 100644
index 2883e14..0000000
--- a/votca-csg.spec
+++ /dev/null
@@ -1,398 +0,0 @@
-Name:           votca-csg
-Version:        2022~rc1
-%global         uversion 2022-rc.1
-%global         sover 2022
-Release:        1%{?dist}
-Summary:        VOTCA coarse-graining engine
-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:  eigen3-devel
-BuildRequires:  doxygen
-BuildRequires:  boost-devel
-BuildRequires:  gromacs-devel
-BuildRequires:  hdf5-devel
-BuildRequires:  perl-generators
-BuildRequires:  votca-tools-devel = %{version}
-BuildRequires:  txt2tags
-
-Requires:   %{name}-common = %{version}-%{release}
-Requires:   %{name}-libs = %{version}-%{release}
-# no more pdf manual
-Obsoletes:  votca-csg-doc < 2021
-
-%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 VOTCA coarse-graining engine.
-
-
-%package libs
-Summary:    Libraries for VOTCA coarse-graining engine
-
-%description libs
-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 libraries for the VOTCA coarse-graining engine.
-
-%package devel
-Summary:    Development headers and libraries for VOTCA coarse-graining Engine
-Requires:   %{name}-libs = %{version}-%{release}
-Requires:   %{name} = %{version}-%{release}
-Requires:   votca-tools-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 the VOTCA
-coarse-graining engine.
-
-%package common
-Summary:    Architecture independent data files for VOTCA CSG
-BuildArch:  noarch
-
-%description common
-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 architecture independent data files for the VOTCA
-coarse-graining engine.
-
-%package bash
-Summary:    Bash completion for VOTCA CSG
-Requires:   %{name} = %{version}-%{release}
-Requires:   bash-completion
-BuildArch:  noarch
-
-%description bash
-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 bash completion support for the VOTCA coarse-graining
-engine.
-
-%prep
-%setup -qn votca-%{uversion}
-
-%build
-%global _vpath_srcdir csg
-%{cmake3} -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=ON -DBUILD_CSGAPPS=ON
-%cmake_build
-
-%install
-%cmake_install
-# Install bash completion file
-mkdir -p %{buildroot}%{_datadir}/bash_completion
-mv %{buildroot}%{_datadir}/votca/rc/csg-completion.bash %{buildroot}%{_datadir}/bash_completion/votca
-
-%check
-%ctest
-
-%ldconfig_scriptlets libs
-
-%files
-%{_bindir}/csg_*
-%{_mandir}/man1/csg_*.1.*
-%{_mandir}/man7/votca-csg.7.*
-
-%files common
-%doc CHANGELOG.rst csg/NOTICE.rst README.rst
-%license csg/LICENSE.rst
-%{_datadir}/votca
-
-%files libs
-%license csg/LICENSE.rst
-%{_libdir}/libvotca_csg.so.%{sover}
-
-%files devel
-%{_includedir}/votca/csg/
-%{_libdir}/libvotca_csg.so
-%{_libdir}/cmake/VOTCA_CSG
-
-%files bash
-%{_datadir}/bash_completion/votca
-
-%changelog
-* Tue Nov 30 2021 Christoph Junghans <junghans@votca.org> - 2022~rc1-1
-- Version bump to 2022-rc.1
-
-* Sun Nov 21 2021 Orion Poplawski <orion@nwra.com> - 2021.2-2
-- Rebuild for hdf5 1.12.1
-
-* Mon Sep 20 2021 Christoph Junghans <junghans@votca.org> - 2021.2-1
-- version bump to v2021.2 (bug #2005700)
-
-* Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 2021.1-4
-- Rebuild for hdf5 1.10.7
-
-* 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 #1983384)
-
-* Sat Mar 13 2021 Christoph Junghans <junghans@votca.org> - 2021-1
-- Version bump to v2021 (bug #1916964)
-
-* 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
-
-* Thu Jan 21 12:41:40 MST 2021 Christoph Junghans <junghans@lanl.gov> - 2021~rc1-1
-- Version bump to 2021~rc1 (bug #1916964)
-
-* Tue Jan 12 14:46:09 MST 2021 Christoph Junghans <junghans@lanl.gov> - 1.6.4-1
-- Version bump to v1.6.4 (bug #1915545)
-
-* Wed Dec  9 17:14:58 MST 2020 Christoph Junghans <junghans@votca.org> - 1.6.3-1
-- Version bump to 1.6.3 (bug #1905832)
-
-* Sat Aug 22 2020 Christoph Junghans <junghans@votca.org> - 1.6.2-1
-- Version bump to v1.6.2 (bug #1871344)
-
-* Tue Aug 04 2020 Christoph Junghans <junghans@votca.org> - 1.6.1-5
-- Fix out-of-source build on F33 (bug#1865609)
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-4
-- 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-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jun 25 2020 Orion Poplawski <orion@cora.nwra.com> - 1.6.1-2
-- Rebuild for hdf5 1.10.6
-
-* 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 #1825473)
-
-* Mon Feb 10 2020 Christoph Junghans <junghans@votca.org> - 1.6~rc2-1
-- Version bump to 1.6~rc2
-- Drop 473.patch - merged upstream
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-0.3rc1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Dec 12 2019 Christoph Junghans <junghans@votca.org> - 1.6-0.2rc1
-- Added upstream 473.patch to fix 32bit build
-
-* Thu Dec 05 2019 Christoph Junghans <junghans@votca.org> - 1.6-0.1rc1
-- Version bump to 1.6_rc1 (bug #1779848)
-
-* Fri Nov 22 2019 Christoph Junghans <junghans@votca.org> - 1.5.1-1
-- Version bump to 1.5.1 (bug #1774830)
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-3.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Mar 16 2019 Orion Poplawski <orion@nwra.com> - 1.5-3.1
-- Rebuild for hdf5 1.10.5
-
-* Sun Feb 17 2019 Christoph Junghans <junghans@votca.org> - 1.5-3
-- Rebuild for gromacs-2019
-
-* Tue Feb 05 2019 Christoph Junghans <junghans@votca.org> - 1.5-2
-- Fix cma.py shebang
-
-* Sat Feb 02 2019 Christoph Junghans <junghans@votca.org> - 1.5-1
-- Version bump to v1.5
-
-* Tue Jan 29 2019 Jonathan Wakely <jwakely@redhat.com> - 1.4.1-2.1
-- Rebuilt for Boost 1.69
-
-* Tue Jan 29 2019 Christoph Junghans <junghans@votca.org> - 1.4.1-2
-- Fix FTBFS (bug #1670437)
-
-* Fri Jan 25 2019 Jonathan Wakely <jwakely@redhat.com> - 1.4.1-1.1.4
-- Rebuilt for Boost 1.69
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-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.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.1
-- Rebuilt for Boost 1.66
-
-* Sat Dec 30 2017 Christoph Junghans <junghans@votca.org> - 1.4.1-1.1
-- Rebuild for gromacs-2018
-
-* 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.6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-1.5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* 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
-- Added pdf manual in doc package
-
-* Mon Oct 03 2016 Christoph Junghans <junghans@votca.org> - 1.4-0.2rc1
-- fix shebang, bash completion install
-
-* 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
-
-* Fri May 20 2016 Jonathan Wakely <jwakely@redhat.com> - 1.3-4
-- Rebuilt for linker errors in boost (#1331983)
-
-* Fri Apr 01 2016 Dominik Mierzejewski <rpm@greysector.net> - 1.3-3
-- rebuild for gromacs
-- fix recent libgromacs_d detection using upstream patch
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-2.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sun Jan 24 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.3-2
-- Rebuilt for gromacs
-
-* Tue Jan 19 2016 Christoph Junghans <junghans@votca.org> - 1.3-1
-- update to 1.3
-- cleanup spec
-
-* Mon Nov 09 2015 Thomas Spura <tomspur@fedoraproject.org> - 1.3-0.1.rc1
-- update to 1.3_rc1
-- cleanup spec
-
-* Thu Sep 03 2015 Jonathan Wakely <jwakely@redhat.com> - 1.2.4-10
-- Rebuilt for Boost 1.59
-
-* Sun Aug 30 2015 Thomas Spura <tomspur@fedoraproject.org> - 1.2.4-9
-- Add another patch by Christoph Junghans to build with gromacs-5.1
-
-* Fri Aug 28 2015 Jonathan Wakely <jwakely@redhat.com> - 1.2.4-8
-- Rebuilt for Boost 1.59
-
-* Fri Aug 21 2015 Thomas Spura <tomspur@fedoraproject.org> - 1.2.4-7
-- Add patch by Christoph Junghans to build with gromacs-5.1
-
-* Wed Aug 05 2015 Thomas Spura <tomspur@fedoraproject.org> - 1.2.4-6
-- Rebuilt for new boost
-
-* 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 against new gromacs
-
-* Thu Feb 05 2015 Thomas Spura <tomspur@fedoraproject.org> - 1.2.4-3
-- Rebuilt for new boost
-
-* 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-8
-- 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-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri May 23 2014 David Tardon <dtardon@redhat.com> - 1.2.3-6
-- rebuild for boost 1.55.0
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Sun Jul 28 2013 Petr Machata <pmachata@redhat.com> - 1.2.3-4
-- Rebuild for boost 1.54.0
-
-* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 1.2.3-3
-- Perl 5.18 rebuild
-
-* Thu Mar 07 2013 Susi Lehtola <jussilehtola@fedoraproject.org> - 1.2.3-2
-- Rebuild for Gromacs 4.6.1.
-
-* Sun Feb 10 2013 Susi Lehtola <jussilehtola@fedoraproject.org> - 1.2.3-1
-- Update to 1.2.3.
-
-* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.2.1-6
-- Rebuild for Boost-1.53.0
-
-* Wed Aug 15 2012 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.2.1-5
-- Bump spec due to boost update.
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-4
-- 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
-- Rebuilt for c++ ABI breakage
-
-* Tue Jan 10 2012 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.2.1-2
-- Fix FTBFS on rawhide.
-
-* Wed Nov 23 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.
-
-* Sat Jul 23 2011 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.1-3
-- Bump spec due to new boost.
-
-* Thu Apr 07 2011 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.1-2
-- Bump spec due to boost upgrade.
-
-* Mon Feb 21 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-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sun Feb 06 2011 Thomas Spura <tomspur@fedoraproject.org> - 1.0.1-3
-- rebuild for new boost
-
-* Wed Dec 08 2010 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.0.1-2
-- Fix spelling error in Requires of -devel, preserve timestamps upon install.
-
-* Tue Dec 07 2010 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.0.1-1
-- Update to 1.0.1.
-- Added bash completion package.
-
-* Thu Nov 25 2010 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.0-1
-- First release.