X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=spec2make.py;h=ccf2cf843cd4d5aac17cd46e83cddc38f1c26c2a;hb=refs%2Fheads%2Fcoblitz;hp=8a8966a57fab9e92ea43df0d70315d13d04ae2e1;hpb=28e9735f68d3e061fdb8dd6e3fdef84a40c67534;p=build.git

diff --git a/spec2make.py b/spec2make.py
index 8a8966a5..ccf2cf84 100755
--- a/spec2make.py
+++ b/spec2make.py
@@ -13,6 +13,12 @@ def main ():
                       help='specify target arch')
     parser.add_option('-w','--whitelist-rpms',action='store',dest='whitelist',default='',
                       help='comma separated list of rpms to expose in makefile')
+    parser.add_option('-1','--with',action='store',dest='with',default='',
+                      help='accept but ignore --with option')
+    parser.add_option('-0','--without',action='store',dest='without',default='',
+                      help='accept but ignore --without option')
+    parser.add_option('-d','--define',action='store',dest='define',default='',
+                      help='accept but ignore --define option')
     (options,args) = parser.parse_args()
 
     try:
@@ -42,9 +48,11 @@ def main ():
     print "%s.srpm := SRPMS/%s-%s-%s.src.rpm"%(package_name, name, version, release)
 
     target = options.target
-    whitelist=options.whitelist.split(',')
+    whitelist=[ x for x in options.whitelist.split(',') if x]
     # Print non-empty packages
+    counter=0
     for package in specobj.packages:
+        counter += 1
         header=package.header
         name=header.format('%{name}')
         version=header.format('%{version}')
@@ -54,9 +62,18 @@ def main ():
         # skip dummy entries
         if not (name and version and release and arch) : continue
 
-        whitelisted = name in whitelist
+        # select relevant packages
+        # could not find the magic recipe to do this properly yet
+        # so ugly temporary hack :
+        # when whitelisted, we expose the first package plus the white-listed ones
+        # otherwise we expose everything
+        relevant=False
+        if not whitelist: relevant=True
+        else:
+            if counter==1: relevant=True
+            else: relevant=name in whitelist
 
-        if header.fullFilelist or whitelisted:
+        if relevant:
             # attach (add) rpm path to package
             print "%s.rpms += RPMS/%s/%s-%s-%s.%s.rpm"%\
                 (package_name, arch, name, version, release, arch)