The package rpms/espresso.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/espresso.git/commit/?id=34259b40e....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 8f2c3dceeb0e548e263844f10e54c517d95be904
Author: Christoph Junghans <junghans(a)votca.org>
Date: Wed Jul 8 14:49:10 2020 -0600
version bump to v4.1.3 (bug #1855054)
diff --git a/.gitignore b/.gitignore
index 7cec43c..cffc838 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/espresso-4.1.0.tar.gz
/espresso-4.1.1.tar.gz
/espresso-4.1.2.tar.gz
+/espresso-4.1.3.tar.gz
diff --git a/3725.patch b/3725.patch
deleted file mode 100644
index 9ce21bc..0000000
--- a/3725.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 48f042382bfe19c54139c10e29d492864d054678 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jean-No=C3=ABl=20Grad?= <jgrad(a)icp.uni-stuttgart.de>
-Date: Fri, 22 May 2020 17:03:17 +0200
-Subject: [PATCH] Fix Variant bug revealed by boost 1.73
-
----
- src/script_interface/Variant.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/script_interface/Variant.hpp b/src/script_interface/Variant.hpp
-index e400af836a..6c1751aca1 100644
---- a/src/script_interface/Variant.hpp
-+++ b/src/script_interface/Variant.hpp
-@@ -72,7 +72,7 @@ inline bool is_none(Variant const &v) { return
is_type<None>(v); }
-
- template <typename T, typename U>
- std::vector<Variant> pack_pair(const std::pair<T, U> &pair) {
-- return {{pair.first, pair.second}};
-+ return {pair.first, pair.second};
- }
-
- template <typename T, typename U>
diff --git a/espresso.spec b/espresso.spec
index 7ae73f8..e7a5c9c 100644
--- a/espresso.spec
+++ b/espresso.spec
@@ -3,8 +3,8 @@
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: espresso
-Version: 4.1.2
-Release: 5%{?dist}
+Version: 4.1.3
+Release: 1%{?dist}
Summary: Extensible Simulation Package for Research on Soft matter
# segfault on s390x:
https://github.com/espressomd/espresso/issues/3753
ExcludeArch: s390x
@@ -15,8 +15,6 @@ URL:
http://espressomd.org
Source0:
https://github.com/%{name}md/%{name}/archive/%{commit}/%{name}-%{commit}....
%else
Source0:
https://github.com/%{name}md/%{name}/releases/download/%{version}/%{name}...
-#
https://github.com/espressomd/espresso/pull/3725.patch on boost-1.73
-Patch0:
https://github.com/espressomd/espresso/pull/3725.patch
%endif
@@ -109,7 +107,6 @@ This package contains %{name} compiled against MPICH2.
%setup -q -n espresso-%{commit}
%else
%setup -q -n %{name}
-%patch0 -p1
%endif
%build
@@ -162,6 +159,9 @@ done
%{python3_sitearch}/mpich/%{name}md/
%changelog
+* Wed Jul 08 2020 Christoph Junghans <junghans(a)votca.org> - 4.1.3-1
+- version bump to v4.1.3 (bug #1855054)
+
* Fri Jul 03 2020 Christoph Junghans <junghans(a)votca.org> - 4.1.2-5
- Rebuild for hdf5 1.10.6
diff --git a/sources b/sources
index db43842..81c4015 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (espresso-4.1.2.tar.gz) =
c6b369e24246c8ff52c585d5193c40c4f75f936a67ab6ad165423ec452522e256e83dccf131cb138272a1a9bb0024fe0fcc4f830f57c99888f2776758908df29
+SHA512 (espresso-4.1.3.tar.gz) =
1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934
commit 33a67c15c376d090f3954887be62026936f8e119
Author: Christoph Junghans <junghans(a)votca.org>
Date: Fri Jul 3 06:15:15 2020 -0600
Rebuild for hdf5 1.10.6
diff --git a/espresso.spec b/espresso.spec
index 8052f69..7ae73f8 100644
--- a/espresso.spec
+++ b/espresso.spec
@@ -4,7 +4,7 @@
Name: espresso
Version: 4.1.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Extensible Simulation Package for Research on Soft matter
# segfault on s390x:
https://github.com/espressomd/espresso/issues/3753
ExcludeArch: s390x
@@ -162,6 +162,9 @@ done
%{python3_sitearch}/mpich/%{name}md/
%changelog
+* Fri Jul 03 2020 Christoph Junghans <junghans(a)votca.org> - 4.1.2-5
+- Rebuild for hdf5 1.10.6
+
* Thu Jun 11 2020 Christoph Junghans <junghans(a)votca.org> - 4.1.2-4
- fix build with boost-1.73
commit 34259b40e3b0bbf528205d5408ca6eb1d312d1cd
Author: Christoph Junghans <junghans(a)votca.org>
Date: Thu Jun 11 12:43:01 2020 -0600
fix build with boost-1.73
diff --git a/3725.patch b/3725.patch
new file mode 100644
index 0000000..9ce21bc
--- /dev/null
+++ b/3725.patch
@@ -0,0 +1,22 @@
+From 48f042382bfe19c54139c10e29d492864d054678 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jean-No=C3=ABl=20Grad?= <jgrad(a)icp.uni-stuttgart.de>
+Date: Fri, 22 May 2020 17:03:17 +0200
+Subject: [PATCH] Fix Variant bug revealed by boost 1.73
+
+---
+ src/script_interface/Variant.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/script_interface/Variant.hpp b/src/script_interface/Variant.hpp
+index e400af836a..6c1751aca1 100644
+--- a/src/script_interface/Variant.hpp
++++ b/src/script_interface/Variant.hpp
+@@ -72,7 +72,7 @@ inline bool is_none(Variant const &v) { return
is_type<None>(v); }
+
+ template <typename T, typename U>
+ std::vector<Variant> pack_pair(const std::pair<T, U> &pair) {
+- return {{pair.first, pair.second}};
++ return {pair.first, pair.second};
+ }
+
+ template <typename T, typename U>
diff --git a/espresso.spec b/espresso.spec
index bb0796a..8052f69 100644
--- a/espresso.spec
+++ b/espresso.spec
@@ -4,8 +4,10 @@
Name: espresso
Version: 4.1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Extensible Simulation Package for Research on Soft matter
+# segfault on s390x:
https://github.com/espressomd/espresso/issues/3753
+ExcludeArch: s390x
License: GPLv3+
URL:
http://espressomd.org
@@ -13,6 +15,8 @@ URL:
http://espressomd.org
Source0:
https://github.com/%{name}md/%{name}/archive/%{commit}/%{name}-%{commit}....
%else
Source0:
https://github.com/%{name}md/%{name}/releases/download/%{version}/%{name}...
+#
https://github.com/espressomd/espresso/pull/3725.patch on boost-1.73
+Patch0:
https://github.com/espressomd/espresso/pull/3725.patch
%endif
@@ -105,6 +109,7 @@ This package contains %{name} compiled against MPICH2.
%setup -q -n espresso-%{commit}
%else
%setup -q -n %{name}
+%patch0 -p1
%endif
%build
@@ -157,6 +162,9 @@ done
%{python3_sitearch}/mpich/%{name}md/
%changelog
+* Thu Jun 11 2020 Christoph Junghans <junghans(a)votca.org> - 4.1.2-4
+- fix build with boost-1.73
+
* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 4.1.2-3
- Rebuilt for Python 3.9
commit 6a6000d5c0fa9ee5f787872615062237a58bf8d4
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue May 26 02:45:03 2020 +0200
Rebuilt for Python 3.9
diff --git a/espresso.spec b/espresso.spec
index f88daa0..bb0796a 100644
--- a/espresso.spec
+++ b/espresso.spec
@@ -4,7 +4,7 @@
Name: espresso
Version: 4.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Extensible Simulation Package for Research on Soft matter
License: GPLv3+
@@ -157,6 +157,9 @@ done
%{python3_sitearch}/mpich/%{name}md/
%changelog
+* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 4.1.2-3
+- Rebuilt for Python 3.9
+
* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.1.2-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
commit 46b048cb3be413d61c126bd929cd428a6bbc6973
Author: Christoph Junghans <junghans(a)votca.org>
Date: Thu May 21 15:32:30 2020 -0600
fixed a typo
diff --git a/espresso.spec b/espresso.spec
index b234432..f88daa0 100644
--- a/espresso.spec
+++ b/espresso.spec
@@ -123,7 +123,7 @@ for mpi in mpich openmpi ; do
module load mpi/${mpi}-%{_arch}
mkdir ${mpi}
pushd ${mpi}
- old_LDFLAGS="${LDFLAGddS}"
+ old_LDFLAGS="${LDFLAGS}"
export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MPI_PYTHON3_SITEARCH}/%{name}md"
%{cmake3} %{defopts} -DLIBDIR=${MPI_LIB} -DPYTHON_INSTDIR=${MPI_PYTHON3_SITEARCH} ..
LD_LIBRARY_PATH=$PWD/src/config %make_build
commit 0e213680f6321fcae7fe9d326e8a08222671a734
Author: Christoph Junghans <junghans(a)votca.org>
Date: Mon May 11 15:43:19 2020 -0600
remove obsolete patches
diff --git a/3228.diff b/3228.diff
deleted file mode 100644
index 812096a..0000000
--- a/3228.diff
+++ /dev/null
@@ -1,139 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 55ceaaf2bc..f6409ffcc1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -29,14 +29,6 @@ endif()
- enable_language(CXX)
-
- set(PROJECT_VERSION "4.1.0")
--string(REGEX
-- REPLACE "^([1-9]+)\\.[0-9]+.*$"
-- "\\1"
-- SOVERSION
-- "${PROJECT_VERSION}")
--if(NOT ${SOVERSION} MATCHES "^[1-9]+$")
-- message(FATAL_ERROR "Could not determine SOVERSION from
${PROJECT_VERSION}")
--endif(NOT ${SOVERSION} MATCHES "^[1-9]+$")
-
- #
- # CMake internal vars
-diff --git a/doc/sphinx/conf.py.in b/doc/sphinx/conf.py.in
-index cb0b3c6757..abe304110b 100644
---- a/doc/sphinx/conf.py.in
-+++ b/doc/sphinx/conf.py.in
-@@ -69,7 +69,7 @@ author = 'C. Holm, F. Weik, R. Weeber'
- # The short X.Y version.
- version = '@PROJECT_VERSION@'
- # The full version, including alpha/beta/rc tags.
--release = '@SOVERSION@'
-+release = '@PROJECT_VERSION@'
-
- # The language for content autogenerated by Sphinx. Refer to documentation
- # for a list of supported languages.
-diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
-index 618e4e59c6..dd34cb4b97 100644
---- a/src/config/CMakeLists.txt
-+++ b/src/config/CMakeLists.txt
-@@ -36,7 +36,6 @@ execute_process(COMMAND ${PYTHON_EXECUTABLE}
- add_library(EspressoConfig SHARED config-features.cpp)
- add_dependencies(EspressoConfig myconfig check_myconfig generate_config_features)
- install(TARGETS EspressoConfig LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
--set_target_properties(EspressoConfig PROPERTIES SOVERSION ${SOVERSION})
- target_include_directories(EspressoConfig PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR})
-
- # Parse repository info from git if available
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index de03ad86f8..c956b9de16 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -158,7 +158,6 @@ else(CUDA)
- endif(CUDA)
-
- install(TARGETS EspressoCore LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
--set_target_properties(EspressoCore PROPERTIES SOVERSION ${SOVERSION})
- target_include_directories(EspressoCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
- if(WITH_COVERAGE)
- target_compile_options(EspressoCore PUBLIC
"$<$<CONFIG:Release>:-g>")
-diff --git a/src/core/cluster_analysis/CMakeLists.txt
b/src/core/cluster_analysis/CMakeLists.txt
-index 354bdd8613..e7e0c22fef 100644
---- a/src/core/cluster_analysis/CMakeLists.txt
-+++ b/src/core/cluster_analysis/CMakeLists.txt
-@@ -4,7 +4,6 @@ set(cluster_analysis_SRC
- )
- add_library(cluster_analysis SHARED ${cluster_analysis_SRC})
- install(TARGETS cluster_analysis LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
--set_target_properties(cluster_analysis PROPERTIES SOVERSION ${SOVERSION})
- set_target_properties(cluster_analysis PROPERTIES MACOSX_RPATH TRUE)
- target_link_libraries(cluster_analysis PUBLIC EspressoCore PRIVATE EspressoConfig)
-
-diff --git a/src/core/io/mpiio/CMakeLists.txt b/src/core/io/mpiio/CMakeLists.txt
-index 365c58295f..7c4b0dc422 100644
---- a/src/core/io/mpiio/CMakeLists.txt
-+++ b/src/core/io/mpiio/CMakeLists.txt
-@@ -1,3 +1,4 @@
- add_library(mpiio SHARED mpiio.cpp)
- target_include_directories(mpiio PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
- target_link_libraries(mpiio PRIVATE EspressoConfig EspressoCore MPI::MPI_CXX)
-+install(TARGETS mpiio LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
-diff --git a/src/core/io/reader/CMakeLists.txt b/src/core/io/reader/CMakeLists.txt
-index 1b9ee38735..6c2de627ac 100644
---- a/src/core/io/reader/CMakeLists.txt
-+++ b/src/core/io/reader/CMakeLists.txt
-@@ -1,3 +1,4 @@
- add_library(pdbreader SHARED readpdb.cpp)
- target_link_libraries(pdbreader PUBLIC EspressoConfig EspressoCore pdbparser)
- target_include_directories(pdbreader PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-+install(TARGETS pdbreader LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
-diff --git a/src/core/shapes/CMakeLists.txt b/src/core/shapes/CMakeLists.txt
-index 268172df6a..c0e78aeeb5 100644
---- a/src/core/shapes/CMakeLists.txt
-+++ b/src/core/shapes/CMakeLists.txt
-@@ -13,5 +13,4 @@ set(Shapes_SRC
- )
- add_library(Shapes SHARED ${Shapes_SRC})
- install(TARGETS Shapes LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
--set_target_properties(Shapes PROPERTIES SOVERSION ${SOVERSION})
- target_link_libraries(Shapes PUBLIC EspressoConfig EspressoCore)
-diff --git a/src/pdbparser/CMakeLists.txt b/src/pdbparser/CMakeLists.txt
-index c58d79e8cb..3c4a66f1dc 100644
---- a/src/pdbparser/CMakeLists.txt
-+++ b/src/pdbparser/CMakeLists.txt
-@@ -1,5 +1,6 @@
- add_library(pdbparser SHARED ${CMAKE_CURRENT_SOURCE_DIR}/src/PdbParser.cpp)
- target_include_directories(pdbparser PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
-+install(TARGETS pdbparser LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
- if(WITH_UNIT_TESTS)
- add_subdirectory(unit_tests)
- endif(WITH_UNIT_TESTS)
-diff --git a/src/python/espressomd/CMakeLists.txt b/src/python/espressomd/CMakeLists.txt
-index ebe76992da..59f2b8affc 100644
---- a/src/python/espressomd/CMakeLists.txt
-+++ b/src/python/espressomd/CMakeLists.txt
-@@ -107,6 +107,7 @@ foreach(cython_file ${cython_SRC})
- target_link_libraries(${target} PRIVATE EspressoConfig EspressoCore
EspressoScriptInterface)
- target_include_directories(${target} SYSTEM PRIVATE ${PYTHON_INCLUDE_DIRS}
${NUMPY_INCLUDE_DIR})
- add_dependencies(espressomd ${target})
-+ install(TARGETS ${target} LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
- endif()
- endforeach()
-
-@@ -124,6 +125,4 @@ foreach(auxfile ${cython_AUX})
- endforeach(auxfile)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${PYTHON_INSTDIR}
-- PATTERN "CMakeFiles" EXCLUDE PATTERN "*.cpp" EXCLUDE
-- PATTERN "*.cmake" EXCLUDE PATTERN "Makefile" EXCLUDE)
--
-+ FILES_MATCHING PATTERN "*.py")
-diff --git a/src/script_interface/CMakeLists.txt b/src/script_interface/CMakeLists.txt
-index d28603f816..0a8966887f 100644
---- a/src/script_interface/CMakeLists.txt
-+++ b/src/script_interface/CMakeLists.txt
-@@ -33,7 +33,6 @@ endif()
-
- add_library(EspressoScriptInterface SHARED ${EspressoScriptInterface_SRC})
- install(TARGETS EspressoScriptInterface LIBRARY DESTINATION
${PYTHON_INSTDIR}/espressomd)
--set_target_properties(EspressoScriptInterface PROPERTIES SOVERSION ${SOVERSION})
- target_link_libraries(EspressoScriptInterface PRIVATE EspressoConfig PUBLIC EspressoCore
Shapes cluster_analysis mpiio pdbreader)
- if(HDF5_FOUND)
- target_link_libraries(EspressoScriptInterface PRIVATE H5mdCore)
diff --git a/mpiio.patch b/mpiio.patch
deleted file mode 100644
index 287ee76..0000000
--- a/mpiio.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- espresso/src/core/io/mpiio/mpiio.cpp.orig 2019-10-04 12:17:47.025423034 -0600
-+++ espresso/src/core/io/mpiio/mpiio.cpp 2019-10-04 12:18:04.708572591 -0600
-@@ -448,7 +448,7 @@
- int blen = boff[i + 1] - boff[i];
- auto &bl = local_particles[id[i]]->bl;
- bl.resize(blen);
-- std::copy_n(&bond[boff[i]], blen, bl.begin());
-+ if(blen) std::copy_n(&bond[boff[i]], blen, bl.begin());
- }
- }
-
commit 2256aede76da708a51abb01ab058927ea45b88f3
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 28 17:51: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/espresso.spec b/espresso.spec
index 64ef09e..b234432 100644
--- a/espresso.spec
+++ b/espresso.spec
@@ -4,7 +4,7 @@
Name: espresso
Version: 4.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Extensible Simulation Package for Research on Soft matter
License: GPLv3+
@@ -157,6 +157,9 @@ done
%{python3_sitearch}/mpich/%{name}md/
%changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.1.2-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Fri Dec 13 2019 Christoph Junghans <junghans(a)votca.org> - 4.1.2-1
- Version bump to v4.1.2 (bug #1783470)
- Drop 3312.patch got merge upstream