Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at 2014-12-16 14:49:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-10-05 20:33:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mercurial.new/mercurial.changes 2014-12-16 14:49:50.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Dec 15 21:57:45 UTC 2014 - devel...@develop7.info + +- update to v3.2.2 + * see changelog at http://mercurial.selenic.com/wiki/WhatsNew#Mercurial_3.2.2_.282014-12-01.29 + +------------------------------------------------------------------- +Sat Nov 15 14:35:07 UTC 2014 - devel...@develop7.info + +- update to 3.2.1 + * see changelog for v3.2.1 at http://mercurial.selenic.com/wiki/WhatsNew#Mercurial_3.2.1_.282014-11-11.29 +- refreshed mercurial-locale-path-fix.patch +- dropped obsolete mercurial-2.8-ssl.diff +- dropped outdated contrib stuff from spec + +------------------------------------------------------------------- Old: ---- mercurial-2.8-ssl.diff mercurial-3.1.2.tar.gz New: ---- mercurial-3.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.hYi0Ji/_old 2014-12-16 14:49:51.000000000 +0100 +++ /var/tmp/diff_new_pack.hYi0Ji/_new 2014-12-16 14:49:51.000000000 +0100 @@ -17,7 +17,7 @@ Name: mercurial -Version: 3.1.2 +Version: 3.2.2 Release: 0 Summary: Scalable Distributed SCM License: GPL-2.0+ @@ -31,8 +31,6 @@ Patch1: mercurial-docutils-compat.diff # PATCH-FIX-OPENSUSE mercurial-locale-path-fix.patch sasc...@suse.de -- locales are found in /usr/share/locale Patch2: mercurial-locale-path-fix.patch -# PATCH-FIX-OPENSUSE mercurial-2.6.3-ssl.diff lnus...@suse.de -- fallback to system default ca path -Patch3: mercurial-2.8-ssl.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: python-devel @@ -80,9 +78,6 @@ %patch1 -p0 %endif %patch2 -p1 -%if 0%{?suse_version} > 1230 -%patch3 -p1 -%endif chmod 644 hgweb.cgi %build @@ -98,7 +93,6 @@ # Install stuff in contrib install -m0755 contrib/hgk %{buildroot}%{_bindir} -install -m0755 contrib/convert-repo %{buildroot}%{_bindir} install -Dm0644 contrib/bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/mercurial.sh install -Dm0644 contrib/zsh_completion %{buildroot}%{_datadir}/zsh/site-functions/_mercurial mkdir -p %{buildroot}%{_datadir}/{x,}emacs/site-lisp @@ -119,7 +113,7 @@ %files %defattr(-, root, root) -%doc README CONTRIBUTORS COPYING hgweb.cgi contrib/sample.hgrc +%doc README CONTRIBUTORS COPYING hgweb.cgi %{_bindir}/* %{_sysconfdir}/bash_completion.d/* %{_datadir}/zsh/ ++++++ mercurial-3.1.2.tar.gz -> mercurial-3.2.2.tar.gz ++++++ ++++ 48352 lines of diff (skipped) ++++++ mercurial-hgk-path-fix.diff ++++++ --- /var/tmp/diff_new_pack.hYi0Ji/_old 2014-12-16 14:49:52.000000000 +0100 +++ /var/tmp/diff_new_pack.hYi0Ji/_new 2014-12-16 14:49:52.000000000 +0100 @@ -1,6 +1,8 @@ ---- contrib/hgk 2007-09-01 18:42:08.000000000 +0200 -+++ contrib/hgk 2007-09-05 17:07:23.000000000 +0200 -@@ -3637,6 +3637,10 @@ +Index: contrib/hgk +=================================================================== +--- contrib/hgk.orig ++++ contrib/hgk +@@ -4052,6 +4052,10 @@ proc getconfig {} { } # defaults... ++++++ mercurial-locale-path-fix.patch ++++++ --- /var/tmp/diff_new_pack.hYi0Ji/_old 2014-12-16 14:49:52.000000000 +0100 +++ /var/tmp/diff_new_pack.hYi0Ji/_new 2014-12-16 14:49:52.000000000 +0100 @@ -1,12 +1,13 @@ -diff -u a/mercurial/i18n.py b/mercurial/i18n.py ---- a/mercurial/i18n.py 2011-07-01 20:54:23.000000000 +0200 -+++ b/mercurial/i18n.py 2011-07-11 15:23:29.920882539 +0200 -@@ -16,7 +16,7 @@ +Index: mercurial-3.2.1/mercurial/i18n.py +=================================================================== +--- mercurial-3.2.1.orig/mercurial/i18n.py ++++ mercurial-3.2.1/mercurial/i18n.py +@@ -36,7 +36,7 @@ if (os.name == 'nt' + _ugettext = None - base = os.path.dirname(module) - for dir in ('.', '..'): -- localedir = os.path.join(base, dir, 'locale') + def setdatapath(datapath): +- localedir = os.path.join(datapath, 'locale') + localedir = '/usr/share/locale' - if os.path.isdir(localedir): - break - + t = gettextmod.translation('hg', localedir, _languages, fallback=True) + global _ugettext + _ugettext = t.ugettext -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
