From 0dba79793564a0d8c9aa281671fac2724654e458 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Thu, 19 Feb 2009 07:29:28 +0000 Subject: CWS-TOOLING: integrate CWS ause099 2009-01-29 12:30:57 +0100 hjs r267116 : #i98365# fix unsetting g+s bit 2009-01-23 14:21:19 +0100 hjs r266819 : #i40246# - cleanup 2009-01-23 14:14:07 +0100 hjs r266818 : #i40246# - fix quoting of final echo line 2009-01-23 12:42:33 +0100 hjs r266807 : #i98365# leave higher bits alone 2009-01-23 11:23:42 +0100 rt r266799 : Header 2009-01-22 19:14:25 +0100 hjs r266753 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:22:18 +0100 hjs r266737 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:20:54 +0100 hjs r266736 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:20:24 +0100 hjs r266735 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:08:33 +0100 hjs r266734 : #i40246# renamed variable 2009-01-22 16:05:26 +0100 hjs r266733 : #i40246# renamed variable 2009-01-20 17:46:54 +0100 hjs r266610 : #i98290# cleanup 2009-01-19 19:32:19 +0100 hjs r266522 : CWS-TOOLING: rebase CWS ause099 to trunk@266428 (milestone: DEV300:m39) 2008-12-08 21:00:09 +0100 hjs r265049 : CWS-TOOLING: rebase CWS ause099 to trunk@264807 (milestone: DEV300:m37) 2008-11-27 18:25:18 +0100 hjs r264513 : #i40246# - support multiple patches per archive 2008-11-17 19:00:12 +0100 hjs r263738 : CWS-TOOLING: rebase CWS ause099 to trunk@263288 (milestone: DEV300:m35) --- officecfg/util/makefile.mk | 3 +++ sysui/desktop/mandriva/mandriva-menus.spec | 2 +- sysui/desktop/redhat/redhat-menus.spec | 2 +- sysui/desktop/solaris/makefile.mk | 2 +- sysui/desktop/suse/suse-menus.spec | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/officecfg/util/makefile.mk b/officecfg/util/makefile.mk index 36df0df36ad0..d022c9253798 100644 --- a/officecfg/util/makefile.mk +++ b/officecfg/util/makefile.mk @@ -45,6 +45,9 @@ $(MISC)$/$(TARGET)_delzip : $(BIN)$/registry_{$(alllangiso)}.zip : $(MISC)$/$(TARGET)_delzip cd $(MISC)$/registry$/res$/$(@:b:s/registry_//) && zip -ru ..$/..$/..$/..$/bin$/registry_$(@:b:s/registry_//).zip org/* +.IF "$(USE_SHELL)"!="4nt" + $(PERL) -w $(SOLARENV)$/bin$/cleanzip.pl $@ +.ENDIF # "$(USE_SHELL)"!="4nt" ALLTAR: \ $(MISC)$/$(TARGET)_delzip \ diff --git a/sysui/desktop/mandriva/mandriva-menus.spec b/sysui/desktop/mandriva/mandriva-menus.spec index c2204f4b4973..5be889e3924e 100644 --- a/sysui/desktop/mandriva/mandriva-menus.spec +++ b/sysui/desktop/mandriva/mandriva-menus.spec @@ -289,7 +289,7 @@ GenerateMenu "%unixfilename-printeradmin" \ "core02" %clean -rm -rf $RPM_BUILD_ROOT/* +rm -rf $RPM_BUILD_ROOT %preun # remove from /etc/mailcap only on de-install diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec index a5b09ceaac84..4ad74ad1b31f 100644 --- a/sysui/desktop/redhat/redhat-menus.spec +++ b/sysui/desktop/redhat/redhat-menus.spec @@ -37,7 +37,7 @@ for i in `cat launcherlist`; do done %clean -rm -rf $RPM_BUILD_ROOT/* +rm -rf $RPM_BUILD_ROOT %triggerin -- %pkgprefix, %pkgprefix-writer, %pkgprefix-calc, %pkgprefix-draw, %pkgprefix-impress, %pkgprefix-base, %pkgprefix-math if [ -x /usr/bin/update-desktop-database ]; then diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk index 427545619532..25cf88ea32fb 100644 --- a/sysui/desktop/solaris/makefile.mk +++ b/sysui/desktop/solaris/makefile.mk @@ -127,6 +127,6 @@ $(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype pkgmk -l 1073741824 -r . -f $(MISC)$/$(@:b:b:s/-/ /:1)$/prototype -o -d $(PKGDIR) ARCH=$(PKGARCH) VERSION=$(PKGVERSION.$(@:b:s/-/ /:1)),REV=$(PKGREV).$(PKGDATESTRING) $(FASPAC) $(SOLARBINDIR)/faspac-so.sh -a -d $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)30-desktop-int @tar -cf - -C $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)30-desktop-int | gzip > $@ - @rm -rf $(PKGDIR)/$(@:b:b:s/-/ /:1:s/.//)-desktop-int30 + @rm -rf $(PKGDIR)/$(@:b:b:s/-/ /:1:s/.//)30-desktop-int .ENDIF diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec index fbb3ff231592..a1bd2b0359f1 100644 --- a/sysui/desktop/suse/suse-menus.spec +++ b/sysui/desktop/suse/suse-menus.spec @@ -36,7 +36,7 @@ export GNOME_MIME_THEME=hicolor ./create_tree.sh %clean -rm -rf $RPM_BUILD_ROOT/* +rm -rf $RPM_BUILD_ROOT %triggerin -- %pkgprefix, %pkgprefix-writer, %pkgprefix-calc, %pkgprefix-draw, %pkgprefix-impress, %pkgprefix-base, %pkgprefix-math if [ -x /opt/gnome/bin/update-desktop-database ]; then -- cgit v1.2.3