From 99a8a3e31e3a51b26cd28828254d44e9b3f1407f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 7 Oct 2019 19:10:57 +0200 Subject: [PATCH] Included in RHEL 7.7+ --- .gitignore | 0 dead.package | 1 + macros.pybytecompile | 27 ------- macros.python | 94 ------------------------ macros.python-srpm | 108 --------------------------- macros.python2 | 37 ---------- macros.python3 | 40 ---------- python-rpm-macros.spec | 161 ----------------------------------------- sources | 0 9 files changed, 1 insertion(+), 467 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 macros.pybytecompile delete mode 100644 macros.python delete mode 100644 macros.python-srpm delete mode 100644 macros.python2 delete mode 100644 macros.python3 delete mode 100644 python-rpm-macros.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..7d96bd7 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Included in RHEL 7.7+ diff --git a/macros.pybytecompile b/macros.pybytecompile deleted file mode 100644 index f5439cf..0000000 --- a/macros.pybytecompile +++ /dev/null @@ -1,27 +0,0 @@ -# Note that the path could itself be a python file, or a directory - -# Python's compile_all module only works on directories, and requires a max -# recursion depth - -# Note that the py_byte_compile macro should work for all Python versions -# Which unfortunately makes the definition more complicated than it should be - -%py_byte_compile()\ -py2_byte_compile () {\ - python_binary="%1"\ - bytecode_compilation_path="%2"\ - find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("$RPM_BUILD_ROOT")[2]) for f in sys.argv[1:]]' || :\ - find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("$RPM_BUILD_ROOT")[2]) for f in sys.argv[1:]]' || :\ -}\ -\ -py3_byte_compile () {\ - python_binary="%1"\ - bytecode_compilation_path="%2"\ - find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("$RPM_BUILD_ROOT")[2], optimize=opt) for opt in range(2) for f in sys.argv[1:]]' || :\ -}\ -\ -# Get version without a dot (36 instead of 3.6), bash doesn't compare floats well \ -python_version=$(%1 -c "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))") \ -# The bytecompilation syntax has changed between Python 3.4 and Python 3.5, so for 3.4 and earlier we use the "Python 2" syntax \ -[ "$python_version" -ge 35 ] && py3_byte_compile "%1" "%2" || py2_byte_compile "%1" "%2" \ -%{nil} diff --git a/macros.python b/macros.python deleted file mode 100644 index 37961b0..0000000 --- a/macros.python +++ /dev/null @@ -1,94 +0,0 @@ -%py_setup setup.py -%py_shbang_opts -s - -# Use the slashes after expand so that the command starts on the same line as -# the macro -%py_build() %{expand:\\\ - CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} build --executable="%{__python2} %{py_shbang_opts}" %{?*} - sleep 1 -} - -%py_build_egg() %{expand:\\\ - CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} bdist_egg %{?*} - sleep 1 -} - -%py_build_wheel() %{expand:\\\ - CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} bdist_wheel %{?*} - sleep 1 -} - -%py_install() %{expand:\\\ - CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*} -} - -%py_install_egg() %{expand:\\\ - mkdir -p %{buildroot}%{python_sitelib} - easy_install -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python_version}.egg %{?*} -} - -%py_install_wheel() %{expand:\\\ - pip install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot} --no-deps -} - -%python_provide() %{lua: - function string.starts(String,Start) - return string.sub(String,1,string.len(Start))==Start - end - package = rpm.expand("%{?1}") - vr = rpm.expand("%{?epoch:%{epoch}:}%{version}-%{release}") - if (string.starts(package, "python2-")) then - if (rpm.expand("%{?buildarch}") ~= "noarch") then - str = "Provides: python-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} = " .. vr - print(rpm.expand(str)) - end - print("\\nProvides: python-") - print(string.sub(package,9,string.len(package))) - print(" = ") - print(vr) - --Obsoleting the previous default python package - print("\\nObsoletes: python-") - print(string.sub(package,9,string.len(package))) - print(" < ") - print(vr) - elseif (string.starts(package, "python3-")) then - if (rpm.expand("%{?buildarch}") ~= "noarch") then - str = "Provides: python36-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} = " .. vr - print(rpm.expand(str)) - end - print("\\nProvides: python36-") - print(string.sub(package,9,string.len(package))) - print(" = ") - print(vr) - --Obsoleting the EPEL python36 package - print("\\nObsoletes: python36-") - print(string.sub(package,9,string.len(package))) - print(" < ") - print(vr) - elseif (string.starts(package, "python36-")) then - if (rpm.expand("%{?buildarch}") ~= "noarch") then - str = "Provides: python3-" .. string.sub(package,10,string.len(package)) .. "%{?_isa} = " .. vr - print(rpm.expand(str)) - end - print("\\nProvides: python3-") - print(string.sub(package,10,string.len(package))) - print(" = ") - print(vr) - elseif (rpm.expand("%{?python3_other_pkgversion}") ~= "" and string.starts(package, "python" .. rpm.expand("%{python3_other_pkgversion}") .. "-")) then - --No unversioned provides as python3_other is not default - elseif (string.starts(package, "pypy-")) then - --No unversioned provides as pypy is not default - elseif (string.starts(package, "pypy3-")) then - --No unversioned provides as pypy is not default - elseif (string.starts(package, "python-")) then - --Providing the current default python - print("Provides: python2-") - print(string.sub(package,8,string.len(package))) - print(" = ") - print(vr) - else - print("%python_provide: ERROR: ") - print(package) - print(" not recognized.") - end -} diff --git a/macros.python-srpm b/macros.python-srpm deleted file mode 100644 index 92193f8..0000000 --- a/macros.python-srpm +++ /dev/null @@ -1,108 +0,0 @@ -# python3_pkgversion specifies the version of Python 3 in the distro. It can be -# a specific version (e.g. 36 in Fedora EPEL7) -%python3_pkgversion 36 -%python3_other_pkgversion 34 - -# Set to /bin/true when not active to avoid %ifdefs and %{? in specfiles -%__python3_other /bin/true -%py3_other_build /bin/true -%py3_other_install /bin/true - - - -# === Macros for Build/Requires tags using Python dist tags === -# - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages -# - These macros need to be in macros.python-srpm, because BuildRequires tags -# get rendered as runtime requires into the metadata of SRPMs. - -# Converts Python dist name to a canonical format -%py_dist_name() %{lua:\ - name = rpm.expand("%{?1:%{1}}");\ - canonical = string.gsub(string.lower(name), "%W+", "-");\ - print(canonical);\ -} - -# Creates Python 2 dist tag(s) after converting names to canonical format -# Needs to first put all arguments into a list, because invoking a different -# macro (%py_dist_name) overwrites them -%py2_dist() %{lua:\ - args = {}\ - arg = 1\ - while (true) do\ - name = rpm.expand("%{?" .. arg .. ":%{" .. arg .. "}}");\ - if (name == nil or name == '') then\ - break\ - end\ - args[arg] = name\ - arg = arg + 1\ - end\ - for arg, name in ipairs(args) do\ - canonical = rpm.expand("%py_dist_name " .. name);\ - print("python2dist(" .. canonical .. ") ");\ - end\ -} - -# Creates Python 3 dist tag(s) after converting names to canonical format -# Needs to first put all arguments into a list, because invoking a different -# macro (%py_dist_name) overwrites them -%py3_dist() %{lua:\ - args = {}\ - arg = 1\ - while (true) do\ - name = rpm.expand("%{?" .. arg .. ":%{" .. arg .. "}}");\ - if (name == nil or name == '') then\ - break\ - end\ - args[arg] = name\ - arg = arg + 1\ - end\ - for arg, name in ipairs(args) do\ - canonical = rpm.expand("%py_dist_name " .. name);\ - print("python3dist(" .. canonical .. ") ");\ - end\ -} - -# Macro to replace overly complicated references to PyPI source files. -# Expands to the pythonhosted URL for a package -# Accepts zero to three arguments: -# 1: The PyPI project name, defaulting to %srcname if it is defined, then -# %pypi_name if it is defined, then just %name. -# 2: The PYPI version, defaulting to %version. -# 3: The file extension, defaulting to "tar.gz". (A period will be added -# automatically.) -# Requires %__pypi_url and %__pypi_default_extension to be defined. -%__pypi_url https://files.pythonhosted.org/packages/source/ -%__pypi_default_extension tar.gz - -%pypi_source() %{lua: - local src = rpm.expand('%1') - local ver = rpm.expand('%2') - local ext = rpm.expand('%3') - local url = rpm.expand('%__pypi_url') -\ - -- If no first argument, try %srcname, then %pypi_name, then %name - -- Note that rpm leaves macros unchanged if they are not defined. - if src == '%1' then - src = rpm.expand('%srcname') - end - if src == '%srcname' then - src = rpm.expand('%pypi_name') - end - if src == '%pypi_name' then - src = rpm.expand('%name') - end -\ - -- If no second argument, use %version - if ver == '%2' then - ver = rpm.expand('%version') - end -\ - -- If no third argument, use the preset default extension - if ext == '%3' then - ext = rpm.expand('%__pypi_default_extension') - end -\ - local first = string.sub(src, 1, 1) -\ - print(url .. first .. '/' .. src .. '/' .. src .. '-' .. ver .. '.' .. ext) -} diff --git a/macros.python2 b/macros.python2 deleted file mode 100644 index 169d48f..0000000 --- a/macros.python2 +++ /dev/null @@ -1,37 +0,0 @@ -%__python2 /usr/bin/python2 -%python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") -%python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") -%python2_version %(%{__python2} -c "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))") -%python2_version_nodots %(%{__python2} -c "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))") - -%py2_shbang_opts -s - -# Use the slashes after expand so that the command starts on the same line as -# the macro -%py2_build() %{expand:\\\ - CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} build --executable="%{__python2} %{py2_shbang_opts}" %{?*} - sleep 1 -} - -%py2_build_egg() %{expand:\\\ - CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} bdist_egg %{?*} - sleep 1 -} - -%py2_build_wheel() %{expand:\\\ - CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} bdist_wheel %{?*} - sleep 1 -} - -%py2_install() %{expand:\\\ - CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*} -} - -%py2_install_egg() %{expand:\\\ - mkdir -p %{buildroot}%{python2_sitelib} - easy_install-%{python2_version} -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python2_version}.egg %{?*} -} - -%py2_install_wheel() %{expand:\\\ - pip%{python2_version} install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot} --no-deps -} diff --git a/macros.python3 b/macros.python3 deleted file mode 100644 index 242e72a..0000000 --- a/macros.python3 +++ /dev/null @@ -1,40 +0,0 @@ -%__python3 /usr/bin/python3.6 - -%python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") -%python3_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") -%python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])") -%python3_version_nodots %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3].replace('.',''))") -%python3_platform %(%{__python3} -Ic "import sysconfig; print(sysconfig.get_platform())") -%py3dir %{_builddir}/python3-%{name}-%{version}-%{release} - -%py3_shbang_opts -s - -# Use the slashes after expand so that the command starts on the same line as -# the macro -%py3_build() %{expand:\\\ - CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} build --executable="%{__python3} %{py3_shbang_opts}" %{?*} - sleep 1 -} - -%py3_build_egg() %{expand:\\\ - CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} bdist_egg %{?*} - sleep 1 -} - -%py3_build_wheel() %{expand:\\\ - CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} bdist_wheel %{?*} - sleep 1 -} - -%py3_install() %{expand:\\\ - CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*} -} - -%py3_install_egg() %{expand:\\\ - mkdir -p %{buildroot}%{python3_sitelib} - easy_install-%{python3_version} -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python3_version}.egg %{?*} -} - -%py3_install_wheel() %{expand:\\\ - pip%{python3_version} install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot} --no-deps -} diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec deleted file mode 100644 index 101a116..0000000 --- a/python-rpm-macros.spec +++ /dev/null @@ -1,161 +0,0 @@ -Name: python-rpm-macros -Version: 3 -Release: 31%{?dist} -Summary: The unversioned Python RPM macros - -License: MIT -Source0: macros.python -Source1: macros.python-srpm -Source2: macros.python2 -Source3: macros.python3 -Source5: macros.pybytecompile - -BuildArch: noarch -# For %%python3_pkgversion used in %%python_provide -Requires: python-srpm-macros - -%description -This package contains the unversioned Python RPM macros, that most -implementations should rely on. - -You should not need to install this package manually as the various -python?-devel packages require it. So install a python-devel package instead. - -%package -n python-srpm-macros -Summary: RPM macros for building Python source packages - -%description -n python-srpm-macros -RPM macros for building Python source packages. - -%package -n python2-rpm-macros -Summary: RPM macros for building Python 2 packages - -%description -n python2-rpm-macros -RPM macros for building Python 2 packages. - -%package -n python3-rpm-macros -Summary: RPM macros for building Python 3 packages - -%description -n python3-rpm-macros -RPM macros for building Python 3 packages. - - -%prep - -%build - -%install -mkdir -p %{buildroot}/%{rpmmacrodir} -install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE5} \ - %{buildroot}/%{rpmmacrodir}/ - - -%files -%{rpmmacrodir}/macros.python -%{rpmmacrodir}/macros.pybytecompile - -%files -n python-srpm-macros -%{rpmmacrodir}/macros.python-srpm - -%files -n python2-rpm-macros -%{rpmmacrodir}/macros.python2 - -%files -n python3-rpm-macros -%{rpmmacrodir}/macros.python3 - - -%changelog -* Wed Aug 14 2019 Kevin Fenzi - 3-31 -- Update to larger than 30 so rhel7.7 python2 will work in koji. -- Note: this package should be retired as soon as centos 7.7 is out. -- Note: this package should NOT be pushed as an update, only used as a override. - -* Tue Apr 30 2019 Miro Hrončok - 3-25 -- Split python3-other-rpm-macros from python-rpm-macros to python-epel-rpm-macros - -* Thu Apr 25 2019 Miro Hrončok - 3-24 -- %%python_provide: Obsolete and provide python36- from python3- -- %%python_provide: Provide python3- from python36- - -* Thu Jan 31 2019 Miro Hrončok - 3-23 -- Make Python 3.6 the main Python 3 version -- Make Python 3.4 the other Python 3 version - -* Sat Jul 14 2018 Tomas Orsava - 3-22 -- Move macros.pybytecompile in here from python3X-devel -- macros.pybytecompile: Detect Python version through sys.version_info instead - of guessing from the executable name - -* Mon Jul 09 2018 Jason L Tibbitts III - 3-21 -- Backport %%python3_platform and add %%python3_other_platform. - -* Thu Jun 21 2018 Tadej Janež - 3-20 -- Add %%python3_other_* counterparts for %%python3_* macros in EPEL 7 - -* Mon Jun 18 2018 Jason L Tibbitts III - 3-19 -- Add %%pypi_source macro. - -* Wed Dec 20 2017 Charalampos Stratakis - 3-18 -- Add python36 in EPEL 7. - -* Mon Jan 23 2017 Michal Cyprian - 3-17 -- Add --no-deps option to py_install_wheel macros - -* Tue Jan 17 2017 Tomas Orsava - 3-16 -- Added macros for Build/Requires tags using Python dist tags: - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Thu Nov 24 2016 Orion Poplawski 3-15 -- Make expanded macros start on the same line as the macro - -* Wed Nov 16 2016 Orion Poplawski 3-14 -- Fix %%py3_install_wheel (bug #1395953) - -* Wed Nov 16 2016 Orion Poplawski 3-13 -- Add missing sleeps to other build macros -- Fix build_egg macros -- Add %%py_build_wheel and %%py_install_wheel macros - -* Tue Nov 15 2016 Orion Poplawski 3-12 -- Add %%py_build_egg and %%py_install_egg macros -- Allow multiple args to %%py_build/install macros -- Tidy up macro formatting - -* Wed Aug 24 2016 Orion Poplawski 3-11 -- Use %%rpmmacrodir - -* Tue Jul 12 2016 Orion Poplawski 3-10 -- Do not generate useless Obsoletes with %%{?_isa} - -* Fri May 13 2016 Orion Poplawski 3-9 -- Make python-rpm-macros require python-srpm-macros (bug #1335860) - -* Thu May 12 2016 Jason L Tibbitts III - 3-8 -- Add single-second sleeps to work around setuptools bug. - -* Thu Feb 04 2016 Fedora Release Engineering - 3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jan 25 2016 Orion Poplawski 3-6.1 -- Set %%__python3 to /usr/bin/python3.4 - -* Thu Jan 14 2016 Orion Poplawski 3-6 -- Fix typo in %%python_provide - -* Thu Jan 14 2016 Orion Poplawski 3-5 -- Handle noarch python sub-packages (bug #1290900) - -* Thu Jan 14 2016 Orion Poplawski 3-4.1 -- EPEL version - -* Wed Jan 13 2016 Orion Poplawski 3-4 -- Fix python2/3-rpm-macros package names - -* Thu Jan 7 2016 Orion Poplawski 3-3 -- Add empty %%prep and %%build - -* Mon Jan 4 2016 Orion Poplawski 3-2 -- Combined package - -* Wed Dec 30 2015 Orion Poplawski 3-1 -- Initial package diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000