espresso: version bump

4 files changed, 88 insertions, 48 deletions

diff --git a/espresso/1042.patch b/espresso/1042.patch
deleted file mode 100644
index ea0c067..0000000
--- a/espresso/1042.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cf4a369485736b7a901fa02bbc911f8d5dddab6a Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Tue, 21 Feb 2017 17:56:55 -0700
-Subject: [PATCH] cmake: allow user to override PYTHON_INSTDIR
-
----
- CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c6ba209..88de171 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -115,9 +115,11 @@ if (WITH_PYTHON)
-                 -c "import distutils.sysconfig as cg; print(cg.get_python_inc())"
-                 OUTPUT_VARIABLE PYTHON_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
-   find_package(NumPy REQUIRED)
--  execute_process(COMMAND ${PYTHON_EXECUTABLE} 
-+  if(NOT PYTHON_INSTDIR)
-+    execute_process(COMMAND ${PYTHON_EXECUTABLE} 
-                 -c "import distutils.sysconfig as cg; print(cg.get_python_lib(1,0,prefix='${CMAKE_INSTALL_EXEC_PREFIX}'))"
-                 OUTPUT_VARIABLE PYTHON_INSTDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-+  endif(NOT PYTHON_INSTDIR)
-   if(PYTHON_VERSION_MAJOR EQUAL 2)
-     set(CYTHON_FLAGS "-2" CACHE STRING "Flags used by the Cython compiler during all build types.")
-   else()
diff --git a/espresso/1056.patch b/espresso/1056.patch
new file mode 100644
index 0000000..97440ea
--- /dev/null
+++ b/espresso/1056.patch
@@ -0,0 +1,75 @@
+From 6eaa18a0ff53430266bee3d8bf99a58ff8571ab0 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@votca.org>
+Date: Fri, 3 Mar 2017 16:05:45 -0700
+Subject: [PATCH] cmake: install all shared libraries
+
+---
+ src/core/constraints/CMakeLists.txt | 1 +
+ src/core/correlators/CMakeLists.txt | 1 +
+ src/core/observables/CMakeLists.txt | 1 +
+ src/core/shapes/CMakeLists.txt      | 1 +
+ src/core/utils/CMakeLists.txt       | 1 +
+ src/script_interface/CMakeLists.txt | 1 +
+ 6 files changed, 6 insertions(+)
+
+diff --git a/src/core/constraints/CMakeLists.txt b/src/core/constraints/CMakeLists.txt
+index 0f5c043..0f34745 100644
+--- a/src/core/constraints/CMakeLists.txt
++++ b/src/core/constraints/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ file(GLOB Constraints_SRC Constraint.cpp)
+ add_library(Constraints SHARED ${Constraints_SRC})
++install(TARGETS Constraints LIBRARY DESTINATION ${PYTHON_INSTDIR})
+ add_dependencies(Constraints EspressoConfig)
+ set_target_properties(Constraints PROPERTIES MACOSX_RPATH TRUE)
+diff --git a/src/core/correlators/CMakeLists.txt b/src/core/correlators/CMakeLists.txt
+index c5ff02f..a8d426e 100644
+--- a/src/core/correlators/CMakeLists.txt
++++ b/src/core/correlators/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ file(GLOB Correlators_SRC *.?pp)
+ add_library(Correlators SHARED ${Correlators_SRC})
++install(TARGETS Correlators LIBRARY DESTINATION ${PYTHON_INSTDIR})
+ add_dependencies(Correlators EspressoConfig)
+ set_target_properties(Correlators PROPERTIES MACOSX_RPATH TRUE)
+diff --git a/src/core/observables/CMakeLists.txt b/src/core/observables/CMakeLists.txt
+index 9813d86..2b1a29a 100644
+--- a/src/core/observables/CMakeLists.txt
++++ b/src/core/observables/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ file(GLOB Observables_SRC *.?pp)
+ add_library(Observables SHARED ${Observables_SRC})
++install(TARGETS Observables LIBRARY DESTINATION ${PYTHON_INSTDIR})
+ add_dependencies(Observables EspressoConfig)
+ set_target_properties(Observables PROPERTIES MACOSX_RPATH TRUE)
+diff --git a/src/core/shapes/CMakeLists.txt b/src/core/shapes/CMakeLists.txt
+index 0e5ecaa..de10452 100644
+--- a/src/core/shapes/CMakeLists.txt
++++ b/src/core/shapes/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ file(GLOB Shapes_SRC *.cpp)
+ add_library(Shapes SHARED ${Shapes_SRC})
++install(TARGETS Shapes LIBRARY DESTINATION ${PYTHON_INSTDIR})
+ add_dependencies(Shapes EspressoConfig)
+ set_target_properties(Shapes PROPERTIES MACOSX_RPATH TRUE)
+diff --git a/src/core/utils/CMakeLists.txt b/src/core/utils/CMakeLists.txt
+index ec0f6f7..071c23b 100644
+--- a/src/core/utils/CMakeLists.txt
++++ b/src/core/utils/CMakeLists.txt
+@@ -1,3 +1,4 @@
+ file(GLOB EspressoUtils_SRC *.cpp)
+ add_library(EspressoUtils SHARED ${EspressoUtils_SRC})
++install(TARGETS EspressoUtils LIBRARY DESTINATION ${PYTHON_INSTDIR})
+ set_target_properties(EspressoUtils PROPERTIES MACOSX_RPATH TRUE)
+diff --git a/src/script_interface/CMakeLists.txt b/src/script_interface/CMakeLists.txt
+index 8aff034..9b099fe 100644
+--- a/src/script_interface/CMakeLists.txt
++++ b/src/script_interface/CMakeLists.txt
+@@ -28,6 +28,7 @@ if(H5MD)
+         )
+ endif(H5MD)
+ add_library(EspressoScriptInterface SHARED ${EspressoScriptInterface_SRC})
++install(TARGETS EspressoScriptInterface LIBRARY DESTINATION ${PYTHON_INSTDIR})
+ add_dependencies(EspressoScriptInterface EspressoConfig EspressoConfig)
+ set_target_properties(EspressoScriptInterface PROPERTIES MACOSX_RPATH TRUE)
+ target_link_libraries(EspressoScriptInterface EspressoCore)
diff --git a/espresso/espresso-7a9ac7414721b40d7d4eaf286b5ae6c18e28f325.tar.gz b/espresso/espresso-8a021f5e8b1d508f356f4419d360bd9dfb7fec2c.tar.gz
index 1cac802..1d44e63 100644
--- a/espresso/espresso-7a9ac7414721b40d7d4eaf286b5ae6c18e28f325.tar.gz
+++ b/espresso/espresso-8a021f5e8b1d508f356f4419d360bd9dfb7fec2c.tar.gz
diff --git a/espresso/espresso.spec b/espresso/espresso.spec
index e50b1f8..4aded0f 100644
--- a/espresso/espresso.spec
+++ b/espresso/espresso.spec
@@ -1,5 +1,5 @@
 %global git 1
-%global commit 7a9ac7414721b40d7d4eaf286b5ae6c18e28f325
+%global commit 8a021f5e8b1d508f356f4419d360bd9dfb7fec2c 
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 %if 0%{?fedora} > 12 || 0%{?rhel} > 6
@@ -20,7 +20,7 @@
 
 Name:           espresso
 Version:        4.0
-Release:        0.1.20170220git%{shortcommit}%{?dist}
+Release:        0.2.20170228git%{shortcommit}%{?dist}
 Summary:        Extensible Simulation Package for Research on Soft matter
 
 License:        GPLv3+
@@ -30,8 +30,8 @@ Source0:	https://github.com/%{name}md/%{name}/archive/%{commit}/%{name}-%{commit
 %else
 Source0:        http://download.savannah.gnu.org/releases/espressomd/espresso-%{version}.tar.gz
 %endif
-# PATCH-FIX-UPSTREAM - 1042.patch -  allow user to override PYTHON_INSTDIR
-Patch0:         https://patch-diff.githubusercontent.com/raw/espressomd/espresso/pull/1042.patch
+# PATCH-FIX-UPSTREAM - 1056.patch -  fix install
+Patch0:         https://patch-diff.githubusercontent.com/raw/espressomd/espresso/pull/1056.patch
 
 
 BuildRequires:  cmake
@@ -70,24 +70,13 @@ ESPResSo contains a number of advanced algorithms, e.g.
 This package contains the license file and data files shared between the
 subpackages of %{name}.
 
-%package devel
-Summary:        Development package for  %{name} packages
-Requires:       python2-%{name}-openmpi = %{version}-%{release}
-Requires:       python2-%{name}-mpich = %{version}-%{release}
-%description devel
-ESPResSo can perform Molecular Dynamics simulations of bead-spring models
-in various ensembles ((N,V,E), (N,V,T), and (N,p,T)).
-ESPResSo contains a number of advanced algorithms, e.g.
-    * DPD thermostat (for hydrodynamics)
-    * P3M, MMM2D, MMM1D, ELC for electrostatic interactions
-    * Lattice-Boltzmann for hydrodynamics
-This package contains the development libraries of %{name}.
-
 %package -n python2-%{name}-openmpi
 Requires:       %{name}-common = %{version}-%{release}
 Summary:        Extensible Simulation Package for Research on Soft matter
 Provides:       %{name}-openmpi = %{version}-%{release}
 Obsoletes:      %{name}-openmpi < 3.3.0-12
+Provides:       %{name}-devel = %{version}-%{release}
+Obsoletes:      %{name}-devel < 4.0-0.2
 %description -n python2-%{name}-openmpi
 ESPResSo can perform Molecular Dynamics simulations of bead-spring models
 in various ensembles ((N,V,E), (N,V,T), and (N,p,T)).
@@ -106,6 +95,8 @@ Provides:       %{name}-mpich2 = %{version}-%{release}
 Obsoletes:      %{name}-mpich2 < 3.1.1-3
 Provides:       %{name}-mpich = %{version}-%{release}
 Obsoletes:      %{name}-mpich < 3.3.0-12
+Provides:       %{name}-devel = %{version}-%{release}
+Obsoletes:      %{name}-devel < 4.0-0.2
 %description -n python2-%{name}-mpich
 ESPResSo can perform Molecular Dynamics simulations of bead-spring models
 in various ensembles ((N,V,E), (N,V,T), and (N,p,T)).
@@ -204,18 +195,18 @@ popd
 %doc AUTHORS README NEWS ChangeLog
 %license COPYING
 
-%files devel
-%{_libdir}/*/lib/lib*.so
-
 %files -n python2-%{name}-openmpi
-%{_libdir}/openmpi/lib/lib*.so.*
 %{python_sitearch}/openmpi/%{name}md
 
 %files -n python2-%{name}-mpich
-%{_libdir}/mpich/lib/lib*.so.*
 %{python_sitearch}/mpich/%{name}md
 
 %changelog
+* Thu Mar 05 2017 Christoph Junghans <junghans@votca.org> - 4.0-0.2.20170228git8a021f5
+- Dropped 1042.patch, merged upstream
+- Add 1056.patch to fix install
+- Dropped devel package, no libs in %{_libdir} anymore
+
 * Thu Feb 16 2017 Christoph Junghans <junghans@votca.org> - 4.0-0.1.20170220git7a9ac74
 - Bump to version 4.0 git version
 - Drop cypthon patch, incl. upstream