From df305ad8ee5b5e389ccf1739fa3f1c6ba10c99b3 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Nov 11 2011 16:00:45 +0000 Subject: When changing a macro, there is more than one place to change --- diff --git a/python-straight-plugin.spec b/python-straight-plugin.spec index e5b360e..3fcba6f 100644 --- a/python-straight-plugin.spec +++ b/python-straight-plugin.spec @@ -19,7 +19,7 @@ URL: https://github.com/ironfroggy/straight.plugin/ # Upstream doesn't publish release tarballs yet, so we make one: # $ git clone git://github.com/ironfroggy/straight.plugin.git && cd straight.plugin # $ git archive --format=tar --prefix=straight.plugin-1.1.1/ 57ef11c | xz -z > straight.plugin-1.1.1-20111110.git57ef11c.tar.xz -Source0: ironfroggy-straight.plugin-%{githash}.tar.gz +Source0: ironfroggy-straight.plugin-%{snaphash}.tar.gz BuildArch: noarch BuildRequires: python2-devel @@ -59,55 +59,55 @@ the plugins in it for some particular purpose or intent. %endif %prep -%setup -q -c -n ironfroggy-straight.plugin-%{githash} +%setup -q -c -n ironfroggy-straight.plugin-%{snaphash} %if 0%{?with_python3} -cp -r ironfroggy-straight.plugin-%{githash} py3-ironfroggy-straight.plugin-%{githash} -2to3 --write --nobackups py3-ironfroggy-straight.plugin-%{githash} +cp -r ironfroggy-straight.plugin-%{snaphash} py3-ironfroggy-straight.plugin-%{snaphash} +2to3 --write --nobackups py3-ironfroggy-straight.plugin-%{snaphash} %endif %build -pushd ironfroggy-straight.plugin-%{githash} +pushd ironfroggy-straight.plugin-%{snaphash} %{__python} setup.py build popd %if 0%{?with_python3} -pushd py3-ironfroggy-straight.plugin-%{githash} +pushd py3-ironfroggy-straight.plugin-%{snaphash} %{__python3} setup.py build popd %endif %install rm -rf $RPM_BUILD_ROOT -pushd ironfroggy-straight.plugin-%{githash} +pushd ironfroggy-straight.plugin-%{snaphash} %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT popd %if 0%{?with_python3} -pushd py3-ironfroggy-straight.plugin-%{githash} +pushd py3-ironfroggy-straight.plugin-%{snaphash} %{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT popd %endif %check -pushd ironfroggy-straight.plugin-%{githash} +pushd ironfroggy-straight.plugin-%{snaphash} %{__python} tests.py popd %if 0%{?with_python3} -pushd py3-ironfroggy-straight.plugin-%{githash} +pushd py3-ironfroggy-straight.plugin-%{snaphash} %{__python3} tests.py popd %endif %files -%doc ironfroggy-straight.plugin-%{githash}/LICENSE ironfroggy-straight.plugin-%{githash}/README +%doc ironfroggy-straight.plugin-%{snaphash}/LICENSE ironfroggy-straight.plugin-%{snaphash}/README # For noarch packages: sitelib %{python_sitelib}/* %if 0%{?with_python3} %files -n python3-straight-plugin -%doc py3-ironfroggy-straight.plugin-%{githash}/LICENSE py3-ironfroggy-straight.plugin-%{githash}/README +%doc py3-ironfroggy-straight.plugin-%{snaphash}/LICENSE py3-ironfroggy-straight.plugin-%{snaphash}/README # For noarch packages: sitelib %{python3_sitelib}/* %endif