From 7f26011c3fdd4e5f4bd8a424bbe99d8f8471ca228d1cf5875c99773a485d78df Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 15 Nov 2013 12:17:49 +0000 Subject: [PATCH 1/2] - Only ghost /etc/alternatives on 12.3 or newer OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=47 --- python-Sphinx.changes | 5 +++++ python-Sphinx.spec | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/python-Sphinx.changes b/python-Sphinx.changes index ca88460..33451c2 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 15 12:17:12 UTC 2013 - speilicke@suse.com + +- Only ghost /etc/alternatives on 12.3 or newer + ------------------------------------------------------------------- Wed Nov 13 14:54:09 UTC 2013 - speilicke@suse.com diff --git a/python-Sphinx.spec b/python-Sphinx.spec index bfb6e74..6d0da85 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -139,31 +139,33 @@ fi %defattr(-,root,root,-) %doc AUTHORS CHANGES LICENSE README.rst %ghost %{_bindir}/sphinx-apidoc -%ghost %{_sysconfdir}/alternatives/sphinx-apidoc %{_bindir}/sphinx-apidoc-%{py_ver} %ghost %{_bindir}/sphinx-autogen -%ghost %{_sysconfdir}/alternatives/sphinx-autogen %{_bindir}/sphinx-autogen-%{py_ver} %ghost %{_bindir}/sphinx-build -%ghost %{_sysconfdir}/alternatives/sphinx-build %{_bindir}/sphinx-build-%{py_ver} %ghost %{_bindir}/sphinx-quickstart -%ghost %{_sysconfdir}/alternatives/sphinx-quickstart %{_bindir}/sphinx-quickstart-%{py_ver} %ghost %{_mandir}/man1/sphinx-all.1.gz -%ghost %{_sysconfdir}/alternatives/sphinx-all.1.gz %{_mandir}/man1/sphinx-all-%{py_ver}.1.gz %ghost %{_mandir}/man1/sphinx-apidoc.1.gz -%ghost %{_sysconfdir}/alternatives/sphinx-apidoc.1.gz %{_mandir}/man1/sphinx-apidoc-%{py_ver}.1.gz %ghost %{_mandir}/man1/sphinx-build.1.gz -%ghost %{_sysconfdir}/alternatives/sphinx-build.1.gz %{_mandir}/man1/sphinx-build-%{py_ver}.1.gz %ghost %{_mandir}/man1/sphinx-quickstart.1.gz -%ghost %{_sysconfdir}/alternatives/sphinx-quickstart.1.gz %{_mandir}/man1/sphinx-quickstart-%{py_ver}.1.gz %{python_sitelib}/sphinx/ %{python_sitelib}/Sphinx-%{version}-py%{py_ver}.egg-info +%if 0%{?suse_version} >= 1230 +%ghost %{_sysconfdir}/alternatives/sphinx-apidoc +%ghost %{_sysconfdir}/alternatives/sphinx-autogen +%ghost %{_sysconfdir}/alternatives/sphinx-build +%ghost %{_sysconfdir}/alternatives/sphinx-quickstart +%ghost %{_sysconfdir}/alternatives/sphinx-all.1.gz +%ghost %{_sysconfdir}/alternatives/sphinx-apidoc.1.gz +%ghost %{_sysconfdir}/alternatives/sphinx-build.1.gz +%ghost %{_sysconfdir}/alternatives/sphinx-quickstart.1.gz +%endif %files doc %defattr(-,root,root,-) From e58853863a6398959546a2a490fd258d0fccd80ee39d24381e515c27907870fc Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 18 Nov 2013 09:06:15 +0000 Subject: [PATCH 2/2] - Fix %preun update-alternatives, used wrong master OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=48 --- python-Sphinx.changes | 5 +++++ python-Sphinx.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-Sphinx.changes b/python-Sphinx.changes index 33451c2..f59fd39 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 18 09:05:53 UTC 2013 - speilicke@suse.com + +- Fix %preun update-alternatives, used wrong master + ------------------------------------------------------------------- Fri Nov 15 12:17:12 UTC 2013 - speilicke@suse.com diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 6d0da85..29cf968 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -132,7 +132,7 @@ update-alternatives \ %preun if [ $1 -eq 0 ] ; then - update-alternatives --remove sphinx-build %{_bindir}/sphinx-apidoc-%{py_ver} + update-alternatives --remove sphinx-apidoc %{_bindir}/sphinx-apidoc-%{py_ver} fi %files -f sphinx.lang