[hgsvn] Update to 0.1.9

terjeros terjeros at fedoraproject.org
Tue Jan 31 20:23:13 UTC 2012


commit 8d6d757321e0a9873a2a054c214323e734ee0554
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Tue Jan 31 21:23:08 2012 +0100

    Update to 0.1.9
    
    - With mercurial >= 1.4.3 license issue is resolved

 .gitignore                                         |    1 +
 ...isable-ez.patch => hgsvn-0.1.9-disable-ez.patch |   11 ++-
 hgsvn-no-mercurial.patch                           |   78 --------------------
 hgsvn.spec                                         |   24 ++++--
 sources                                            |    2 +-
 5 files changed, 23 insertions(+), 93 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6ec1863..8f9fae1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 hgsvn-0.1.8.tar.gz
+/hgsvn-0.1.9.tar.gz
diff --git a/hgsvn-0.1.8-disable-ez.patch b/hgsvn-0.1.9-disable-ez.patch
similarity index 53%
rename from hgsvn-0.1.8-disable-ez.patch
rename to hgsvn-0.1.9-disable-ez.patch
index c2e3aaf..280f169 100644
--- a/hgsvn-0.1.8-disable-ez.patch
+++ b/hgsvn-0.1.9-disable-ez.patch
@@ -1,14 +1,15 @@
-diff -up hgsvn-0.1.8/setup.py~ hgsvn-0.1.8/setup.py
---- hgsvn-0.1.8/setup.py~	2009-06-25 05:27:24.000000000 +0200
-+++ hgsvn-0.1.8/setup.py	2010-03-04 19:04:35.000000000 +0100
+diff --git a/setup.py b/setup.py
+index 02b895f..109ac35 100755
+--- a/setup.py
++++ b/setup.py
 @@ -14,8 +14,8 @@
  # ninth alpha of release 0.6. But the -r41475 is a post-release tag, so this
  # version is newer than 0.6a9.dev."
  
 -from ez_setup import use_setuptools
--use_setuptools(version="0.6c9", download_delay=3)
+-use_setuptools(download_delay=3)
 +#from ez_setup import use_setuptools
-+#use_setuptools(version="0.6c9", download_delay=3)
++#use_setuptools(download_delay=3)
  from setuptools import setup, find_packages
  
  from hgsvn import base_version, __doc__ as long_description
diff --git a/hgsvn.spec b/hgsvn.spec
index 7dcef65..2c3f41c 100644
--- a/hgsvn.spec
+++ b/hgsvn.spec
@@ -3,19 +3,22 @@
 
 Summary:       A set of scripts to work locally on subversion checkouts using mercurial
 Name:          hgsvn
-Version:       0.1.8
-Release:       4%{?dist}
+Version:       0.1.9
+Release:       1%{?dist}
 License:       GPLv3+
 Group:         Development/Tools
-URL  :         http://pypi.python.org/pypi/%{name}/
+URL:           http://pypi.python.org/pypi/%{name}/
 Source0:       http://pypi.python.org/packages/source/h/%{name}/%{name}-%{version}.tar.gz
-Patch0:        hgsvn-no-mercurial.patch
-Patch1:        hgsvn-0.1.8-disable-ez.patch
+Patch0:        hgsvn-0.1.9-disable-ez.patch
 BuildArch:     noarch
-Requires:      mercurial subversion python-setuptools
+Requires:      mercurial >= 1.4.3
+Requires:      subversion
+Requires:      python-setuptools
+# Needed in %%check
 BuildRequires: python-devel
-# Needed in %%check 
-BuildRequires: mercurial python-nose subversion
+BuildRequires: mercurial >= 1.4.3
+BuildRequires: python-nose
+BuildRequires: subversion
 BuildRequires: python-setuptools-devel
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,7 +34,6 @@ fast local operations like hg log and hg annotate.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 CFLAGS="%{optflags}" %{__python} setup.py build
@@ -56,6 +58,10 @@ CFLAGS="%{optflags}" %{__python} setup.py build
 %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Tue Jan 31 2012 Terje Rosten <terje.rosten at ntnu.no> - 0.1.9-1
+- Update to 0.1.9
+- With mercurial >= 1.4.3 license issue is resolved
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 0208b5b..547af65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56209eae48b955754e09185712123428  hgsvn-0.1.8.tar.gz
+901f2fb04faad5a1e7cf84abfad564fd  hgsvn-0.1.9.tar.gz


More information about the scm-commits mailing list