We don't need this. For real.

This reverts commit c8d9ad1632.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2017-11-03 18:41:38 +01:00
parent c8d9ad1632
commit 2e59d6e30e
2 changed files with 4 additions and 85 deletions

View File

@ -1,10 +1,5 @@
%bcond_without python2
%bcond_without python3
%bcond_without platform_python
%bcond_without check %bcond_without check
%global platform_py_dir %{_builddir}/platpy-%{name}-%{version}-%{release}
# trim changelog included in binary rpms # trim changelog included in binary rpms
%global _changelog_trimtime %(date +%s -d "1 year ago") %global _changelog_trimtime %(date +%s -d "1 year ago")
@ -16,13 +11,12 @@
Name: gpgme Name: gpgme
Summary: GnuPG Made Easy - high level crypto API Summary: GnuPG Made Easy - high level crypto API
Version: 1.9.0 Version: 1.9.0
Release: 6%{?dist} Release: 7%{?dist}
License: LGPLv2+ License: LGPLv2+
URL: https://gnupg.org/related_software/gpgme/ URL: https://gnupg.org/related_software/gpgme/
Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2 Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2
Source2: gpgme-multilib.h Source2: gpgme-multilib.h
Source3: platform-python.patch
## upstream patches ## upstream patches
Patch0001: 0001-qt-pass-fmt-to-gpgrt_asprintf.patch Patch0001: 0001-qt-pass-fmt-to-gpgrt_asprintf.patch
@ -119,7 +113,6 @@ BuildRequires: cmake
%description -n q%{name}-devel %description -n q%{name}-devel
%{summary}. %{summary}.
%if %{with python2}
%package -n python2-gpg %package -n python2-gpg
Summary: %{name} bindings for Python 2 Summary: %{name} bindings for Python 2
%{?python_provide:%python_provide python2-gpg} %{?python_provide:%python_provide python2-gpg}
@ -128,9 +121,7 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%description -n python2-gpg %description -n python2-gpg
%{summary}. %{summary}.
%endif
%if %{with python3}
%package -n python3-gpg %package -n python3-gpg
Summary: %{name} bindings for Python 3 Summary: %{name} bindings for Python 3
%{?python_provide:%python_provide python3-gpg} %{?python_provide:%python_provide python3-gpg}
@ -139,17 +130,6 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%description -n python3-gpg %description -n python3-gpg
%{summary}. %{summary}.
%endif
%if %{with platform_python}
%package -n platform-python-gpg
Summary: %{name} bindings for Platform Python
BuildRequires: platform-python-devel
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%description -n platform-python-gpg
%{summary}.
%endif
%prep %prep
%autosetup -p1 %autosetup -p1
@ -162,35 +142,11 @@ sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g' src/gpgme-config.in
find -type f -name Makefile\* -exec sed -i -e 's|GPG = gpg|GPG = gpg2|' {} ';' find -type f -name Makefile\* -exec sed -i -e 's|GPG = gpg|GPG = gpg2|' {} ';'
%build %build
%if %{with platform_python}
rm -rf %{platform_py_dir}
cp -a . %{platform_py_dir}
pushd %platform_py_dir
patch -p1 < %SOURCE3
./autogen.sh
(
export PYTHON=platform-python
export PATH=$PATH:%{_libexecdir}
%configure --disable-static --disable-silent-rules --enable-languages=python3
)
%make_build
popd
%endif
./autogen.sh ./autogen.sh
%configure --disable-static --disable-silent-rules --enable-languages=cpp,qt,python %configure --disable-static --disable-silent-rules --enable-languages=cpp,qt,python
%make_build %make_build
%install %install
%if %{with platform_python}
pushd %platform_py_dir
%make_install
popd
rm -vf %{buildroot}%{platform_python_sitelib}/gpg/install_files.txt
%endif
%make_install %make_install
# unpackaged files # unpackaged files
@ -219,13 +175,6 @@ rm -vf %{buildroot}%{python3_sitelib}/gpg/install_files.txt
%if %{with check} %if %{with check}
%check %check
%if %{with platform_python}
pushd %platform_py_dir
make check
popd
%endif
make check make check
%endif %endif
@ -276,29 +225,20 @@ fi
%{_libdir}/libq%{name}.so %{_libdir}/libq%{name}.so
%{_libdir}/cmake/QGpgme/ %{_libdir}/cmake/QGpgme/
%if %{with python2}
%files -n python2-gpg %files -n python2-gpg
%doc lang/python/README %doc lang/python/README
%{python2_sitearch}/gpg-*.egg-info %{python2_sitearch}/gpg-*.egg-info
%{python2_sitearch}/gpg/ %{python2_sitearch}/gpg/
%endif
%if %{with python3}
%files -n python3-gpg %files -n python3-gpg
%doc lang/python/README %doc lang/python/README
%{python3_sitearch}/gpg-*.egg-info %{python3_sitearch}/gpg-*.egg-info
%{python3_sitearch}/gpg/ %{python3_sitearch}/gpg/
%endif
%if %{with platform_python}
%files -n platform-python-gpg
%doc lang/python/README
%{platform_python_sitearch}/gpg-*.egg-info
%{platform_python_sitearch}/gpg/
%endif
%changelog %changelog
* Fri Nov 03 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.9.0-7
- Remove platform-python subpackages
* Thu Aug 10 2017 Petr Viktorin <pviktori@redhat.com> - 1.9.0-6 * Thu Aug 10 2017 Petr Viktorin <pviktori@redhat.com> - 1.9.0-6
- Add subpackage for platform-python (https://fedoraproject.org/wiki/Changes/Platform_Python_Stack) - Add subpackage for platform-python (https://fedoraproject.org/wiki/Changes/Platform_Python_Stack)

View File

@ -1,21 +0,0 @@
diff -U3 -r gpgme-1.9.0-orig/m4/python.m4 gpgme-1.9.0/m4/python.m4
--- gpgme-1.9.0-orig/m4/python.m4 2017-03-24 15:20:32.000000000 +0100
+++ gpgme-1.9.0/m4/python.m4 2017-08-10 14:20:58.041841020 +0200
@@ -32,15 +32,13 @@
# cause an error if the version of python installed on the system
# doesn't meet the requirement. MINIMUM-VERSION should consist of
# numbers and dots only.
+
AC_DEFUN([AM_PATH_PYTHON],
[
dnl Find a Python interpreter. Python versions prior to 2.0 are not
dnl supported. (2.0 was released on October 16, 2000).
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-[python2 python2.7 dnl
- python dnl
- python3 python3.0 python3.1 python3.2 python3.3 dnl
- python3.4 python3.5 python3.6 python3.7 python3.8])
+[platform-python])
AC_ARG_VAR([PYTHON], [the Python interpreter])