From 81d96430c29f3f61d45fa528a64a5ea352aba88f Mon Sep 17 00:00:00 2001 From: sagitter Date: Jul 03 2017 13:34:51 +0000 Subject: Modified for epel builds --- diff --git a/avogadro2-libs.spec b/avogadro2-libs.spec index f0d80d0..a6c8ac3 100644 --- a/avogadro2-libs.spec +++ b/avogadro2-libs.spec @@ -1,6 +1,6 @@ Name: avogadro2-libs Version: 1.90.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Avogadro2 libraries # BSD is main license @@ -21,10 +21,13 @@ Patch2: %{name}-set_jsoncpp_path.patch # Set installation path of Python files Patch3: %{name}-set_pythonpath.patch -BuildRequires: boost-devel, boost-python3-devel +BuildRequires: boost-devel +BuildRequires: python%{python3_pkgversion}-devel +%if 0%{?fedora} +BuildRequires: boost-python3-devel +%endif BuildRequires: cmake, chrpath BuildRequires: gcc-c++, doxygen -BuildRequires: python3-devel BuildRequires: pkgconfig(eigen3) BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(openbabel-2.0) @@ -35,6 +38,7 @@ BuildRequires: qt5-qtbase-devel, qt5-qttools-devel Provides: %{name}-static = %{version}-%{release} Provides: jsoncpp-static +%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}} %description Avogadro libraries provide 3D rendering, visualization, analysis @@ -71,14 +75,18 @@ export LDFLAGS="%{__global_ldflags} -Wl,--as-needed" -Wno-dev \ -DENABLE_GLSL:BOOL=ON \ -DENABLE_PYTHON:BOOL=ON \ + -DPYTHON_EXECUTABLE:FILEPATH=%{__python3} \ + -DPYTHON_VERSION:STRING=%{python3_version} \ +%if 0%{?fedora} + -DUSE_BOOST_PYTHON:BOOL=ON \ +%else + -DUSE_BOOST_PYTHON:BOOL=OFF \ +%endif -DENABLE_RPATH:BOOL=OFF \ -DENABLE_TESTING:BOOL=OFF \ - -DUSE_BOOST_PYTHON:BOOL=ON \ -DUSE_MOLEQUEUE:BOOL=ON \ -DUSE_VTK:BOOL=OFF \ -DUSE_HDF5:BOOL=ON \ - -DPYTHON_EXECUTABLE:FILEPATH=%{__python3} \ - -DPYTHON_VERSION:STRING=%{python3_version} \ -DSPGLIB_LIBRARY:FILEPATH=%{_libdir}/libsymspg.so \ -DBUILD_GPL_PLUGINS:BOOL=ON \ -DBUILD_STATIC_PLUGINS:BOOL=ON \ @@ -122,6 +130,9 @@ pushd build %license COPYING %changelog +* Thu Jun 22 2017 Antonio Trande - 1.90.0-7 +- Modified for epel builds + * Mon May 15 2017 Fedora Release Engineering - 1.90.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild