diff options
-rw-r--r-- | officecfg/util/makefile.mk | 3 | ||||
-rw-r--r-- | sysui/desktop/mandriva/mandriva-menus.spec | 2 | ||||
-rw-r--r-- | sysui/desktop/redhat/redhat-menus.spec | 2 | ||||
-rw-r--r-- | sysui/desktop/solaris/makefile.mk | 2 | ||||
-rw-r--r-- | 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 |