From d8bcb50af709d57ffa7bff4f29d1120733ed85f83ab40b6911bd88249a865337 Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 27 Jul 2015 15:45:09 +0000 Subject: [PATCH] Accepting request 318990 from home:TheBlackCat:branches:devel:languages:python Fix update-alternatives usage. OBS-URL: https://build.opensuse.org/request/show/318990 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=35 --- python-pbr.changes | 5 +++++ python-pbr.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/python-pbr.changes b/python-pbr.changes index 7f9b180..35a28ff 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 27 15:37:32 UTC 2015 - toddrme2178@gmail.com + +- Fix update-alternatives usage. + ------------------------------------------------------------------- Fri Jul 17 11:54:48 UTC 2015 - tbechtold@suse.com diff --git a/python-pbr.spec b/python-pbr.spec index 67db0fe..5b09dd6 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -91,8 +91,9 @@ python setup.py build_sphinx && rm doc/build/html/.buildinfo python setup.py install --prefix=%{_prefix} --root=%{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/alternatives mv %{buildroot}%{_bindir}/pbr %{buildroot}%{_bindir}/pbr-%{py_ver} -ln -s %{_bindir}/pbr-%{py_ver} %{buildroot}%{_bindir}/pbr -ln -s %{_bindir}/pbr-%{py_ver} %{buildroot}%{_sysconfdir}/alternatives/pbr +ln -s -f %{_sysconfdir}/alternatives/pbr %{buildroot}%{_bindir}/pbr +# create a dummy target for /etc/alternatives/pbr +touch %{buildroot}%{_sysconfdir}/alternatives/pbr %fdupes -s %{buildroot}%{python_sitelib} %if %{with test} @@ -115,7 +116,7 @@ fi %{python_sitelib}/pbr %{python_sitelib}/pbr-%{version}-py%{py_ver}.egg-info %{_bindir}/pbr-%{py_ver} -%ghost %{_bindir}/pbr +%{_bindir}/pbr %ghost %{_sysconfdir}/alternatives/pbr %files doc