Author: tack
Date: Mon Feb 26 18:18:45 2007
New Revision: 2528

Added:
   trunk/base/setup.cfg
   trunk/beacon/setup.cfg
   trunk/canvas/setup.cfg
   trunk/cherrypy/setup.cfg
   trunk/display/setup.cfg
   trunk/epg/setup.cfg
   trunk/evas/setup.cfg
   trunk/imlib2/setup.cfg
   trunk/metadata/setup.cfg
   trunk/mevas/setup.cfg
   trunk/popcorn/setup.cfg
   trunk/record/setup.cfg
   trunk/xine/setup.cfg
Modified:
   trunk/base/src/distribution/core.py
   trunk/beacon/setup.py
   trunk/canvas/setup.py
   trunk/cherrypy/setup.py
   trunk/display/setup.py
   trunk/epg/setup.py
   trunk/evas/setup.py
   trunk/imlib2/setup.py
   trunk/metadata/setup.py
   trunk/mevas/setup.py
   trunk/popcorn/setup.py
   trunk/record/setup.py
   trunk/xine/setup.py

Log:
Make bdist_rpm work again; prefix RPM package names with python-; remove
unneeded spec file from kaa.imlib2.


Added: trunk/base/setup.cfg
==============================================================================
--- (empty file)
+++ trunk/base/setup.cfg        Mon Feb 26 18:18:45 2007
@@ -0,0 +1,2 @@
+[install]
+optimize=1

Modified: trunk/base/src/distribution/core.py
==============================================================================
--- trunk/base/src/distribution/core.py (original)
+++ trunk/base/src/distribution/core.py Mon Feb 26 18:18:45 2007
@@ -515,6 +515,7 @@
 
     if len(sys.argv) > 1 and sys.argv[1] == 'bdist_rpm':
         dist = None
+        kwargs['name'] = 'python-' + kwargs['name']
         release = "1"
         if '--dist' in sys.argv:
             # TODO: determine this automatically

Added: trunk/beacon/setup.cfg
==============================================================================
--- (empty file)
+++ trunk/beacon/setup.cfg      Mon Feb 26 18:18:45 2007
@@ -0,0 +1,2 @@
+[install]
+optimize=1

Modified: trunk/beacon/setup.py
==============================================================================
--- trunk/beacon/setup.py       (original)
+++ trunk/beacon/setup.py       Mon Feb 26 18:18:45 2007
@@ -68,8 +68,8 @@
        summary     = "Media-oriented virtual filesystem",
        scripts     = [ 'bin/kaa-thumb', 'bin/beacon' ],
        rpminfo     = {
-           'requires':       'kaa-base >= 0.1.2, imlib2 >= 1.2.1',
-           'build_requires': 'kaa-base >= 0.1.2, imlib2-devel >= 1.2.1, 
python-devel >= 2.4.0'
+           'requires':       'python-kaa-base >= 0.1.2, imlib2 >= 1.2.1',
+           'build_requires': 'python-kaa-base >= 0.1.2, imlib2-devel >= 1.2.1, 
python-devel >= 2.4.0'
        },
        ext_modules = ext_modules
       )

Added: trunk/canvas/setup.cfg
==============================================================================
--- (empty file)
+++ trunk/canvas/setup.cfg      Mon Feb 26 18:18:45 2007
@@ -0,0 +1,2 @@
+[install]
+optimize=1

Modified: trunk/canvas/setup.py
==============================================================================
--- trunk/canvas/setup.py       (original)
+++ trunk/canvas/setup.py       Mon Feb 26 18:18:45 2007
@@ -59,8 +59,8 @@
       license = 'LGPL',
       summary = 'High-level canvas API built on top of kaa.evas',
       rpminfo = {
-          'requires':       'kaa-base >= 0.1.2, kaa-evas >= 0.1.0, kaa-imlib2 
>= 0.2.0,' \
+          'requires':       'python-kaa-base >= 0.1.2, python-kaa-evas >= 
0.1.0, python-kaa-imlib2 >= 0.2.0,' \
                             'librsvg2 >= 2.9.0, libmng >= 1.0.9',
-          'build_requires': 'kaa-base >= 0.1.2, librsvg2-devel >= 2.9.0, 
libmng-devel >= 1.0.9'
+          'build_requires': 'python-kaa-base >= 0.1.2, librsvg2-devel >= 
2.9.0, libmng-devel >= 1.0.9'
       },
       ext_modules = ext_modules)

Added: trunk/cherrypy/setup.cfg
==============================================================================
--- (empty file)
+++ trunk/cherrypy/setup.cfg    Mon Feb 26 18:18:45 2007
@@ -0,0 +1,2 @@
+[install]
+optimize=1

Modified: trunk/cherrypy/setup.py
==============================================================================
--- trunk/cherrypy/setup.py     (original)
+++ trunk/cherrypy/setup.py     Mon Feb 26 18:18:45 2007
@@ -39,5 +39,11 @@
 
 # call setup
 setup(module      = 'cherrypy',
-      version     = '0.1'
-      )
+      version     = '0.1.0',
+      license     = 'GPL',
+      summary     = 'Web framework based on cherrypy',
+      rpminfo     = {
+            'requires':       'python-kaa-base >= 0.1.2',
+            'build_requires': 'python-kaa-base >= 0.1.2'
+      }
+)

Added: trunk/display/setup.cfg
==============================================================================
--- (empty file)
+++ trunk/display/setup.cfg     Mon Feb 26 18:18:45 2007
@@ -0,0 +1,2 @@
+[install]
+optimize=1

Modified: trunk/display/setup.py
==============================================================================
--- trunk/display/setup.py      (original)
+++ trunk/display/setup.py      Mon Feb 26 18:18:45 2007
@@ -159,10 +159,10 @@
     print "- SDL"
 
 
-requires_common       = 'kaa-base >= 0.1.2, pygame >= 1.6.0, kaa-imlib2 >= 
0.2.0,' \
-                        'imlib2 >= 1.2.1, kaa-evas >= 0.1.0, evas >= 0.9.9.032'
-build_requires_common = 'kaa-base >= 0.1.2, pygame-devel >= 1.6.0, kaa-imlib2 
>= 0.2.0,' \
-                        'imlib2-devel >= 1.2.1, kaa-evas >= 0.1.0, evas-devel 
>= 0.9.9.032'
+requires_common       = 'python-kaa-base >= 0.1.2, pygame >= 1.6.0, 
python-kaa-imlib2 >= 0.2.0,' \
+                        'imlib2 >= 1.2.1, python-kaa-evas >= 0.1.0, evas >= 
0.9.9.032'
+build_requires_common = 'python-kaa-base >= 0.1.2, pygame-devel >= 1.6.0, 
python-kaa-imlib2 >= 0.2.0,' \
+                        'imlib2-devel >= 1.2.1, python-kaa-evas >= 0.1.0, 
evas-devel >= 0.9.9.032'
 
 setup(module  = 'display',
       version     = '0.1.0',

Added: trunk/epg/setup.cfg
==============================================================================
--- (empty file)
+++ trunk/epg/setup.cfg Mon Feb 26 18:18:45 2007
@@ -0,0 +1,2 @@
+[install]
+optimize=1

Modified: trunk/epg/setup.py
==============================================================================
--- trunk/epg/setup.py  (original)
+++ trunk/epg/setup.py  Mon Feb 26 18:18:45 2007
@@ -42,7 +42,7 @@
       license      = 'LGPL',
       summary      = 'Electronic Program Guide',
       rpminfo      = {
-          'requires':       'kaa-base >= 0.1.2',
-          'build_requires': 'kaa-base >= 0.1.2'
+          'requires':       'python-kaa-base >= 0.1.2',
+          'build_requires': 'python-kaa-base >= 0.1.2'
       }
       )

Added: trunk/evas/setup.cfg
==============================================================================
--- (empty file)
+++ trunk/evas/setup.cfg        Mon Feb 26 18:18:45 2007
@@ -0,0 +1,2 @@
+[install]
+optimize=1

Modified: trunk/evas/setup.py
==============================================================================
--- trunk/evas/setup.py (original)
+++ trunk/evas/setup.py Mon Feb 26 18:18:45 2007
@@ -61,8 +61,8 @@
       license     = 'LGPL',
       summary     = 'Python bindings for Evas',
       rpminfo     = {
-          'requires':       'kaa-base >= 0.1.2, evas >= 0.9.9.032',
-          'build_requires': 'kaa-base >= 0.1.2, evas-devel >= 0.9.9.032'
+          'requires':       'python-kaa-base >= 0.1.2, evas >= 0.9.9.032',
+          'build_requires': 'python-kaa-base >= 0.1.2, evas-devel >= 0.9.9.032'
       },
       ext_modules = [ evasso ]
 )

Added: trunk/imlib2/setup.cfg
==============================================================================
--- (empty file)
+++ trunk/imlib2/setup.cfg      Mon Feb 26 18:18:45 2007
@@ -0,0 +1,2 @@
+[install]
+optimize=1

Modified: trunk/imlib2/setup.py
==============================================================================
--- trunk/imlib2/setup.py       (original)
+++ trunk/imlib2/setup.py       Mon Feb 26 18:18:45 2007
@@ -61,8 +61,8 @@
       license     = 'LGPL',
       summary     = 'Python bindings for Imlib2',
       rpminfo     = {
-          'requires':       'kaa-base >= 0.1.2, imlib2 >= 1.2.1',
-          'build_requires': 'kaa-base >= 0.1.2, imlib2-devel >= 1.2.1'
+          'requires':       'python-kaa-base >= 0.1.2, imlib2 >= 1.2.1',
+          'build_requires': 'python-kaa-base >= 0.1.2, imlib2-devel >= 1.2.1'
       },
       ext_modules = [ imlib2so ]
 )

Added: trunk/metadata/setup.cfg
==============================================================================
--- (empty file)
+++ trunk/metadata/setup.cfg    Mon Feb 26 18:18:45 2007
@@ -0,0 +1,2 @@
+[install]
+optimize=1

Modified: trunk/metadata/setup.py
==============================================================================
--- trunk/metadata/setup.py     (original)
+++ trunk/metadata/setup.py     Mon Feb 26 18:18:45 2007
@@ -74,8 +74,9 @@
        author      = "Thomas Schueppel, Dirk Meyer",
        scripts     = [ 'bin/mminfo' ],
        rpminfo = {
-           'requires':        'kaa-base >= 0.1.2, libdvdread >= 0.9.4',
-           'build_requires':  'kaa-base >= 0.1.2, libdvdread-devel >= 0.9.4, 
python-devel >= 2.3.0'
+           'requires':        'python-kaa-base >= 0.1.2, libdvdread >= 0.9.4',
+           'build_requires':  'python-kaa-base >= 0.1.2, libdvdread-devel >= 
0.9.4, python-devel >= 2.3.0',
+           'obsoletes':       'mmpython'
        },
        ext_modules = ext_modules
       )

Added: trunk/mevas/setup.cfg
==============================================================================
--- (empty file)
+++ trunk/mevas/setup.cfg       Mon Feb 26 18:18:45 2007
@@ -0,0 +1,2 @@
+[install]
+optimize=1

Modified: trunk/mevas/setup.py
==============================================================================
--- trunk/mevas/setup.py        (original)
+++ trunk/mevas/setup.py        Mon Feb 26 18:18:45 2007
@@ -42,7 +42,7 @@
      license = 'LGPL',
      summary = 'MeBox Canvas library',
      rpminfo = {
-         'requires':       'kaa-base >= 0.1.2, kaa-imlib2 >= 0.2.0',
-         'build_requires': 'kaa-base >= 0.1.2'
+         'requires':       'python-kaa-base >= 0.1.2, python-kaa-imlib2 >= 
0.2.0',
+         'build_requires': 'python-kaa-base >= 0.1.2'
     }
 )

Added: trunk/popcorn/setup.cfg
==============================================================================
--- (empty file)
+++ trunk/popcorn/setup.cfg     Mon Feb 26 18:18:45 2007
@@ -0,0 +1,2 @@
+[install]
+optimize=1

Modified: trunk/popcorn/setup.py
==============================================================================
--- trunk/popcorn/setup.py      (original)
+++ trunk/popcorn/setup.py      Mon Feb 26 18:18:45 2007
@@ -50,7 +50,7 @@
       license = 'GPL',
       summary = 'Media player abstraction library supporting multiple 
backends',
       rpminfo = {
-          'requires':       'kaa-base >= 0.1.2, kaa-xine >= 0.9.0',
-          'build_requires': 'kaa-base >= 0.1.2'
+          'requires':       'python-kaa-base >= 0.1.2, python-kaa-xine >= 
0.9.0',
+          'build_requires': 'python-kaa-base >= 0.1.2'
       },
       ext_modules = ext_modules)

Added: trunk/record/setup.cfg
==============================================================================
--- (empty file)
+++ trunk/record/setup.cfg      Mon Feb 26 18:18:45 2007
@@ -0,0 +1,2 @@
+[install]
+optimize=1

Modified: trunk/record/setup.py
==============================================================================
--- trunk/record/setup.py       (original)
+++ trunk/record/setup.py       Mon Feb 26 18:18:45 2007
@@ -66,8 +66,8 @@
       license     = 'GPL',
       summary     = 'Python library for recording from different types of tv 
cards to different outputs.',
       rpminfo     = {
-          'requires':       'kaa-base >= 0.1.2',
-          'build_requires': 'kaa-base >= 0.1.2'
+          'requires':       'python-kaa-base >= 0.1.2',
+          'build_requires': 'python-kaa-base >= 0.1.2'
       },
       ext_modules = ext_modules
 )

Added: trunk/xine/setup.cfg
==============================================================================
--- (empty file)
+++ trunk/xine/setup.cfg        Mon Feb 26 18:18:45 2007
@@ -0,0 +1,2 @@
+[install]
+optimize=1

Modified: trunk/xine/setup.py
==============================================================================
--- trunk/xine/setup.py (original)
+++ trunk/xine/setup.py Mon Feb 26 18:18:45 2007
@@ -96,8 +96,8 @@
 elif arch == "i386":
     config.define('ARCH_X86')
 
-requires_common =       'kaa-base >= 0.1.2, kaa-display >= 0.1.0, xine-lib >= 
1.1.0'
-build_requires_common = 'kaa-base >= 0.1.2, xine-lib-devel >= 1.1.0, 
python-devel >= 2.4.0'
+requires_common =       'python-kaa-base >= 0.1.2, python-kaa-display >= 
0.1.0, xine-lib >= 1.1.0'
+build_requires_common = 'python-kaa-base >= 0.1.2, xine-lib-devel >= 1.1.0, 
python-devel >= 2.4.0'
 
 setup(module      = 'xine',
       version     = '0.9.0',

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to