commit mercurial for openSUSE:Factory
Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at Wed Feb 2 02:06:56 CET 2011. -------- --- mercurial/mercurial.changes 2011-01-09 09:43:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/mercurial/mercurial.changes 2011-01-19 10:09:42.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 14 22:10:17 UTC 2011 - ammler@openttdcoop.org + +- Add ca-bundle.pem to the global config + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- cacerts.rc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.YlPlQ6/_old 2011-02-02 02:05:24.000000000 +0100 +++ /var/tmp/diff_new_pack.YlPlQ6/_new 2011-02-02 02:05:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mercurial (Version 1.7.3) +# spec file for package mercurial # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -38,13 +38,14 @@ %endif Summary: Scalable Distributed SCM Version: 1.7.3 -Release: 1 +Release: 2 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 +Source1: cacerts.rc Source99: rpmlintrc Patch: mercurial-hgk-path-fix.diff Patch1: mercurial-sle10-inotify-fixes.diff @@ -53,6 +54,9 @@ Requires: python-xml # require rcs for 3-way "merge" command. Requires: rcs +%if 0%{?suse_version} >= 1130 +Requires: ca-certificates +%endif %if 0%{?with_lang} Recommends: %{name}-lang %endif @@ -121,6 +125,10 @@ install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp mkdir -p $RPM_BUILD_ROOT/etc/mercurial/hgrc.d install -c -m 0644 contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc +%if 0%{?suse_version} >= 1130 +install -c -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/cacerts.rc +%endif + %if 0%{?suse_version} > 1020 %fdupes -s "%{buildroot}%{_datadir}" %fdupes -s "%{buildroot}%{_libdir}" @@ -156,12 +164,11 @@ %doc README CONTRIBUTORS COPYING hgweb.cgi %doc contrib/sample.hgrc %{_bindir}/* -#%{python_sitelib} /etc/bash_completion.d/* %{_datadir}/zsh/ %dir /etc/mercurial %dir /etc/mercurial/hgrc.d -%config /etc/mercurial/hgrc.d/mergetools.rc +%config /etc/mercurial/hgrc.d/* %{_datadir}/emacs %{_datadir}/xemacs %{_mandir}/man1/hg.1%{ext_man} ++++++ cacerts.rc ++++++ [web] cacerts = /etc/ssl/ca-bundle.pem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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