diff --git a/avogadro2.spec b/avogadro2.spec index fa549ee..8dc0d7d 100644 --- a/avogadro2.spec +++ b/avogadro2.spec @@ -1,6 +1,11 @@ +# Use devtoolset 8 +%if 0%{?rhel} && 0%{?rhel} == 7 +%global dts devtoolset-8- +%endif + Name: avogadro2 Version: 1.91.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Advanced molecular editor License: BSD URL: http://avogadro.openmolecules.net/ @@ -8,17 +13,13 @@ Source0: https://github.com/OpenChemistry/avogadroapp/archive/%{version}/ Source1: %{name}.appdata.xml %if 0%{?rhel} -BuildRequires: cmake3, epel-rpm-macros -%global ctest3 ctest3 -%else -BuildRequires: cmake -%global cmake3 %cmake -%global ctest3 ctest +BuildRequires: epel-rpm-macros %endif +BuildRequires: cmake3 BuildRequires: chrpath, desktop-file-utils BuildRequires: avogadro2-libs-devel >= 1.91.0 BuildRequires: molequeue-devel, spglib-devel -BuildRequires: gcc, gcc-c++, doxygen +BuildRequires: %{?dts}gcc, %{?dts}gcc-c++, doxygen BuildRequires: eigen3-devel, hdf5-devel, glew-devel BuildRequires: qt5-qtbase-devel, qt5-qttools-devel %if 0%{?fedora} @@ -48,17 +49,19 @@ features and goals of the Avogadro project: %build mkdir build && pushd build +%if 0%{?el7} +%{?dts:source /opt/rh/devtoolset-8/enable} +%endif export LDFLAGS="%{__global_ldflags} -Wl,--as-needed" export CFLAGS="%{optflags} -I%{_includedir}/%{name}" export CXXFLAGS="%{optflags} -I%{_includedir}/%{name}" -%{cmake3} -DCMAKE_BUILD_TYPE:STRING=Release \ +%cmake3 -DCMAKE_BUILD_TYPE:STRING=Release \ -Wno-dev \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ -DENABLE_RPATH:BOOL=ON \ -DENABLE_TESTING:BOOL=OFF \ -DAvogadroLibs_DIR:PATH=%{_libdir} \ -DBUILD_DOCUMENTATION:BOOL=ON .. - %make_build %install @@ -109,6 +112,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml %{_datadir}/icons/%{name}/ %changelog +* Wed Jan 22 2020 Antonio Trande - 1.91.0-5 +- Rebuild for spglib-1.14.1 +- Use devtools-8 on EPEL7 +- Use CMake3 + * Wed Jul 24 2019 Fedora Release Engineering - 1.91.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild