[Python-checkins] CVS: python/dist/src/Lib/distutils/command bdist_rpm.py,1.23,1.23.8.1 bdist_wininst.py,1.21,1.21.4.1

[Tim Peters]

Update of /cvsroot/python/python/dist/src/Lib/distutils/command
In directory usw-pr-cvs1:/tmp/cvs-serv24450/mergedescr/dist/src/Lib/distutils/command

Modified Files:
      Tag: descr-branch
	bdist_rpm.py bdist_wininst.py 
Log Message:
Merge of trunk tag date2001-07-06 into descr-branch.


Index: bdist_rpm.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_rpm.py,v
retrieving revision 1.23
retrieving revision 1.23.8.1
diff -C2 -r1.23 -r1.23.8.1
*** bdist_rpm.py	2000/09/30 18:27:54	1.23
--- bdist_rpm.py	2001/07/07 22:55:28	1.23.8.1
***************
*** 190,194 ****
              for readme in ('README', 'README.txt'):
                  if os.path.exists(readme) and readme not in self.doc_files:
!                     self.doc.append(readme)
  
          self.ensure_string('release', "1")
--- 190,194 ----
              for readme in ('README', 'README.txt'):
                  if os.path.exists(readme) and readme not in self.doc_files:
!                     self.doc_files.append(readme)
  
          self.ensure_string('release', "1")

Index: bdist_wininst.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_wininst.py,v
retrieving revision 1.21
retrieving revision 1.21.4.1
diff -C2 -r1.21 -r1.21.4.1
*** bdist_wininst.py	2001/04/10 18:57:07	1.21
--- bdist_wininst.py	2001/07/07 22:55:28	1.21.4.1
***************
*** 217,221 ****
          import base64
          return base64.decodestring(EXEDATA)
- 
  # class bdist_wininst
  
--- 217,220 ----