Hello community,

here is the log from the commit of package python-Markdown for openSUSE:Factory 
checked in at 2014-07-12 17:14:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Markdown (Old)
 and      /work/SRC/openSUSE:Factory/.python-Markdown.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-Markdown"

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Markdown/python-Markdown.changes  
2014-06-04 18:39:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-Markdown.new/python-Markdown.changes     
2014-07-12 17:14:51.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jul  9 18:12:04 UTC 2014 - i...@marguerite.su
+
+- fix conflicts with python3-Markdown
+  * both use update-alternatives
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-Markdown.spec ++++++
--- /var/tmp/diff_new_pack.CAD513/_old  2014-07-12 17:14:52.000000000 +0200
+++ /var/tmp/diff_new_pack.CAD513/_new  2014-07-12 17:14:52.000000000 +0200
@@ -28,6 +28,8 @@
 BuildRequires:  python-nose
 BuildRequires:  python-xml
 Requires:       python-xml
+Requires(post):        update-alternatives
+Requires(postun):      update-alternatives
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       python-markdown = %{version}
 Obsoletes:      python-markdown < %{version}
@@ -55,15 +57,33 @@
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
+# update-alternatives
+mv %{buildroot}%{_bindir}/markdown_py 
%{buildroot}%{_bindir}/markdown_py-%{py_ver}
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+touch %{buildroot}%{_sysconfdir}/alternatives/markdown_py
+ln -sf %{_sysconfdir}/alternatives/markdown_py 
%{buildroot}%{_bindir}/markdown_py
+
 %if 0%{?suse_version} && 0%{?suse_version} > 1110
 %check
 python run-tests.py
 %endif
 
+%post
+update-alternatives \
+       --install %{_bindir}/markdown_py markdown_py 
%{_bindir}/markdown_py-%{py_ver} 20
+
+%postun
+if [ $1 -eq 0 ] ; then
+       update-alternatives --remove markdown_py 
%{_bindir}/markdown_py-%{py_ver}
+fi
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.md README.md docs/*
+%ghost %{_sysconfdir}/alternatives/markdown_py
 %{_bindir}/markdown_py
-%{python_sitelib}/*
+%{_bindir}/markdown_py-%{py_ver}
+%{python_sitelib}/Markdown-%{version}-py%{py_ver}.egg-info
+%{python_sitelib}/markdown
 
 %changelog

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to