commit mercurial for openSUSE:Factory
Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at Mon Sep 27 17:38:25 CEST 2010. -------- --- mercurial/mercurial.changes 2010-07-19 07:55:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/mercurial/mercurial.changes 2010-09-06 10:25:29.000000000 +0200 @@ -1,0 +2,81 @@ +Mon Sep 6 07:03:47 UTC 2010 - wr@rosenauer.org + +- update to 1.6.3: + * alias: make shadowing behavior more consistent (issue2054) + * bisect: better message for unrelated starting revisions + * bookmarks: Check if the bookmark to delete exists on the remote + * bookmarks: guard against listing bookmarks on unsupported repos + * chunkbuffer: use += rather than cStringIO to reduce memory footprint + * convert: Using --dest-type svn crashed, if the source repo used tags + * convert: properly set encoding for gnuarch converter + * convert: use encoding.encoding instead of locale.getpreferredencoding() + * graphlog: mark --branch as incompatible with --graph + * http basic auth: reset redirect counter on new requests (issue2255) + * httprepo: decompress stream incrementally to reduce memory usage + * log: fix the bug 'hg log --stat -p == hg log --stat' + * merge: drop reference to file contents after write + * merge: move reverse-merge logic out of filemerge (issue2342) + * merge: fix detection of conflict markers with checkconflicts enabled + * mq: don't inherit default and default-push paths with --mq (issue2333) + * resolve: updated help documentation for improved clarity + * revlog: drop cache after use to save memory footprint + * templatefilters: unnest uescape() + * templates: add filenolink to raw style (issue2332) + * url: expand vars in all [auth] settings (issue2328) + * url: limit expansion to safe auth keys (Issue2328) + * util: avoid using hashlib on Python < 2.5 (issue2278) + * verify: initialize rp variable in case we hit out of memory + * verify: reduce memory footprint when unpacking files + * verify: report exceptions that don't have a str() method +- in case of !with_doc copy the man pages from the source tarball + +------------------------------------------------------------------- +Wed Aug 4 09:09:51 UTC 2010 - pascal.bleser@opensuse.org + +- split out localization of messages into its own -lang subpackage, which reduces the size of the mercurial package by around 400kb +- the locale files are moved into the arch-independent %{python_sitelib} instead of %{python_sitearch} in order to have a noarch -lang subpackage +- use --record-rpm for the list of files + +- update to 1.6.2: + * fixes a regression in the color extension + +- changes from 1.6.1: + * alias: ensure checksignature() is applied directly to the command (issue2286) + * bash/zsh completion: use HGPLAIN when invoking hg (issue2297) + * bookmarks: don't allow name to contain whitespaces only + * bookmarks: ensure current bookmark is updated when specified with -r . + * bundle: lookup revisions after addbranchrevs + * color/progress: subclass ui instead of using wrapfunction (issue2096) + * commit: only warn when reopening the workdir's branch + * dispatch: give better error message when cwd doesn't exist (issue2293) + * doc: make sure we use our own code for generating man pages + * filelog: cmp: don't read data if hashes are identical (issue2273) + * filelog: test behaviour for data starting with "\1\n" + * hg.clone: fix branch value when passing a repo object (issue2267) + * hgweb.wsgi: add a URL to the corresponding wiki documentation + * hgwebdir: allow pure relative globs in paths + * hgwebdir: use template paths configured in the hgrc (issue2281) + * init: create target directory recursively + * inotify: check all components of filenames against hgignore (issue884) + * keyword: move collecting of [keyword] patterns to reposetup (issue2303) + * log: fix missing diff output for hg log -p in subdirectory + * log: follow filenames through renames (issue647) + * mail: ensure that Python2.4 to 2.7 use the same header format + * mq: clarify the fact that qimport is trying to read a file + * mq: cleanup status if applied mq is stripped (issue1881) + * mq: fixed ENOENT when qrename to new/directory.patch + * mq: reset self.added after the mq transaction instead of inside qimport + * qpush --move: move the right patch even with comment lines + * rebase: re-add patches to mq repo after rebase + * revert: rename original to .orig instead of copying (issue2282) + * revset: fix ancestor subset handling (issue2298) + * runrst: try to be more helpful if docutils is not installed + * tag: do not allow tag names to consist solely of whitespace (issue2307) + * transplant: crash if repo.commit() finds nothing to commit + +------------------------------------------------------------------- +Thu Jul 29 23:00:35 CEST 2010 - wr@rosenauer.org + +- install bash_completion file + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mercurial-1.6.tar.bz2 New: ---- mercurial-1.6.3.tar.bz2 rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.T4V3gw/_old 2010-09-27 17:38:12.000000000 +0200 +++ /var/tmp/diff_new_pack.T4V3gw/_new 2010-09-27 17:38:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mercurial (Version 1.6) +# spec file for package mercurial (Version 1.6.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,24 +17,42 @@ # norootforbuild +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} + +%if 0%{?suse_version} >= 1100 +%define with_doc 1 +%endif +%if 0%{?suse_version} >= 1110 +%define with_lang 1 +%endif Name: mercurial -BuildRequires: asciidoc gcc python-devel sgml-skel xmlto -%if %suse_version > 1020 +BuildRequires: gcc python-devel +%if 0%{?with_doc} +BuildRequires: asciidoc sgml-skel xmlto +%endif +BuildRequires: perl +%if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif Summary: Scalable Distributed SCM -Version: 1.6 +Version: 1.6.3 Release: 1 License: GPLv2+ Group: Development/Tools/Version Control BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.selenic.com/mercurial/ +# http://mercurial.selenic.com/release/mercurial-%{version}.tar.gz Source: %{name}-%{version}.tar.bz2 +Source99: rpmlintrc Patch: mercurial-hgk-path-fix.diff Patch1: mercurial-sle10-inotify-fixes.diff # require rcs for 3-way "merge" command. Requires: rcs +%if 0%{?with_lang} +Recommends: %{name}-lang +%endif %py_requires %description @@ -42,6 +60,7 @@ designed for efficient handling of very large distributed projects. +%lang_package %prep %setup -q # %setup -n %{name}-%{version}-mq @@ -52,44 +71,92 @@ %patch1 -p1 %build -make all PREFIX=/usr +%__make \ + build \ +%if 0%{?with_doc} + doc \ +%endif + PREFIX="{_prefix}" %install -python setup.py install --prefix=%{_prefix} --root="$RPM_BUILD_ROOT" -make -C doc DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr install +%__python setup.py install --prefix=%{_prefix} --root="$RPM_BUILD_ROOT" \ + --record-rpm=files.lst + +%if 0%{?with_doc} +%__make -C doc DESTDIR="%{buildroot}" PREFIX="%{_prefix}" install +%else +pushd doc +for f in hg.1 hgrc.5 hgignore.5 ; do + %__gzip $f && f=$f.gz + ff="${f##*/}" + n="${ff%.gz}" + n="${n##*.}" + %__install -D -m0644 "$f" "%{buildroot}%{_mandir}/man$n/$ff" +done +popd +%endif # install programs in contrib install -c -m 0755 contrib/hgk $RPM_BUILD_ROOT%{_bindir} install -c -m 0755 contrib/convert-repo $RPM_BUILD_ROOT%{_bindir} install -c -m 0755 contrib/shrink-revlog.py $RPM_BUILD_ROOT%{_bindir} -python%{py_ver} %{py_libdir}/compileall.py -d %{py_site}/ \ - $RPM_BUILD_ROOT/%{py_sitedir} -# FIXME: the file seems buggy on mercurial-0.7 -# mkdir -p $RPM_BUILD_ROOT/etc/bash_completion.d -# install -c -m 0644 contrib/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/mercurial.sh + +%__python -c 'import compileall; compileall.compile_dir("%{buildroot}%{python_sitearch}/",ddir="%{python_sitearch}/",force=True)' + +mkdir -p $RPM_BUILD_ROOT/etc/bash_completion.d +install -c -m 0644 contrib/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/mercurial.sh mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp mkdir -p $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp mkdir -p $RPM_BUILD_ROOT/etc/mercurial/hgrc.d -%if %suse_version > 1020 -%fdupes -s $RPM_BUILD_ROOT +%if 0%{?suse_version} > 1020 +%fdupes -s "%{buildroot}%{_datadir}" +%endif + +if [ "%{python_sitelib}" != "%{python_sitearch}" ]; then + %__install -d "%{buildroot}%{python_sitelib}/mercurial" + %__mv "%{buildroot}%{python_sitearch}/mercurial/locale" \ + "%{buildroot}%{python_sitelib}/mercurial/locale" +fi + +%__perl -n -i -e 'print unless m,/mercurial/locale(/?|/.+)$,' files.lst +LANGFILES="$PWD/%{name}.lang" +>"$LANGFILES" +pushd "%{buildroot}%{python_sitelib}/mercurial/locale" +/bin/ls -1 | while read lang; do + echo "%lang($lang) %{python_sitelib}/mercurial/locale/$lang" >>"$LANGFILES" +done +popd #%python_sitelib/mercurial/locale + +%if ! 0%{?with_lang} +%__mv files.lst files.lst.orig +cat files.lst.orig "%{name}.lang" > files.lst +%__rm files.lst.orig %endif %clean -rm -rf $RPM_BUILD_ROOT +%{?buildroot:%__rm -rf "%{buildroot}"} -%files +%files -f files.lst %defattr(-, root, root) %doc README CONTRIBUTORS COPYING hgweb.cgi -%{_mandir}/man?/* %doc contrib/sample.hgrc %{_bindir}/* -%{py_sitedir}/* -# FIXME: buggy file -# /etc/bash_completion.d/* +#%{python_sitelib} +/etc/bash_completion.d/* %dir /etc/mercurial %dir /etc/mercurial/hgrc.d %{_datadir}/emacs %{_datadir}/xemacs +%{_mandir}/man1/hg.1%{ext_man} +%{_mandir}/man5/hgignore.5%{ext_man} +%{_mandir}/man5/hgrc.5%{ext_man} +%if 0%{?with_lang} + +%files lang -f %{name}.lang +%defattr(-, root, root) +%endif +%dir %{python_sitelib}/mercurial +%dir %{python_sitelib}/mercurial/locale %changelog ++++++ mercurial-1.6.tar.bz2 -> mercurial-1.6.3.tar.bz2 ++++++ ++++ 13093 lines of diff (skipped) ++++++ rpmlintrc ++++++ addFilter("python-naming-policy-not-applied") addFilter("non-conffile-in-etc /etc/bash_completion.d/mercurial.sh") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de