From 69b720ea4f67af6d220abfa08e7f9d40f0080d03 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Nov 28 2017 10:51:43 +0000 Subject: Revert "Add platform-python macros" This reverts commit cb52c18aa91a05410adb3a329d0781001ec8e9b3. --- diff --git a/macros.platform-python b/macros.platform-python deleted file mode 100644 index 97eae6e..0000000 --- a/macros.platform-python +++ /dev/null @@ -1,38 +0,0 @@ -%__platform_python /usr/libexec/platform-python -%platform_python_sitelib %(%{__platform_python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") -%platform_python_sitearch %(%{__platform_python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") -%platform_python_version %(%{__platform_python} -c "import sys; sys.stdout.write(sys.version[:3])") -%platform_python_version_nodots %(%{__platform_python} -c "import sys; sys.stdout.write(sys.version[:3].replace('.',''))") -%platform_py_dir %{_builddir}/platform-python-%{name}-%{version}-%{release} - -%platform_py_shbang_opts -s - -# Use the slashes after expand so that the command starts on the same line as -# the macro -%platform_py_build() %{expand:\\\ - CFLAGS="%{optflags}" %{__platform_python} %{py_setup} %{?py_setup_args} build --executable="%{__platform_python} %{platform_py_shbang_opts}" %{?*} - sleep 1 -} - -%platform_py_build_egg() %{expand:\\\ - CFLAGS="%{optflags}" %{__platform_python} %{py_setup} %{?py_setup_args} bdist_egg %{?*} - sleep 1 -} - -%platform_py_build_wheel() %{expand:\\\ - CFLAGS="%{optflags}" %{__platform_python} %{py_setup} %{?py_setup_args} bdist_wheel %{?*} - sleep 1 -} - -%platform_py_install() %{expand:\\\ - CFLAGS="%{optflags}" %{__platform_python} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*} -} - -%platform_py_install_egg() %{expand:\\\ - mkdir -p %{buildroot}%{platform_python_sitelib} - CFLAGS="%{optflags}" %{__platform_python} -m easy_install -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{platform_python_version}.egg %{?*} -} - -%platform_py_install_wheel() %{expand:\\\ - CFLAGS="%{optflags}" %{__platform_python} -m pip install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot} --no-deps -} diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index dcd121b..53a74d1 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 23%{?dist} +Release: 24%{?dist} Summary: The unversioned Python RPM macros License: MIT @@ -8,7 +8,6 @@ Source0: macros.python Source1: macros.python-srpm Source2: macros.python2 Source3: macros.python3 -Source4: macros.platform-python BuildArch: noarch # For %%python3_pkgversion used in %%python_provide @@ -45,12 +44,6 @@ Summary: RPM macros for building Python 3 packages %description -n python3-rpm-macros RPM macros for building Python 3 packages. -%package -n platform-python-rpm-macros -Summary: RPM macros for building Platform-Python packages - -%description -n platform-python-rpm-macros -RPM macros for building Platform-Python packages. - %prep @@ -58,7 +51,7 @@ RPM macros for building Platform-Python packages. %install mkdir -p %{buildroot}/%{rpmmacrodir} -install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ +install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \ %{buildroot}/%{rpmmacrodir}/ @@ -74,11 +67,11 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ %files -n python3-rpm-macros %{rpmmacrodir}/macros.python3 -%files -n platform-python-rpm-macros -%{rpmmacrodir}/macros.platform-python - %changelog +* Tue Nov 28 2017 Tomas Orsava - 3-24 +- Remove platform-python macros (https://fedoraproject.org/wiki/Changes/Platform_Python_Stack) + * Thu Oct 26 2017 Ville Skyttä - 3-23 - Use -Es/-I to invoke macro scriptlets (#1506355)