Fix bdist_rpm.
authorJelmer Vernooij <jelmer@samba.org>
Mon, 19 Jan 2009 06:25:25 +0000 (07:25 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 19 Jan 2009 06:25:25 +0000 (07:25 +0100)
.bzrignore
MANIFEST.in [new file with mode: 0644]
NEWS
setup.py

index 5f6dba9..769a87e 100644 (file)
@@ -1,3 +1,4 @@
 build
 _trial_temp
 dist
+MANIFEST
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644 (file)
index 0000000..863e536
--- /dev/null
@@ -0,0 +1,2 @@
+include MANIFEST.in 
+include subvertpy/*.h 
diff --git a/NEWS b/NEWS
index 7c68d99..971b203 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+0.6.1  UNRELEASED
+
+ * Fixed bdist_rpm. (#311712)
+
 0.6            2009-01-13
 
  Initial release.
index ff5b590..f58a4ce 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -229,7 +229,7 @@ if os.name == "nt":
 (svn_includedirs, svn_libdirs, extra_libs) = svn_build_data()
 
 def SvnExtension(name, *args, **kwargs):
-    kwargs["include_dirs"] = [apr_includedir] + svn_includedirs
+    kwargs["include_dirs"] = [apr_includedir] + svn_includedirs + ["subvertpy"]
     kwargs["library_dirs"] = svn_libdirs
     if os.name == 'nt':
         # on windows, just ignore and overwrite the libraries!
@@ -282,15 +282,14 @@ class install_lib_with_dlls(install_lib):
                 self.copy_file(s, d)
 
     def get_outputs(self):
-        ret = install_lib.get_outputs()
+        ret = install_lib.get_outputs(self)
         if os.name == 'nt':
             ret.extend([info[1] for info in self._get_dlls()])
         return ret
 
 
 def source_path(filename):
-    source_code_dir = os.path.dirname(__file__)
-    return os.path.join(source_code_dir, "subvertpy", filename)
+    return os.path.join("subvertpy", filename)
 
 
 def subvertpy_modules(basemodule):