From 12e61e0322e0e07e8fa1c82f44f841b41f49074c Mon Sep 17 00:00:00 2001 From: sagitter Date: Jan 23 2020 17:53:54 +0000 Subject: Release 1.92.1| Rebuild for spglib-1.14.1 --- diff --git a/.gitignore b/.gitignore index c64bae0..32680f8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /avogadrolibs-da6ebb9f0e39c73ca861001e390d13e6ed3e6cb5.zip /avogadrolibs-1.91.0.tar.gz /avogenerators-f5a3f98dddda8a776759939a149b4ebb51547507.tar.gz +/avogadrolibs-1.92.1.tar.gz +/avogenerators-84443126ba5529fc134068047c206f0b3b7b823b.tar.gz diff --git a/avogadro2-libs-set_jsoncpp_path.patch b/avogadro2-libs-set_jsoncpp_path.patch deleted file mode 100644 index 87eb0e8..0000000 --- a/avogadro2-libs-set_jsoncpp_path.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- thirdparty/jsoncpp/CMakeLists.orig.txt 2016-12-01 22:17:48.000000000 +0100 -+++ thirdparty/jsoncpp/CMakeLists.txt 2017-03-12 12:14:29.382931158 +0100 -@@ -8,6 +8,6 @@ - #endif() - install(TARGETS jsoncpp - EXPORT "AvogadroLibsTargets" -- RUNTIME DESTINATION "${INSTALL_RUNTIME_DIR}" -- LIBRARY DESTINATION "${INSTALL_LIBRARY_DIR}" -- ARCHIVE DESTINATION "${INSTALL_ARCHIVE_DIR}") -+ RUNTIME DESTINATION "${INSTALL_RUNTIME_DIR}/avogadro2" -+ LIBRARY DESTINATION "${INSTALL_LIBRARY_DIR}/avogadro2" -+ ARCHIVE DESTINATION "${INSTALL_ARCHIVE_DIR}/avogadro2") diff --git a/avogadro2-libs.spec b/avogadro2-libs.spec index fb9814a..c9f242e 100644 --- a/avogadro2-libs.spec +++ b/avogadro2-libs.spec @@ -2,29 +2,31 @@ ## during compilation of bundled 'jsoncpp'. ## Error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers" +# Use devtoolset 8 +%if 0%{?rhel} && 0%{?rhel} == 7 +%global dts devtoolset-8- +%endif + Name: avogadro2-libs -Version: 1.91.0 -Release: 6%{?dist} +Version: 1.92.1 +Release: 1%{?dist} Summary: Avogadro2 libraries # BSD is main license -# MIT is the license of jsoncpp.a +# BSD is the license of avogenerators scripts License: BSD and MIT URL: http://avogadro.openmolecules.net/ Source0: https://github.com/OpenChemistry/avogadrolibs/archive/%{version}/avogadrolibs-%{version}.tar.gz # External source code for avogadrolibs >= 1.91.0 # See https://github.com/OpenChemistry/avogadrolibs/issues/362 -%global commit f5a3f98dddda8a776759939a149b4ebb51547507 +%global commit 84443126ba5529fc134068047c206f0b3b7b823b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Source1: https://github.com/OpenChemistry/avogenerators/archive/%{commit}/avogenerators-%{shortcommit}.tar.gz#/avogenerators-%{commit}.tar.gz +Source1: https://github.com/OpenChemistry/avogenerators/archive/%{commit}/avogenerators-%{commit}.tar.gz # Fix reported path Patch0: %{name}-fix_AvogadroLibsConfig.patch -# Set installation path of jsoncpp.a file -Patch1: %{name}-set_jsoncpp_path.patch - # Set installation path of Python files Patch2: %{name}-set_pythonpath.patch @@ -37,20 +39,17 @@ BuildRequires: python%{python3_pkgversion}-devel BuildRequires: boost-python3-devel %endif %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 -BuildRequires: gcc-c++ +BuildRequires: %{?dts}gcc, %{?dts}gcc-c++ BuildRequires: pkgconfig(eigen3) BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(openbabel-2.0) BuildRequires: mesa-libGLU-devel BuildRequires: hdf5-devel +BuildRequires: mmtf-cpp-devel, jsoncpp-devel BuildRequires: spglib-devel, molequeue-devel BuildRequires: qt5-qtbase-devel, qt5-qttools-devel BuildRequires: libarchive-devel @@ -72,7 +71,6 @@ Requires: mesa-libGLU-devel%{?_isa} Requires: spglib-devel%{?_isa} Requires: %{name}%{?_isa} = %{version}-%{release} -Provides: jsoncpp-static Provides: libgwavi-static %description devel @@ -100,8 +98,11 @@ mv thirdparty/libgwavi/README.md thirdparty/libgwavi/README-libgwavi.md %build mkdir build && pushd build +%if 0%{?el7} +%{?dts:source /opt/rh/devtoolset-8/enable} +%endif export LDFLAGS="%{__global_ldflags} -Wl,--as-needed" -%{cmake3} -DCMAKE_BUILD_TYPE:STRING=Release \ +%cmake3 -DCMAKE_BUILD_TYPE:STRING=Release \ -DINSTALL_INCLUDE_DIR:PATH=include/avogadro2 -DINSTALL_LIBRARY_DIR:PATH=%{_lib} \ -Wno-dev \ -DENABLE_GLSL:BOOL=ON \ @@ -115,15 +116,17 @@ export LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %endif -DENABLE_RPATH:BOOL=OFF \ -DENABLE_TESTING:BOOL=OFF \ + -DUSE_MMTF:BOOL=ON \ + -DUSE_QT:BOOL=ON \ -DUSE_MOLEQUEUE:BOOL=ON \ -DUSE_VTK:BOOL=OFF \ -DUSE_HDF5:BOOL=ON \ + -DUSE_SPGLIB:BOOL=ON \ -DSPGLIB_LIBRARY:FILEPATH=%{_libdir}/libsymspg.so \ -DBUILD_GPL_PLUGINS:BOOL=ON \ -DBUILD_STATIC_PLUGINS:BOOL=ON \ -DBUILD_DOCUMENTATION:BOOL=ON \ -DUSE_LIBMSYM:BOOL=OFF .. - %make_build pushd docs @@ -133,15 +136,12 @@ popd %install %make_install -C build -sed -i -e '1i#!%{__python3}' %{buildroot}%{python3_sitearch}/avogadro2/scripts/inputGenerators/*.py -sed -i -e '1i#!%{__python3}' %{buildroot}%{python3_sitearch}/avogadro2/scripts/formatScripts/*.py - # Move scale.py* files into %%{python3_sitearch}/avogadro2 -cp -a %{buildroot}%{_libdir}/avogadro2/scripts/workflows %{buildroot}%{python3_sitearch}/avogadro2/scripts/ -sed -i -e '1i#!%{__python3}' %{buildroot}%{python3_sitearch}/avogadro2/scripts/workflows/scale.py +cp -a %{buildroot}%{_libdir}/avogadro2/scripts %{buildroot}%{python3_sitearch}/avogadro2/ +pathfix.py -pn -i "%{__python3}" %{buildroot}%{python3_sitearch}/avogadro2/scripts/*/*.py -rm -rf %{buildroot}%{_libdir}/avogadro2/scripts/workflows -ln -sf %{python3_sitearch}/avogadro2/scripts/workflows %{buildroot}%{_libdir}/avogadro2/scripts/workflows +rm -rf %{buildroot}%{_libdir}/avogadro2/scripts +ln -sf %{python3_sitearch}/avogadro2/scripts %{buildroot}%{_libdir}/avogadro2/scripts chrpath -d %{buildroot}%{_libdir}/lib*.so rm -rf %{buildroot}%{_datadir}/doc @@ -154,7 +154,6 @@ rm -rf %{buildroot}%{_datadir}/doc %{_libdir}/lib*.so.* %{_libdir}/avogadro2/ %dir %{_libdir}/avogadro2 -%exclude %{_libdir}/avogadro2/libjsoncpp.a %exclude %{_libdir}/avogadro2/libgwavi.a %exclude %{_libdir}/avogadro2/staticplugins %{python3_sitearch}/avogadro2/ @@ -162,7 +161,6 @@ rm -rf %{buildroot}%{_datadir}/doc %files devel %{_includedir}/avogadro2/ %{_libdir}/lib*.so -%{_libdir}/avogadro2/libjsoncpp.a %{_libdir}/avogadro2/libgwavi.a %{_libdir}/avogadro2/staticplugins/ %{_libdir}/cmake/avogadrolibs/ @@ -172,6 +170,12 @@ rm -rf %{buildroot}%{_datadir}/doc %license LICENSE %changelog +* Tue Jan 21 2020 Antonio Trande - 1.92.1-1 +- Release 1.92.1 +- Rebuild for spglib-1.14.1 +- Use devtools-8 on EPEL7 +- Use CMake3 + * Thu Oct 03 2019 Miro Hrončok - 1.91.0-6 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/sources b/sources index bca6b28..d1673ed 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (avogadrolibs-1.91.0.tar.gz) = 062477dd9db623aaa6ead4e25adcad47210580045198e4b9c33710f5298c21651c180822e3ba8cc0a9da611adca49ae9377c2e496442a48c5365586aff411bda -SHA512 (avogenerators-f5a3f98dddda8a776759939a149b4ebb51547507.tar.gz) = b504dc126b8575f12a3f61864f2b00b79bc99a93dde50567e3c4881c77e49ae286c4d5b21d8378610262d11be8f4e6351a1f5c1de179dafa40aee01b38c696cb +SHA512 (avogadrolibs-1.92.1.tar.gz) = 8c593f31d0d4dc0425d430007803709016d426e287dc4af27b2ca30c7c36f7f420fd9511c3af3d84f613635f42bf00809690f4141f9478a35116fa460bf45c3b +SHA512 (avogenerators-84443126ba5529fc134068047c206f0b3b7b823b.tar.gz) = 69d822073399d5edc501abcdbee41f8341a6556647db7174a21ccd20b24b7630e587bbe71d5d5ab5c931e26d9f0ea121558567fb9e36bbe21334e8ee0e93f9ed