diff --git a/.gitignore b/.gitignore index 288db82..3aa0808 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /avogadrolibs-1.92.1.tar.gz /avogenerators-84443126ba5529fc134068047c206f0b3b7b823b.tar.gz /avogadrolibs-1.93.0.tar.gz +/avogadrolibs-1.93.1.tar.gz diff --git a/avogadro2-libs-fix_AvogadroLibsConfig.patch b/avogadro2-libs-fix_AvogadroLibsConfig.patch deleted file mode 100644 index b0cdd07..0000000 --- a/avogadro2-libs-fix_AvogadroLibsConfig.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/AvogadroLibsConfig.cmake.orig.in 2016-12-01 22:17:48.000000000 +0100 -+++ cmake/AvogadroLibsConfig.cmake.in 2017-03-11 20:39:36.462581381 +0100 -@@ -10,7 +10,7 @@ - - set(AvogadroLibs_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@") - set(AvogadroLibs_INCLUDE_DIRS "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_INCLUDE_DIR@") --set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@@LIB_SUFFIX@") -+set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@") - set(AvogadroLibs_RUNTIME_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_RUNTIME_DIR@") - set(AvogadroLibs_CMAKE_DIR "${AvogadroLibs_LIBRARY_DIR}/cmake/avogadrolibs") - diff --git a/avogadro2-libs-fix_libgwavi.patch b/avogadro2-libs-fix_libgwavi.patch deleted file mode 100644 index 2d6b44c..0000000 --- a/avogadro2-libs-fix_libgwavi.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- thirdparty/libgwavi/CMakeLists.orig.txt 2018-08-22 16:26:14.000000000 +0200 -+++ thirdparty/libgwavi/CMakeLists.txt 2018-08-24 18:01:21.867080723 +0200 -@@ -1,8 +1,8 @@ --add_library(libgwavi STATIC gwavi.c fileio.c avi-utils.c) --set_target_properties(libgwavi PROPERTIES POSITION_INDEPENDENT_CODE TRUE) -+add_library(gwavi STATIC gwavi.c fileio.c avi-utils.c) -+set_target_properties(gwavi PROPERTIES POSITION_INDEPENDENT_CODE TRUE) - --install(TARGETS libgwavi -+install(TARGETS gwavi - EXPORT "AvogadroLibsTargets" -- RUNTIME DESTINATION "${INSTALL_RUNTIME_DIR}" -- LIBRARY DESTINATION "${INSTALL_LIBRARY_DIR}" -- ARCHIVE DESTINATION "${INSTALL_ARCHIVE_DIR}") -\ No newline at end of file -+ RUNTIME DESTINATION "${INSTALL_RUNTIME_DIR}/avogadro2" -+ LIBRARY DESTINATION "${INSTALL_LIBRARY_DIR}/avogadro2" -+ ARCHIVE DESTINATION "${INSTALL_ARCHIVE_DIR}/avogadro2") ---- avogadro/qtplugins/playertool/CMakeLists.orig.txt 2018-08-22 16:26:14.000000000 +0200 -+++ avogadro/qtplugins/playertool/CMakeLists.txt 2018-08-24 18:08:51.278284320 +0200 -@@ -11,4 +11,4 @@ - playertool.qrc - ) - --target_link_libraries(PlayerTool LINK_PRIVATE libgwavi) -\ No newline at end of file -+target_link_libraries(PlayerTool LINK_PRIVATE gwavi) diff --git a/avogadro2-libs.spec b/avogadro2-libs.spec index 68975d7..3d3e052 100644 --- a/avogadro2-libs.spec +++ b/avogadro2-libs.spec @@ -2,16 +2,14 @@ ## during compilation of bundled 'jsoncpp'. ## Error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers" -%global __cmake_in_source_build 1 - # Use devtoolset 8 %if 0%{?rhel} && 0%{?rhel} == 7 %global dts devtoolset-8- %endif Name: avogadro2-libs -Version: 1.93.0 -Release: 8%{?dist} +Version: 1.93.1 +Release: 1%{?dist} Summary: Avogadro2 libraries # BSD is main license @@ -26,14 +24,8 @@ Source0: https://github.com/OpenChemistry/avogadrolibs/archive/%{version}/avogad %global shortcommit %(c=%{commit}; echo ${c:0:7}) Source1: https://github.com/OpenChemistry/avogenerators/archive/%{commit}/avogenerators-%{commit}.tar.gz -# Fix reported path -Patch0: %{name}-fix_AvogadroLibsConfig.patch - # Set installation path of Python files -Patch2: %{name}-set_pythonpath.patch - -# Fix libgwavi name and link -Patch3: %{name}-fix_libgwavi.patch +Patch0: %{name}-set_pythonpath.patch BuildRequires: boost-devel BuildRequires: python%{python3_pkgversion}-devel @@ -45,7 +37,9 @@ BuildRequires: epel-rpm-macros %endif BuildRequires: cmake3 BuildRequires: chrpath -BuildRequires: %{?dts}gcc, %{?dts}gcc-c++ +BuildRequires: %{?dts}gcc +BuildRequires: %{?dts}gcc-c++ +BuildRequires: make BuildRequires: pkgconfig(eigen3) BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(openbabel-2.0) @@ -102,7 +96,6 @@ sed -e 's|../avogadrogenerators|avogadrogenerators|g' -i avogadro/qtplugins/quan 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 @@ -132,14 +125,14 @@ mkdir build && pushd build -DBUILD_DOCUMENTATION:BOOL=ON \ -DUSE_LIBMSYM:BOOL=OFF \ -DUSE_SYSTEM_LIBARCHIVE:BOOL=ON .. -%make_build +%cmake3_build -pushd docs +pushd %{_target_platform}/docs doxygen popd %install -%make_install -C build +%cmake3_install # Move scale.py* files into %%{python3_sitearch}/avogadro2 cp -a %{buildroot}%{_libdir}/avogadro2/scripts %{buildroot}%{python3_sitearch}/avogadro2/ @@ -169,10 +162,14 @@ rm -rf %{buildroot}%{_datadir}/doc %{_libdir}/cmake/avogadrolibs/ %files doc -%doc README.md build/docs/html +%doc README.md %{_target_platform}/docs/html %license LICENSE %changelog +* Mon May 03 2021 Antonio Trande - 1.93.1-1 +- Release 1.93.1 +- Remove obsolete patches + * Tue Jan 26 2021 Fedora Release Engineering - 1.93.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 89d3a0b..6ab3717 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (avogadrolibs-1.93.0.tar.gz) = 1af220e5614cbd96656679c2879cb7f7c46acd135b4e6f2e5f8d0ba98601ce004e78f019a0a71c643f005451309bd194eb73eb9f66707685e5855b47e95f7eae +SHA512 (avogadrolibs-1.93.1.tar.gz) = 07c821fca4843b9cab92d6be685e12321b70c88aca53269d0e84ec0cd282c89486fa7c8fc0c1f73ef4d761a66e539d1b65b7acf3b3065ed5f89806fe0f91b4bb SHA512 (avogenerators-84443126ba5529fc134068047c206f0b3b7b823b.tar.gz) = 69d822073399d5edc501abcdbee41f8341a6556647db7174a21ccd20b24b7630e587bbe71d5d5ab5c931e26d9f0ea121558567fb9e36bbe21334e8ee0e93f9ed