CWS-TOOLING: integrate CWS sysui37

2009-05-19 12:44:43 +0200 ihi  r272072 : #i101914# rpm installer fix
2009-05-18 19:08:13 +0200 ihi  r272047 : #i98650# rpm rebuild issue
2009-05-18 16:52:13 +0200 ihi  r272036 : #i101916# rpm fix
2009-05-18 16:39:55 +0200 ihi  r272035 : #i101914# sysui rpm fix

6 files changed, 13 insertions, 12 deletions

diff --git a/sysui/desktop/freedesktop/makefile.mk b/sysui/desktop/freedesktop/makefile.mk
index 77a30e170a42..545d46b08afd 100644
--- a/sysui/desktop/freedesktop/makefile.mk
+++ b/sysui/desktop/freedesktop/makefile.mk
@@ -47,7 +47,7 @@ TARGET=freedesktop
 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
 
 SPECFILE=$(TARGET)-menus.spec
-RPMFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$i)-$(PKGREV).noarch.rpm)
+RPMFLAGFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$i)-$(PKGREV).noarch.flag)
 
 .ENDIF
 
@@ -58,6 +58,6 @@ RPMFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$
 
 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
 
-$(RPMFILES) : $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
+$(RPMFLAGFILES) : $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
 
 .ENDIF
diff --git a/sysui/desktop/mandriva/makefile.mk b/sysui/desktop/mandriva/makefile.mk
index 0b465c3393c3..77bfb310294f 100644
--- a/sysui/desktop/mandriva/makefile.mk
+++ b/sysui/desktop/mandriva/makefile.mk
@@ -47,7 +47,7 @@ TARGET=mandriva
 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
 
 SPECFILE=$(TARGET)-menus.spec
-RPMFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$i)-$(PKGREV).noarch.rpm)
+RPMFLAGFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$i)-$(PKGREV).noarch.flag)
 
 .ENDIF
 
@@ -58,6 +58,6 @@ RPMFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$
 
 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
 
-$(RPMFILES) : $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
+$(RPMFLAGFILES) : $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
 
 .ENDIF
diff --git a/sysui/desktop/redhat/makefile.mk b/sysui/desktop/redhat/makefile.mk
index bf8a1636cfff..6baa04867e40 100644
--- a/sysui/desktop/redhat/makefile.mk
+++ b/sysui/desktop/redhat/makefile.mk
@@ -47,7 +47,7 @@ TARGET=redhat
 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
 
 SPECFILE=$(TARGET)-menus.spec
-RPMFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$i)-$(PKGREV).noarch.rpm)
+RPMFLAGFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$i)-$(PKGREV).noarch.flag)
 
 .ENDIF
 
@@ -58,6 +58,6 @@ RPMFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$
 
 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
 
-$(RPMFILES) : $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
+$(RPMFLAGFILES) : $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
 
 .ENDIF
diff --git a/sysui/desktop/suse/makefile.mk b/sysui/desktop/suse/makefile.mk
index 064d83ae27cf..5be2ca62d02a 100644
--- a/sysui/desktop/suse/makefile.mk
+++ b/sysui/desktop/suse/makefile.mk
@@ -47,7 +47,7 @@ TARGET=suse
 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
 
 SPECFILE=$(TARGET)-menus.spec
-RPMFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$i)-$(PKGREV).noarch.rpm)
+RPMFLAGFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$i)-$(PKGREV).noarch.flag)
 
 .ENDIF
 
@@ -58,6 +58,6 @@ RPMFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$
 
 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
 
-$(RPMFILES) : $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
+$(RPMFLAGFILES) : $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
 
 .ENDIF
diff --git a/sysui/desktop/tg_rpm.mk b/sysui/desktop/tg_rpm.mk
index 06902b698623..269ff27b4e5b 100644
--- a/sysui/desktop/tg_rpm.mk
+++ b/sysui/desktop/tg_rpm.mk
@@ -31,9 +31,9 @@
 
 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
 
-ALLTAR : $(RPMFILES)
+ALLTAR : $(RPMFLAGFILES)
 
-$(RPMFILES) : $(SPECFILE)
+$(RPMFLAGFILES) : $(SPECFILE)
     @-$(MKDIRHIER) $(@:d)
     -$(RM) $(@:d)$(@:b:s/-/ /:1)-$(SPECFILE:b)-*
     $(RPM) -bb $< $(RPMMACROS) \
@@ -44,5 +44,6 @@ $(RPMFILES) : $(SPECFILE)
         --define "unixfilename $(UNIXFILENAME.$(@:b:s/-/ /:1))" \
         --define "iconprefix $(ICONPREFIX.$(@:b:s/-/ /:1))" \
         --define "version $(PKGVERSION.$(@:b:s/-/ /:1))" \
-        --define "release $(PKGREV)"
+        --define "release $(PKGREV)" \
+        --define "_unpackaged_files_terminate_build  0" && $(TOUCH) $@
 .ENDIF
diff --git a/sysui/desktop/util/makefile.mk b/sysui/desktop/util/makefile.mk
index 93603838abe0..42386dbc53d0 100644
--- a/sysui/desktop/util/makefile.mk
+++ b/sysui/desktop/util/makefile.mk
@@ -57,7 +57,7 @@ ALLTAR: $(RPMTARFILES) $(DEBTARFILES)
 
 $(RPMTARFILES) : $(PKGDIR)
     $(MKDIRHIER) $(@:d)
-    tar -C $(PKGDIR:d:d) -cf - $(PKGDIR:f)$/{$(shell @cd $(PKGDIR); ls $(@:b:b:s/-/ /:1)*)} | gzip > $@
+    tar -C $(PKGDIR:d:d) -cf - $(PKGDIR:f)$/{$(shell cd $(PKGDIR); ls $(@:b:b:s/-/ /:1)*.rpm)} | gzip > $@
 
 .ENDIF # "$(TARFILE)" != ""