Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at 2013-10-24 14:41:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mercurial (Old) and /work/SRC/openSUSE:Factory/.mercurial.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mercurial" Changes: -------- --- /work/SRC/openSUSE:Factory/mercurial/mercurial.changes 2013-10-11 08:59:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mercurial.new/mercurial.changes 2013-10-24 14:41:07.000000000 +0200 @@ -1,0 +2,16 @@ +Thu Oct 24 09:22:29 UTC 2013 - [email protected] + +- Drop dependency on python-roman, python-docutils' module docutils.utils.roman + should be sufficient +- Drop checks for obsolete distributions +- Drop dependency on rcs, it doesn't seem to be used anywhere and was + added in 2006 +- Depend on openssl-certs if %sles_version is defined (for our IBS friends) +- Require python-docutils instead of the obsolete docutils + +------------------------------------------------------------------- +Wed Oct 23 11:40:57 CEST 2013 - [email protected] + +- Refresh mercurial-docutils-compat.diff to fix build in sles11sp3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.AanqRR/_old 2013-10-24 14:41:08.000000000 +0200 +++ /var/tmp/diff_new_pack.AanqRR/_new 2013-10-24 14:41:08.000000000 +0200 @@ -35,32 +35,22 @@ Patch3: mercurial-locale-path-fix.patch # PATCH-FIX-OPENSUSE mercurial-2.6.3-ssl.diff [email protected] -- fallback to system default ca path Patch4: mercurial-2.6.3-ssl.diff -# require rcs for 3-way "merge" command. -Requires: rcs BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: fdupes BuildRequires: python-devel -%if 0%{?fedora_version} || 0%{?suse_version} || 0%{?rhel_version} -BuildRequires: docutils -%else BuildRequires: python-docutils -%endif -%if 0%{?suse_version} BuildRequires: python-xml Requires: python-xml -%if 0%{?suse_version} > 1020 -BuildRequires: fdupes -%endif -%if 0%{?suse_version} > 1210 -BuildRequires: python-roman -%endif -%if 0%{?suse_version} >= 1130 +%if 0%{?sles_version} +Requires: openssl-certs +%else Requires: ca-certificates %endif -%py_requires Recommends: %{name}-lang -%endif Provides: hg = %{version} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%endif %if 0%{?with_tests} Source90: tests.blacklist @@ -79,9 +69,7 @@ Mercurial is a fast, lightweight source control management system designed for efficient handling of very large distributed projects. -%if 0%{?suse_version} > 1100 %lang_package -%endif %prep %setup -q @@ -116,34 +104,20 @@ install -m0644 contrib/*.el %{buildroot}%{_datadir}/emacs/site-lisp install -m0644 contrib/*.el %{buildroot}%{_datadir}/xemacs/site-lisp install -Dm0644 contrib/mergetools.hgrc %{buildroot}%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc -%if 0%{?suse_version} >= 1130 -%if 0%{?suse_version} <= 1230 +%if 0%{?suse_version} >= 1130 && 0%{?suse_version} <= 1230 install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/mercurial/hgrc.d/cacerts.rc %endif -%endif - -%if 0%{?suse_version} > 1020 %fdupes -s %{buildroot}%{_prefix} -%endif %if 0%{?with_tests} - %check make tests TESTFLAGS="-v --blacklist=%{SOURCE90}" %endif -%clean -rm -rf %{buildroot} - -%if 0%{?suse_version} > 1100 %files lang -f hg.lang + %files %defattr(-, root, root) -%else -%files -f hg.lang -%defattr(-, root, root) -%endif - %doc README CONTRIBUTORS COPYING hgweb.cgi contrib/sample.hgrc %{_bindir}/* %{_sysconfdir}/bash_completion.d/* ++++++ mercurial-2.7.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-2.7.2/doc/hgmanpage.py new/mercurial-2.7.2/doc/hgmanpage.py --- old/mercurial-2.7.2/doc/hgmanpage.py 2013-10-02 01:55:12.000000000 +0200 +++ new/mercurial-2.7.2/doc/hgmanpage.py 2013-10-24 11:21:43.000000000 +0200 @@ -51,6 +51,7 @@ import roman except ImportError: from docutils.utils import roman + import inspect FIELD_LIST_INDENT = 7 ++++++ mercurial-docutils-compat.diff ++++++ --- /var/tmp/diff_new_pack.AanqRR/_old 2013-10-24 14:41:09.000000000 +0200 +++ /var/tmp/diff_new_pack.AanqRR/_new 2013-10-24 14:41:09.000000000 +0200 @@ -2,10 +2,10 @@ +++ doc/Makefile 2011-03-09 13:06:03.000000000 +0100 @@ -27,7 +27,7 @@ - %: %.txt common.txt + %: %.txt %.gendoc.txt common.txt $(PYTHON) runrst hgmanpage $(RSTARGS) --halt warning \ - --strip-elements-with-class htmlonly $*.txt $* + $*.txt $* - %.html: %.txt common.txt + %.html: %.txt %.gendoc.txt common.txt $(PYTHON) runrst html $(RSTARGS) --halt warning \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
