From c5c17c00523ed359e54ff99992d02f3c84e2735f Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Nov 15 2019 09:59:54 +0000
Subject: Remove all Python2 references


---

diff --git a/avogadro.spec b/avogadro.spec
index 92f6b44..e2c9981 100644
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -1,12 +1,10 @@
 # Avogadro1 supports Python2 only
-# Python2 SIP not recognized with cmake-3.13.3??
-%global with_python 0
 
 %undefine _ld_as_needed
 
 Name:           avogadro
 Version:        1.2.0
-Release:        26%{?dist}
+Release:        27%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 License:        GPLv2
 URL:            http://avogadro.openmolecules.net/
@@ -29,9 +27,6 @@ Patch10:        %{name}-cmake-3.2.patch
 # fix build with recent boost
 Patch12:        %{name}-1.1.1-Q_MOC_RUN.patch
 
-# fix build (with recent swig/linker/python?)
-Patch13:        %{name}-1.1.1-python_openbabel.patch
-
 # fix build with recent Qt
 Patch14:        %{name}-1.1.1-qt.patch
 
@@ -41,18 +36,8 @@ Patch15:        %{name}-%{version}-libmsymfloat.patch
 # slightly improved, see https://github.com/cryos/avogadro/pull/894
 Patch16:        %{name}_eigen3.patch
 
-# Set the installation position of Python files
-Patch17:        %{name}-set_python_libpath.patch
-
 Patch18:        %{name}-%{version}-Allow_plot_axis_width_to_be_changed.patch
 
-%if 0%{?with_python}
-BuildRequires:  python2-sip-devel
-BuildRequires:  python2-numpy
-BuildRequires:  python2-devel
-BuildRequires:  graphviz
-BuildRequires:  boost-python2-devel
-%endif
 BuildRequires:  boost-devel
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
@@ -114,19 +99,10 @@ sed -e 's|@LIB_INSTALL_DIR@|lib@LIB_SUFFIX@|g' -i avogadro.pc.in
 mkdir build && pushd build
 export LDFLAGS="%{__global_ldflags} -lm"
 export CXXFLAGS="%{optflags} -Wno-cpp -I../libavogadro/src"
-%if 0%{?with_python}
-export SIP_INCLUDE_DIR=%{_includedir}/python%{python2_version}
-%endif
 %cmake -DCMAKE_BUILD_TYPE:STRING=Release \
   -Wno-dev -Wno-cpp \
   -DENABLE_GLSL:BOOL=ON \
-%if 0%{?with_python}
-  -DENABLE_PYTHON:BOOL=ON  \
-  -DPYTHON_EXECUTABLE:FILEPATH=%{__python2} \
-  -DPYTHON_LIBPATH:PATH=../..%{python2_sitearch} \
-%else
   -DENABLE_PYTHON:BOOL=OFF  \
-%endif
   -DENABLE_RPATH:BOOL=ON \
   -DCMAKE_SKIP_INSTALL_RPATH:BOOL=NO \
   -DCMAKE_SKIP_RPATH:BOOL=NO \
@@ -146,12 +122,6 @@ popd
 %install
 %make_install -C build
 
-%if 0%{?with_python}
-mkdir -p %{buildroot}%{_datadir}/libavogadro
-ln -sf  %{python2_sitearch}/libavogadro/extensionScripts -T %{buildroot}%{_datadir}/libavogadro/extensionScripts
-ln -sf  %{python2_sitearch}/libavogadro/engineScripts -T %{buildroot}%{_datadir}/libavogadro/engineScripts
-%endif
-
 # Install/check appdata file.
 install -pm 644 -D %{SOURCE1} \
                      %{buildroot}%{_metainfodir}/avogadro.appdata.xml
@@ -227,10 +197,6 @@ end
 %files libs -f libavogadro.lang
 %doc AUTHORS README
 %license COPYING
-%if 0%{?with_python}
-%{python2_sitearch}/Avogadro.so
-%{python2_sitearch}/libavogadro/
-%endif
 %{_datadir}/libavogadro/
 %ghost %{_datadir}/libavogadro/engineScripts.rpmmoved
 %ghost %{_datadir}/libavogadro/extensionScripts.rpmmoved
@@ -243,6 +209,9 @@ end
 %{_datadir}/avogadro/i18n/
 
 %changelog
+* Fri Nov 15 2019 Antonio Trande <sagitter@fedoraproject.org> - 1.2.0-27
+- Remove all Python2 references
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild