The package rpms/votca-csg.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/votca-csg.git/commit/?id=b059fdc2....
Change:
-%ifarch ppc64le
Thanks.
Full change:
============
commit d025dfac7bafac2c43cdbf181b6d295acbf9a7c9
Author: Christoph Junghans <junghans(a)lanl.gov>
Date: Sat Apr 18 07:54:32 2020 -0600
Version bump to v1.6 (bug #1825473)
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(a)votca.org> - 1.6-1
+- Version bump to v1.6 (bug #1825473)
+
* Mon Feb 10 2020 Christoph Junghans <junghans(a)votca.org> - 1.6~rc2-1
- Version bump to 1.6~rc2
- Drop 473.patch - merged upstream
commit a3ba81092fc766397dbbf2dc06631711031bb854
Author: Christoph Junghans <junghans(a)lanl.gov>
Date: Mon Feb 10 10:24:24 2020 -0700
increase test tolerance of aarch64
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
commit c87ef65188d1d5d98721de0ce89a22302734eb7c
Author: Christoph Junghans <junghans(a)lanl.gov>
Date: Mon Feb 10 10:04:22 2020 -0700
Version bump to 1.6~rc2
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(a)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 = ⊤
- 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 = ⊤
-
-From 38665d2d24fcfefa40ac61cab8e9c9a55c596b42 Mon Sep 17 00:00:00 2001
-From: Jens <jenswehner(a)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(a)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 = ⊤
- 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}-%...
-Source1:
https://github.com/votca/csg/releases/download/v%{version}%{?_rc}/votca-c...
-Patch0:
https://github.com/votca/csg/pull/473.patch
+Source0:
https://github.com/votca/csg/archive/v%{uversion}.tar.gz#/%{name}-%{uvers...
+Source1:
https://github.com/votca/csg/releases/download/v%{uversion}/votca-csg-man...
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(a)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(a)fedoraproject.org> -
1.6-0.3rc1
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
commit d61e5cdabf57c4a8b348337018b49be885f026ca
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 31 03:22:51 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
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(a)fedoraproject.org> -
1.6-0.3rc1
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Thu Dec 12 2019 Christoph Junghans <junghans(a)votca.org> - 1.6-0.2rc1
- Added upstream 473.patch to fix 32bit build
commit 60b1b10967c5ab914396e299e46834dfb0dc6268
Author: Christoph Junghans <junghans(a)lanl.gov>
Date: Thu Dec 12 12:04:51 2019 -0700
Added upstream 473.patch to fix 32bit build
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(a)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 = ⊤
+ 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 = ⊤
+
+From 38665d2d24fcfefa40ac61cab8e9c9a55c596b42 Mon Sep 17 00:00:00 2001
+From: Jens <jenswehner(a)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(a)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 = ⊤
+ 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}-%...
Source1:
https://github.com/votca/csg/releases/download/v%{version}%{?_rc}/votca-c...
+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(a)votca.org> - 1.6-0.2rc1
+- Added upstream 473.patch to fix 32bit build
+
* Thu Dec 05 2019 Christoph Junghans <junghans(a)votca.org> - 1.6-0.1rc1
- Version bump to 1.6_rc1 (bug #1779848)
commit 9231cc4dd9d314a9ed98ab6756e333ab4a222b96
Author: Christoph Junghans <junghans(a)lanl.gov>
Date: Thu Dec 5 06:48:54 2019 -0700
added sover
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/
commit b059fdc2d48408af5abc96fc202b9f45284a3f9e
Author: Christoph Junghans <junghans(a)lanl.gov>
Date: Thu Dec 5 03:48:45 2019 -0700
Version bump to 1.6_rc1 (bug #1779848)
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(a)votca.org> - 1.6-0.1rc1
+- Version bump to 1.6_rc1 (bug #1779848)
+
* Fri Nov 22 2019 Christoph Junghans <junghans(a)votca.org> - 1.5.1-1
- Version bump to 1.5.1 (bug #1774830)