From 28b520ca064b1893a826c54767fd3a0ccf21f599 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@redhat.com>
Date: Nov 16 2018 13:58:13 +0000
Subject: drop python2 subpackage is python2 is no longer supported in Fedora 30+ (#1627433)


---

diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index f2296f8..7b6d602 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -1,7 +1,6 @@
 # FIXME rhbz#533920, automake does not support python3
 %bcond_with python3
 
-%bcond_without python2
 %bcond_without unittests
 
 %global confflags %{shrink: \
@@ -17,7 +16,7 @@ the interface supplied by the %{name} library.
 
 Name: ecryptfs-utils
 Version: 111
-Release: 15%{?dist}
+Release: 16%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 License: GPLv2+
 URL: https://launchpad.net/ecryptfs
@@ -114,19 +113,6 @@ Requires: pkgconfig
 %description devel
 Userspace development files for eCryptfs.
 
-%if %{with python2}
-%package -n python2-%{name}
-Summary: Python bindings for the eCryptfs utils
-Requires: %{name} = %{version}-%{release}
-BuildRequires: python2-devel
-Provides: %{name}-python
-Obsoletes:  %{name}-python < %{version}-%{release}
-%{?python_provide:%python_provide python2-%{name}}
-
-%description -n python2-%{name} %pydesc
-%endif 
-
-
 %if %{with python3}
 %package -n python%{python3_pkgversion}-%{name}
 Summary: Python bindings for the eCryptfs utils
@@ -141,8 +127,7 @@ Obsoletes:  %{name}-python < %{version}-%{release}
 
 
 %prep
-%setup -qc
-pushd %{name}-%{version}
+%setup -q
 
 %patch1 -p0 -b .openssl11
 
@@ -178,52 +163,24 @@ sed -i -r 's:(snprintf.*"\%)(s/\%)(s"):\1.42\2.23\3:' \
 sed -i -r 's:(rootsbindir=).*:\1"%{_sbindir}":' configure.ac
 autoreconf -fiv
 
-# don't confuse rpmbuild to find and install everything at right places
-mv -t.. COPYING AUTHORS NEWS THANKS doc/ README
-ln -s -t. ../doc ../README
-popd
-
-%if %{with python2}
-cp -a %{name}-%{version} py2
-%endif
-%if %{with python3}
-cp -a %{name}-%{version} py3
-%endif
-
-
 %build
 # openssl 1.1 marks some functions as deprecated
 export ERRFLAGS="-Werror -Wtype-limits -Wno-unused -Wno-error=deprecated-declarations"
 
-%if %{with python2}
-pushd py2
-export CFLAGS="$RPM_OPT_FLAGS $ERRFLAGS"
-# rhbz#1537244, avoid unversioned python executable
-export PYTHON=%{__python2}
-%configure %{confflags}
-popd
-%make_build -C py2
-%endif
-
 %if %{with python3}
-pushd py3
 export PYTHON_VERSION=3
 export PYTHON=%{__python3}
 export PYTHON_NOVERSIONCHECK=1
 export PY3FLAGS='%(pkg-config --cflags --libs python3)'
 export CFLAGS="$RPM_OPT_FLAGS $PY3FLAGS $ERRFLAGS"
 %configure %{confflags}
-popd
-%make_build -C py3
+%else
+%configure %{confflags} --disable-pywrap
 %endif
+%make_build
 
 %install
-%if %{with python2}
-%make_install -C py2
-%endif
-%if %{with python3}
-%make_install -C py3
-%endif
+%make_install
 
 find $RPM_BUILD_ROOT/ -name '*.la' -print -delete
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -349,12 +306,6 @@ fi
 %{_libdir}/pkgconfig/libecryptfs.pc
 %{_includedir}/ecryptfs.h
 
-%if %{with python2}
-%files -n python2-%{name}
-%{python2_sitearch}/%{name}/
-%{python2_sitelib}/%{name}/
-%endif
-
 %if %{with python3}
 %files -n python%{python3_pkgversion}-%{name}
 %{python3_sitearch}/%{name}/
@@ -363,6 +314,9 @@ fi
 
 
 %changelog
+* Fri Nov 16 2018 Michal Hlavinka <mhlavink@redhat.com> - 111-16
+- drop python2 subpackage is python2 is no longer supported in Fedora 30+ (#1627433)
+
 * Fri Sep 07 2018 Michal Hlavinka <mhlavink@redhat.com> - 111-15
 - switch to authselect since it replaced authconfig in F28 (RHBZ#1577174)