diff --git a/avogadro-1.1.1-python_openbabel.patch b/avogadro-1.1.1-python_openbabel.patch deleted file mode 100644 index c819b08..0000000 --- a/avogadro-1.1.1-python_openbabel.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt.openbabel avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt ---- avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt.openbabel 2013-12-06 09:50:04.000000000 -0600 -+++ avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt 2016-01-25 13:50:10.469758655 -0600 -@@ -20,8 +20,8 @@ if (WIN32) - set_target_properties(python-module PROPERTIES SUFFIX ".pyd") - target_link_libraries(python-module avogadro ${PYTHON_LIBRARIES}) - else() -- target_link_libraries(python-module stdc++ avogadro -- ${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES}) -+ target_link_libraries(python-module stdc++ avogadro -+ ${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENBABEL2_LIBRARIES} ${Boost_LIBRARIES}) - endif() - - # Let's try to use this instead: diff --git a/avogadro-set_python_libpath.patch b/avogadro-set_python_libpath.patch deleted file mode 100644 index cc39625..0000000 --- a/avogadro-set_python_libpath.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/libavogadro/src/extensions/CMakeLists.orig.txt 2016-06-08 16:19:45.000000000 +0200 -+++ b/libavogadro/src/extensions/CMakeLists.txt 2018-08-01 16:13:22.511491087 +0200 -@@ -76,7 +76,7 @@ - target_link_libraries(pythonterminal ${PYTHON_LIBRARIES}) - - file(GLOB python_SCRIPTS "python/*.py") -- install(FILES ${python_SCRIPTS} DESTINATION share/libavogadro/extensionScripts) -+ install(FILES ${python_SCRIPTS} DESTINATION ${PYTHON_LIBPATH}/libavogadro/extensionScripts) - endif() - - ### Animation ---- a/libavogadro/src/engines/CMakeLists.orig.txt 2016-06-08 16:19:45.000000000 +0200 -+++ b/libavogadro/src/engines/CMakeLists.txt 2018-08-01 16:16:03.377875970 +0200 -@@ -68,5 +68,5 @@ - - if(ALL_PYTHON_FOUND) - file(GLOB python_SCRIPTS "python/*.py") -- install(FILES ${python_SCRIPTS} DESTINATION share/libavogadro/engineScripts) -+ install(FILES ${python_SCRIPTS} DESTINATION ${PYTHON_LIBPATH}/libavogadro/engineScripts) - endif() diff --git a/avogadro.spec b/avogadro.spec index a847405..111c026 100644 --- a/avogadro.spec +++ b/avogadro.spec @@ -1,10 +1,10 @@ -# Avogadro1 supports Python2 only +# Avogadro supports Python2 only %undefine _ld_as_needed Name: avogadro Version: 1.2.0 -Release: 28%{?dist} +Release: 29%{?dist} Summary: An advanced molecular editor for chemical purposes License: GPLv2 URL: http://avogadro.openmolecules.net/ @@ -66,7 +66,7 @@ a powerful plugin architecture. %package libs Summary: Shared libraries for Avogadro -%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}} +Requires: python2-sip%{?_isa} %description libs This package contains the shared libraries for the molecular editor Avogadro. @@ -210,6 +210,9 @@ end %{_datadir}/avogadro/i18n/ %changelog +* Sun Jan 19 2020 Antonio Trande - 1.2.0-29 +- Remove explicit sip-api requirement + * Fri Nov 15 2019 Antonio Trande - 1.2.0-28 - Fix desktop file's categories - Remove rpmmoved files