rpms/smart/FC-6 distro.py,1.2,1.3 smart.spec,1.14,1.15

[Axel Thimm (athimm)]

Author: athimm

Update of /cvs/extras/rpms/smart/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3061/FC-6

Modified Files:
	distro.py smart.spec 
Log Message:
Support kernel series name change: suspend2 -> tuxonice.


Index: distro.py
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-6/distro.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- distro.py	25 Nov 2006 16:30:35 -0000	1.2
+++ distro.py	2 Aug 2007 11:39:30 -0000	1.3
@@ -5,17 +5,13 @@
                      "type": "rpm-sys",
                      "name": "RPM Database"})
 
-    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
-        pkgconf.setFlag("multi-version", "kernel%s" % flavour)
-        pkgconf.setFlag("multi-version", "kernel%s-unsupported" % flavour)
-        pkgconf.setFlag("multi-version", "kernel%s-devel" % flavour)
-        for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
-             pkgconf.setFlag("multi-version", "%s-kernel%s" % (clustergfs, flavour))
-        pkgconf.setFlag("multi-version", "kernel-suspend2%s" % flavour)
-        pkgconf.setFlag("multi-version", "kernel-suspend2%s-unsupported" % flavour)
-        pkgconf.setFlag("multi-version", "kernel-suspend2%s-devel" % flavour)
-        for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
-             pkgconf.setFlag("multi-version", "%s-kernel-suspend2%s" % (clustergfs, flavour))
+    for kernelseries in ("kernel", "kernel-suspend2", "kernel-tuxonice"):
+        for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
+            pkgconf.setFlag("multi-version", "%s%s" % (kernelseries, flavour))
+            pkgconf.setFlag("multi-version", "%s%s-unsupported" % (kernelseries, flavour))
+            pkgconf.setFlag("multi-version", "%s%s-devel" % (kernelseries, flavour))
+            for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
+                pkgconf.setFlag("multi-version", "%s-%s%s" % (clustergfs, kernelseries, flavour))
     pkgconf.setFlag("multi-version", "kernel-source")
     pkgconf.setFlag("multi-version", "kernel-sourcecode")
 


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-6/smart.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- smart.spec	3 Jun 2007 07:41:41 -0000	1.14
+++ smart.spec	2 Aug 2007 11:39:30 -0000	1.15
@@ -7,7 +7,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.50
-Release: 46%{?dist}
+Release: 47%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -207,6 +207,9 @@
 %endif
 
 %changelog
+* Thu Aug  2 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-47
+- Add kernel-tuxonice series support.
+
 * Sun Jun  3 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-46
 - Autodetect pam_stack module at build time.