From: Caleb Maclennan <caleb@alerque.com>
Date: Sat, 6 Nov 2010 09:48:29 +0000 (+0000)
Subject: - Up to 0.7.5
X-Git-Tag: auto/th/python-subvertpy-0_7_5-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpython-subvertpy.git;a=commitdiff_plain;h=0067fd57eaad44dffbd4df5ec4998ac1bb92a3ca

- Up to 0.7.5
- Removed patch applied upstream

Changed files:
    apu_includes.patch -> 1.2
    python-subvertpy.spec -> 1.6
---

diff --git a/apu_includes.patch b/apu_includes.patch
deleted file mode 100644
index 0a69acb..0000000
--- a/apu_includes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- subvertpy-0.7.2/setup.py.wiget	2010-03-11 15:15:17.000000000 +0100
-+++ subvertpy-0.7.2/setup.py	2010-03-11 15:21:02.000000000 +0100
-@@ -76,6 +76,26 @@ def apr_config(arg):
-         res = run_cmd(apr_config_cmd, arg)
-     return res
- 
-+def apu_config(arg):
-+    apu_config_cmd = os.getenv("APU_CONFIG")
-+    if apu_config_cmd is None:
-+        cmds = ["apu-1-config", "/usr/local/apr-utils/bin/apu-1-config", 
-+                "/opt/local/bin/apu-1-config", ]
-+        for cmd in cmds:
-+            try:
-+                res = run_cmd(cmd, arg)
-+                apu_config_cmd = cmd
-+                break
-+            except CommandException, e:
-+                if not e.not_found():
-+                    raise
-+        else:
-+            raise Exception("apu-config not found."
-+                            " Please set APU_CONFIG environment variable")
-+    else:
-+        res = run_cmd(apu_config_cmd, arg)
-+    return res
-+
- 
- def apr_build_data():
-     """Determine the APR header file location."""
-@@ -84,6 +104,13 @@ def apr_build_data():
-         raise Exception("APR development headers not found")
-     return (includedir,)
- 
-+def apu_build_data():
-+    """Determine the APR-UTILS header file location."""
-+    includedir = apu_config("--includedir")
-+    if not os.path.isdir(includedir):
-+        raise Exception("APR-UTILS development headers not found")
-+    return (includedir,)
-+
- 
- def svn_build_data():
-     """Determine the Subversion header file location."""
-@@ -108,8 +135,9 @@ def is_keychain_provider_available():
-     Checks for the availability of the Keychain simple authentication provider in Subversion by compiling a simple test program.
-     """
-     abd = apr_build_data()
-+    aubd = apu_build_data()
-     sbd = svn_build_data()
--    gcc_command_args = ['gcc'] + ['-I' + inc for inc in sbd[0]] + ['-L' + lib for lib in sbd[1]] + ['-I' + abd[0], '-lsvn_subr-1', '-x', 'c', '-']
-+    gcc_command_args = ['gcc'] + ['-I' + inc for inc in sbd[0]] + ['-L' + lib for lib in sbd[1]] + ['-I' + abd[0], '-I' + aubd[0], '-lsvn_subr-1', '-x', 'c', '-']
-     (gcc_in, gcc_out, gcc_err) = os.popen3(gcc_command_args)
-     gcc_in.write("""
- #include <svn_auth.h>
-@@ -223,10 +251,11 @@ if os.name == "nt":
-         return includes, lib_dirs, aprlibs+libs,
- 
- (apr_includedir, ) = apr_build_data()
-+(apu_includedir, ) = apu_build_data()
- (svn_includedirs, svn_libdirs, extra_libs) = svn_build_data()
- 
- def SvnExtension(name, *args, **kwargs):
--    kwargs["include_dirs"] = [apr_includedir] + svn_includedirs + ["subvertpy"]
-+    kwargs["include_dirs"] = [apr_includedir, apu_includedir] + svn_includedirs + ["subvertpy"]
-     kwargs["library_dirs"] = svn_libdirs
-     if os.name == 'nt':
-         # on windows, just ignore and overwrite the libraries!
diff --git a/python-subvertpy.spec b/python-subvertpy.spec
index f59cfac..e1bd3a1 100644
--- a/python-subvertpy.spec
+++ b/python-subvertpy.spec
@@ -1,18 +1,17 @@
 # TODO:
-# - include examples in package
+# - package tests
 #
 %define		module	subvertpy
 #
 Summary:	A Pythonic binding for subversion
 Summary(pl.UTF-8):	Pythonowe wiązanie do subversion
 Name:		python-%{module}
-Version:	0.7.2
-Release:	4
+Version:	0.7.5
+Release:	1
 License:	LGPLv2.1+
 Group:		Libraries/Python
 Source0:	http://samba.org/~jelmer/subvertpy/%{module}-%{version}.tar.gz
-# Source0-md5:	01e2098db04ddddaf06a7e27c075745d
-Patch0:		apu_includes.patch
+# Source0-md5:	2e84979c7380a396d6beec278f2d6104
 URL:		http://samba.org/~jelmer/subvertpy/
 BuildRequires:	apr-devel
 BuildRequires:	apr-util-devel
@@ -29,7 +28,6 @@ aimed to be complete, fast and feel native to Python programmers.
 
 %prep
 %setup -q -n %{module}-%{version}
-%patch0 -p1
 
 %build
 python setup.py build