commit f4d2f4f060670f48adb9f14b2bc6a4dbc38a43c7
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Tue Oct 27 10:45:29 2015 +0100
- up to 3.5.2
mercurial-doc.patch | 15 ++++++++-------
mercurial.spec | 5 +++--
2 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/mercurial.spec b/mercurial.spec
index 7209a05..c77533b 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -14,12 +14,12 @@
Summary: Mercurial Distributed SCM
Summary(pl.UTF-8): Mercurial - rozproszony SCM
Name: mercurial
-Version: 2.8.1
+Version: 3.5.2
Release: 1
License: GPL v2
Group: Development/Version Control
Source0: http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz
-# Source0-md5: bede5869f9b5d09ab3269bac472495e7
+# Source0-md5: 47461349624dc83b33b2b038242f104b
Source1: gtools.py
Source2: %{name}-%{webapp}.config
Source3: %{name}-%{webapp}-httpd.config
@@ -166,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{py_sitedir}/%{name}
%attr(755,root,root) %{py_sitedir}/%{name}/*.so
%{py_sitedir}/%{name}/*.py[co]
+%{py_sitedir}/%{name}/default.d
%{py_sitedir}/%{name}/help
%{py_sitedir}/%{name}/hgweb
%{py_sitedir}/%{name}/httpclient
diff --git a/mercurial-doc.patch b/mercurial-doc.patch
index 648f013..483f856 100644
--- a/mercurial-doc.patch
+++ b/mercurial-doc.patch
@@ -1,11 +1,12 @@
-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
+--- mercurial-3.5.2/mercurial/demandimport.py~ 2015-10-01 19:06:55.000000000
+0200
++++ mercurial-3.5.2/mercurial/demandimport.py 2015-10-27 10:27:30.377611999
+0100
+@@ -173,7 +173,8 @@ ignore = [
'rfc822',
'mimetools',
-+ 'gobject._gobject',
+ # setuptools 8 expects this module to explode early when not on windows
+- 'distutils.msvc9compiler'
++ 'distutils.msvc9compiler',
++ 'gobject._gobject'
]
- def enable():
+ def isenabled():
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mercurial.git/commitdiff/f4d2f4f060670f48adb9f14b2bc6a4dbc38a43c7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
