Issue 2112: create a separate single-line description and make the

current description the long_description to satisfy RPM packaging.
(khomenko)

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3312 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 04e19b7d40fd9059d90df7c9952ec988a9d25e01..9cc05f910fcdfa5ed9ff77d291688c96630cd4f8 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -20,6 +20,10 @@ RELEASE 1.0.0 - XXX
 
     - Document the ParseDepends() function in the User's Guide.
 
 
     - Document the ParseDepends() function in the User's Guide.
 

+  From khomenko:
+
+    - Create a separate description and long_description for RPM packages.
+

   From Steven Knight:
 
     - Document the GetLaunchDir() function in the User's Guide.
   From Steven Knight:
 
     - Document the GetLaunchDir() function in the User's Guide.

diff --git a/src/setup.py b/src/setup.py
index b49a7af09806353ade54b21e7794798b487b7002..e1d4fabb52b89acc90d5cee346ecc8ada07ca67b 100644 (file)
--- a/src/setup.py
+++ b/src/setup.py
@@ -361,7 +361,9 @@ class install_data(_install_data):
         else:
             self.data_files = []
 
         else:
             self.data_files = []
 

-description = """Open Source next-generation build tool.
+description = "Open Source next-generation build tool."
+
+long_description = """Open Source next-generation build tool.

 Improved, cross-platform substitute for the classic Make
 utility.  In short, SCons is an easier, more reliable
 and faster way to build software."""
 Improved, cross-platform substitute for the classic Make
 utility.  In short, SCons is an easier, more reliable
 and faster way to build software."""


@@ -387,6 +389,7 @@ arguments = {
     'name'             : "scons",
     'version'          : Version,
     'description'      : description,
     'name'             : "scons",
     'version'          : Version,
     'description'      : description,

+    'long_description' : long_description,

     'author'           : 'Steven Knight',
     'author_email'     : 'knight@baldmt.com',
     'url'              : "http://www.scons.org/",
     'author'           : 'Steven Knight',
     'author_email'     : 'knight@baldmt.com',
     'url'              : "http://www.scons.org/",