diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2015-01-13 20:25:31 +0100 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2015-01-14 09:15:14 +0100 |
| commit | 93112e9d830eea8e231a3e960085a4f3ef195485 (patch) | |
| tree | 377415f02a53d1d89dd40925e0070c79918b36f5 | |
| parent | b31790cf3502c0d3c0deb48cb86cd26a557a5fc1 (diff) | |
| download | clufter-93112e9d830eea8e231a3e960085a4f3ef195485.tar.gz clufter-93112e9d830eea8e231a3e960085a4f3ef195485.tar.xz clufter-93112e9d830eea8e231a3e960085a4f3ef195485.zip | |
spec: migrate from __pythonX macros to __python2X ones
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
| -rw-r--r-- | misc/clufter.spec | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/misc/clufter.spec b/misc/clufter.spec index 3babb1f..f0519b4 100644 --- a/misc/clufter.spec +++ b/misc/clufter.spec @@ -30,7 +30,7 @@ URL: %{clufter_url_main}%{clufter_name} # autosetup BuildRequires: git -# Python side +# Python side (first for python2* macros) BuildRequires: python2-devel BuildRequires: python-setuptools %if %{clufter_check} @@ -118,14 +118,14 @@ formats and filters. %autosetup -n %{name}-%{clufter_version} -p1 -S git ## for some esoteric reason, the line above has to be empty -%{__python} setup.py saveopts -f setup.cfg pkg_prepare \ - --ccs-flatten="%{clufter_ccs_flatten}" \ - --editor="%{clufter_editor}" \ - --ra-metadata-dir="%{clufter_ra_metadata_dir}" \ - --ra-metadata-ext="%{clufter_ra_metadata_ext}" +%{__python2} setup.py saveopts -f setup.cfg pkg_prepare \ + --ccs-flatten="%{clufter_ccs_flatten}" \ + --editor="%{clufter_editor}" \ + --ra-metadata-dir="%{clufter_ra_metadata_dir}" \ + --ra-metadata-ext="%{clufter_ra_metadata_ext}" %build -%{__python} setup.py build +%{__python2} setup.py build %if "x%{clufter_script}" == "x" %else %if "x%{clufter_bashcomp}" == "x" @@ -137,7 +137,7 @@ formats and filters. %install # '--root' implies setuptools involves distutils to do old-style install -%{__python} setup.py install --skip-build --root "%{buildroot}" +%{__python2} setup.py install --skip-build --root "%{buildroot}" %if "x%{clufter_script}" == "x" %else # %%{_bindir}/%%{clufter_name} should have been created @@ -177,8 +177,8 @@ ret=$? %else %if "x%{clufter_script}" == "x" if [ $1 -gt 1 ]; then # no gain regenerating it w/ fresh install (same result) - %{__python} -m %{clufter_name}.__main__ --completion-bash 2>/dev/null \ - | sed 's|%(basename "%{__python}") [-_]m ||g' > "%{clufter_bashcomp}" || : + %{__python2} -m %{clufter_name}.__main__ --completion-bash 2>/dev/null \ + | sed 's|%(basename "%{__python2}") [-_]m ||g' > "%{clufter_bashcomp}" || : fi %else %{clufter_script} --completion-bash > "%{clufter_bashcomp}" 2>/dev/null || : |