Rev 4726: (Joe Julian) Bug #175839, fixes to 'setup.py bdist_rpm' in file:///home/pqm/archives/thelove/bzr/2.0/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.0/

------------------------------------------------------------
revno: 4726 [merge]
revision-id: pqm at pqm.ubuntu.com-20100113174036-jmh8u7l9tie2s3zf
parent: pqm at pqm.ubuntu.com-20100113074324-g4mbj7sdxktz602t
parent: john at arbash-meinel.com-20100113163134-r3wfpm5siqedv8i1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.0
timestamp: Wed 2010-01-13 17:40:36 +0000
message:
  (Joe Julian) Bug #175839, fixes to 'setup.py bdist_rpm'
added:
  MANIFEST.in                    manifest.in-20100109214549-ime1ec4zij1zkovi-1
  README_BDIST_RPM               readme_bdist_rpm-20100109220335-taksndjgxmwnre5e-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
  bzrlib/tests/per_workingtree/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
=== added file 'MANIFEST.in'
--- a/MANIFEST.in	1970-01-01 00:00:00 +0000
+++ b/MANIFEST.in	2010-01-13 16:23:07 +0000
@@ -0,0 +1,3 @@
+include bzr README setup.py
+recursive-include bzrlib *.py *.pyx *.pxd *.txt *.c *.h
+recursive-include tools *.py *.sh

=== modified file 'NEWS'
--- a/NEWS	2010-01-13 07:43:24 +0000
+++ b/NEWS	2010-01-13 16:31:34 +0000
@@ -56,6 +56,10 @@
 * Refuse to build with any Pyrex 0.9.4 release, as they have known bugs.
   (Martin Pool, John Arbash Meinel, #449372)
 
+* ``setup.py bdist_rpm`` now properly finds extra files needed for the
+  build. (there is still the distutils bug
+  http://bugs.python.org/issue644744) (Joe Julian, #175839)
+
 * The 2a format wasn't properly restarting autopacks when something
   changed underneath it (like another autopack). Now concurrent
   autopackers will properly succeed. (John Arbash Meinel, #495000)

=== added file 'README_BDIST_RPM'
--- a/README_BDIST_RPM	1970-01-01 00:00:00 +0000
+++ b/README_BDIST_RPM	2010-01-10 02:25:31 +0000
@@ -0,0 +1,8 @@
+There is a bug in disttools for distributions who's rpmbuild compresses 
+the man pages. This causes an error building the final packages as it's 
+expecting bzr.1 and not finding it, but finding bzr.1.gz that's unpackaged.
+
+This bug is known to affect Fedora, RHEL, and Centos distributions.
+
+There is a preliminary patch at http://bugs.python.org/issue644744 that
+fixes this issue with disttools.

=== modified file 'bzrlib/tests/blackbox/test_pull.py'
--- a/bzrlib/tests/blackbox/test_pull.py	2010-01-12 06:12:31 +0000
+++ b/bzrlib/tests/blackbox/test_pull.py	2010-01-13 16:27:22 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_workingtree/test_workingtree.py'
--- a/bzrlib/tests/per_workingtree/test_workingtree.py	2010-01-11 22:59:04 +0000
+++ b/bzrlib/tests/per_workingtree/test_workingtree.py	2010-01-13 16:27:22 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 # Authors:  Robert Collins <robert.collins at canonical.com>
 #           and others
 #

=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py	2010-01-12 04:31:21 +0000
+++ b/bzrlib/tests/test_transform.py	2010-01-13 16:27:22 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py	2010-01-11 22:23:37 +0000
+++ b/bzrlib/transform.py	2010-01-13 16:27:22 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py	2010-01-12 20:55:45 +0000
+++ b/bzrlib/workingtree.py	2010-01-13 16:27:22 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by