Tidy up macro formatting

This commit is contained in:
Orion Poplawski 2016-11-15 16:16:16 -07:00
parent 59b1647971
commit 29e6636ccd
3 changed files with 53 additions and 53 deletions

View File

@ -1,51 +1,51 @@
%py_setup setup.py %py_setup setup.py
%py_shbang_opts -s %py_shbang_opts -s
%py_build() %{expand:\ %py_build() %{expand:
CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} build --executable="%{__python2} %{py_shbang_opts}" %{?1}\ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} build --executable="%{__python2} %{py_shbang_opts}" %{?1}
} }
%py_install() %{expand:\ %py_install() %{expand:
CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?1}\ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?1}
} }
%python_provide() %{lua:\ %python_provide() %{lua:
function string.starts(String,Start)\ function string.starts(String,Start)
return string.sub(String,1,string.len(Start))==Start\ return string.sub(String,1,string.len(Start))==Start
end\ end
package = rpm.expand("%{?1:%{1}}");\ package = rpm.expand("%{?1:%{1}}")
vr = rpm.expand("%{?epoch:%{epoch}:}%{version}-%{release}") vr = rpm.expand("%{?epoch:%{epoch}:}%{version}-%{release}")
if (string.starts(package, "python2-")) then\ if (string.starts(package, "python2-")) then
if (rpm.expand("%{?buildarch}") ~= "noarch") then\ if (rpm.expand("%{?buildarch}") ~= "noarch") then
str = "Provides: python-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} = " .. vr;\ str = "Provides: python-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} = " .. vr
print(rpm.expand(str));\ print(rpm.expand(str))
end\ end
print("\\nProvides: python-");\ print("\\nProvides: python-")
print(string.sub(package,9,string.len(package)));\ print(string.sub(package,9,string.len(package)))
print(" = ");\ print(" = ")
print(vr);\ print(vr)
--Obsoleting the previous default python package\ --Obsoleting the previous default python package
print("\\nObsoletes: python-");\ print("\\nObsoletes: python-")
print(string.sub(package,9,string.len(package)));\ print(string.sub(package,9,string.len(package)))
print(" < ");\ print(" < ")
print(vr);\ print(vr)
elseif (string.starts(package, "python" .. rpm.expand("%{python3_pkgversion}") .. "-")) then\ elseif (string.starts(package, "python" .. rpm.expand("%{python3_pkgversion}") .. "-")) then
--No unversioned provides as python3 is not default\ --No unversioned provides as python3 is not default
elseif (rpm.expand("%{?python3_other_pkgversion}") ~= "" and string.starts(package, "python" .. rpm.expand("%{python3_other_pkgversion}") .. "-")) then\ 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\ --No unversioned provides as python3_other is not default
elseif (string.starts(package, "pypy-")) then\ elseif (string.starts(package, "pypy-")) then
--No unversioned provides as pypy is not default\ --No unversioned provides as pypy is not default
elseif (string.starts(package, "pypy3-")) then\ elseif (string.starts(package, "pypy3-")) then
--No unversioned provides as pypy is not default\ --No unversioned provides as pypy is not default
elseif (string.starts(package, "python-")) then\ elseif (string.starts(package, "python-")) then
--Providing the current default python\ --Providing the current default python
print("Provides: python2-");\ print("Provides: python2-")
print(string.sub(package,8,string.len(package)));\ print(string.sub(package,8,string.len(package)))
print(" = ");\ print(" = ")
print(vr);\ print(vr)
else\ else
print("%python_provide: ERROR: ");\ print("%python_provide: ERROR: ")
print(package);\ print(package)
print(" not recognized.");\ print(" not recognized.")
end\ end
} }

View File

@ -6,11 +6,11 @@
%py2_shbang_opts -s %py2_shbang_opts -s
%py2_build() %{expand:\ %py2_build() %{expand:
CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} build --executable="%{__python2} %{py2_shbang_opts}" %{?1};\ CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} build --executable="%{__python2} %{py2_shbang_opts}" %{?1}
sleep 1\ sleep 1
} }
%py2_install() %{expand:\ %py2_install() %{expand:
CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?1}\ CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?1}
} }

View File

@ -7,11 +7,11 @@
%py3_shbang_opts -s %py3_shbang_opts -s
%py3_build() %{expand:\ %py3_build() %{expand:
CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} build --executable="%{__python3} %{py3_shbang_opts}" %{?1};\ CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} build --executable="%{__python3} %{py3_shbang_opts}" %{?1}
sleep 1\ sleep 1
} }
%py3_install() %{expand:\ %py3_install() %{expand:
CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?1}\ CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?1}
} }