Author: kiesiu Date: Sun Dec 4 12:16:24 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 2.0.1
---- Files affected: packages/mercurial: mercurial.spec (1.60 -> 1.61) , mercurial-doc.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/mercurial/mercurial.spec diff -u packages/mercurial/mercurial.spec:1.60 packages/mercurial/mercurial.spec:1.61 --- packages/mercurial/mercurial.spec:1.60 Thu Oct 13 21:01:05 2011 +++ packages/mercurial/mercurial.spec Sun Dec 4 13:16:18 2011 @@ -16,22 +16,21 @@ Summary: Mercurial Distributed SCM Summary(pl.UTF-8): Mercurial - rozproszony SCM Name: mercurial -Version: 1.9.3 +Version: 2.0.1 Release: 1 License: GPL v2 Group: Development/Version Control Source0: http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz -# Source0-md5: f309b084aaf58773e9f4f4d66c49622a +# Source0-md5: 16576b3089a88a84a35edc30e17a03a9 Source1: gtools.py Source2: %{name}-%{webapp}.config # TODO: provide default config Source3: %{name}-%{webapp}-httpd.config -Patch0: %{name}-gtools.patch -Patch1: %{name}-doc.patch +Patch0: %{name}-doc.patch URL: http://mercurial.selenic.com/ BuildRequires: asciidoc BuildRequires: gettext-devel -BuildRequires: python >= 1:2.3 +BuildRequires: python >= 1:2.4 BuildRequires: python-devel BuildRequires: python-docutils BuildRequires: rpm-pythonprov @@ -74,12 +73,12 @@ - licencja GPL %package hgweb -Summary: Scripts for serving mercurial repositories over HTTP -Summary(pl.UTF-8): Skrypty do serwowania repozytoriów mercuriala przez HTTP -Group: Development/Version Control -Requires: %{name} = %{version}-%{release} +Summary: Scripts for serving mercurial repositories over HTTP +Summary(pl.UTF-8): Skrypty do serwowania repozytoriów mercuriala przez HTTP +Group: Development/Version Control +Requires: %{name} = %{version}-%{release} Requires: apache-mod_wsgi >= 1.1 -Requires: webapps +Requires: webapps %description hgweb CGI scripts for serving mercurial repositories @@ -112,16 +111,13 @@ %prep %setup -q -#%patch0 -p1 -%patch1 -p1 +%patch0 -p1 install %{SOURCE1} hgext/gtools.py %build %{__python} setup.py build %{__make} -C doc -#rm tests/test-hgweb - %{?with_tests:cd tests && %{__python} run-tests.py --verbose} %install @@ -215,6 +211,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.61 2011/12/04 12:16:18 kiesiu +- updated to 2.0.1 + Revision 1.60 2011/10/13 19:01:05 zawadaa - up to 1.9.3 - long waiting patches ;-) - build mercurial-hgweb - for hg servers ================================================================ Index: packages/mercurial/mercurial-doc.patch diff -u packages/mercurial/mercurial-doc.patch:1.1 packages/mercurial/mercurial-doc.patch:1.2 --- packages/mercurial/mercurial-doc.patch:1.1 Fri Dec 3 20:04:32 2010 +++ packages/mercurial/mercurial-doc.patch Sun Dec 4 13:16:18 2011 @@ -1,9 +1,10 @@ ---- mercurial-1.7.2/mercurial/demandimport.py~ 2010-12-02 01:46:11.000000000 +0100 -+++ mercurial-1.7.2/mercurial/demandimport.py 2010-12-03 19:56:17.506154254 +0100 -@@ -134,6 +134,7 @@ - # raise ImportError if x not defined - '__main__', +diff -uNr mercurial-2.0.1/mercurial/demandimport.py mercurial-2.0.1.new/mercurial/demandimport.py +--- mercurial-2.0.1/mercurial/demandimport.py 2011-12-01 22:55:32.000000000 +0100 ++++ mercurial-2.0.1.new/mercurial/demandimport.py 2011-12-04 12:34:49.562109291 +0100 +@@ -144,6 +144,7 @@ '_ssl', # conditional imports in the stdlib, issue1964 + 'rfc822', + 'mimetools', + 'gobject._gobject', ] ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mercurial/mercurial.spec?r1=1.60&r2=1.61&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mercurial/mercurial-doc.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
