From bba8ba9f44075fde037bbfca98823fdcdc0f935c Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Jan 14 2019 15:03:32 +0000
Subject: Subpackage python2-moose has been removed


---

diff --git a/moose.spec b/moose.spec
index f102cc8..29531b8 100644
--- a/moose.spec
+++ b/moose.spec
@@ -4,7 +4,7 @@
 Name:           moose
 Version:        3.1.4
 %global codename chamcham
-Release:        2%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
+Release:        3%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
 Summary:        Multiscale Neuroscience and Systems Biology Simulator
 License:        GPLv3
 URL:            http://moose.ncbs.res.in/
@@ -35,8 +35,6 @@ BuildRequires:  hdf5-devel
 BuildRequires:  tinyxml-devel
 BuildRequires:  muParser-devel
 BuildRequires:  libsbml-devel
-BuildRequires:  python2-devel
-BuildRequires:  python2-numpy
 # for tests
 BuildRequires:  checksec
 BuildRequires:  procps-ng
@@ -57,20 +55,6 @@ MOOSE uses Python as its primary scripting language. For backward
 compatibility we have a GENESIS scripting module, but this is
 deprecated. MOOSE numerical code is written in C++.
 
-%package -n python2-%{name}
-Summary:  Python interface for %{name}
-%{?python_provide:%python_provide python2-moose}
-# Those two modules are part of moose...
-Provides: python2-rdesigneur = %{version}-%{release}
-
-Requires: python2-numpy
-Requires: python2-matplotlib
-Requires: python2-matplotlib-qt4
-Requires: python2-lxml
-
-%description -n python2-%{name}
-This package contains the %{summary}.
-
 %package -n python3-%{name}
 Summary:  %{summary}
 %{?python_provide:%python_provide python3-moose}
@@ -97,40 +81,24 @@ cmake_opts=(
         -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -Wl,--build-id"
         -DCMAKE_MODULE_LINKER_FLAGS="$LDFLAGS -Wl,--build-id"
         -DVERSION_MOOSE=%{version}
-	-DCMAKE_BUILD_TYPE="Release|RelWithDebugInfo"
+        -DCMAKE_BUILD_TYPE="Release|RelWithDebugInfo"
         -DCMAKE_INSTALL_DO_STRIP=0
+        -DPYTHON_EXECUTABLE=%{__python3}
 )
 
-mkdir -p build2
-pushd build2
-CXXFLAGS="%optflags" \
-%cmake .. "${cmake_opts[@]}" \
-       -DPYTHON_EXECUTABLE=%{__python2}
-%make_build VERBOSE=1
-cd python
-%py2_build
-popd
-
-mkdir -p build3
-pushd build3
+mkdir -p build
+pushd build
 CXXFLAGS="%optflags" \
-%cmake .. "${cmake_opts[@]}" \
-       -DPYTHON_EXECUTABLE=%{__python3}
+%cmake .. "${cmake_opts[@]}"
 %make_build VERBOSE=1
 cd python
 %py3_build
 popd
 
 %install
-install -D build3/moose.bin %{buildroot}%{_bindir}/moose
-
-pushd build2/python
-%py2_install \--install-lib=%{python2_sitearch}
-# this is necessary for the dependency generator to work
-chmod +x %{buildroot}%{python2_sitearch}/moose/_moose.so
-popd
+install -D build/moose.bin %{buildroot}%{_bindir}/moose
 
-pushd build3/python
+pushd build/python
 %py3_install \--install-lib=%{python3_sitearch}
 # this is necessary for the dependency generator to work
 chmod +x %{buildroot}%{python3_sitearch}/moose/_moose*.so
@@ -139,18 +107,11 @@ popd
 %check
 checksec --file %{buildroot}%{_bindir}/moose
 
-pushd build2
-ctest --output-on-failure -V
-popd
-
-pushd build3
+pushd build
 # test_streamer fails randomly when quitting moose every once in a while.
 ctest --output-on-failure -V -E test_streamer
 popd
 
-PYTHONPATH=%{buildroot}%{python2_sitearch} %{__python2} -c \
-    'import moose; element = moose.Neutral("/yyy"); print(element.path)'
-
 PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -c \
     'import moose; element = moose.Neutral("/yyy"); print(element.path)'
 
@@ -161,13 +122,6 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -c \
 %license LICENSE
 %doc README.md
 
-%files -n python2-%{name}
-%{python2_sitearch}/moose
-%{python2_sitearch}/rdesigneur
-%{python2_sitearch}/pymoose-*egg-info
-%license LICENSE
-%doc README.md
-
 %files -n python3-%{name}
 %{python3_sitearch}/moose
 %{python3_sitearch}/rdesigneur
@@ -176,6 +130,10 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -c \
 %doc README.md
 
 %changelog
+* Mon Jan 14 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.4-3
+- Subpackage python2-moose has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
 * Tue Aug 28 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.1.4-2
 - Rebuild because the package was not tagged properly