INTEGRATION: CWS nativebroffice_SRC680 (1.22.2.1.2); FILE MERGED

2007/03/14 12:32:19 obr 1.22.2.1.2.2: #i74459# renamed flag file
2007/03/14 12:09:45 obr 1.22.2.1.2.1: #i74459# multi product support

1 files changed, 7 insertions, 188 deletions

diff --git a/sysui/desktop/redhat/makefile.mk b/sysui/desktop/redhat/makefile.mk
index 84c6704d0131..27f7cb7ef55a 100644
--- a/sysui/desktop/redhat/makefile.mk
+++ b/sysui/desktop/redhat/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.24 $
+#   $Revision: 1.25 $
 #
-#   last change: $Author: kz $ $Date: 2007-02-15 16:48:31 $
+#   last change: $Author: kz $ $Date: 2007-05-10 15:26:21 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -48,202 +48,21 @@ TARGET=redhat
 .INCLUDE :  ../productversion.mk
 
 # --- Files --------------------------------------------------------
-
-# GNOME does not like icon names with more than one '.'
-ICONPREFIX = $(UNIXFILENAME:s/.//g)
-
-LAUNCHERLIST = writer calc draw impress math base printeradmin extension
-LAUNCHERDEPN = $(foreach,i,$(LAUNCHERLIST) $(UNIXFILENAME)-$i.desktop)
-LAUNCHERDIR  = $(ABSLOCALOUT)$/misc$/$(TARGET)
-
-MIMELIST = \
-    text \
-    text-template \
-    spreadsheet \
-    spreadsheet-template \
-    drawing \
-    drawing-template \
-    presentation \
-    presentation-template \
-    formula \
-    master-document \
-    oasis-text \
-    oasis-text-template \
-    oasis-spreadsheet \
-    oasis-spreadsheet-template \
-    oasis-drawing \
-    oasis-drawing-template \
-    oasis-presentation \
-    oasis-presentation-template \
-    oasis-formula \
-    oasis-master-document \
-    oasis-database \
-    oasis-web-template \
-    extension
-
-MIMEICONLIST = \
-    oasis-text \
-    oasis-text-template \
-    oasis-spreadsheet \
-    oasis-spreadsheet-template \
-    oasis-drawing \
-    oasis-drawing-template \
-    oasis-presentation \
-    oasis-presentation-template \
-    oasis-formula \
-    oasis-master-document \
-    oasis-database \
-    oasis-web-template \
-    text \
-    text-template \
-    spreadsheet \
-    spreadsheet-template \
-    drawing \
-    drawing-template \
-    presentation \
-    presentation-template \
-    formula \
-    master-document \
-    database \
-    extension
-
-GNOMEMIMEDEPN = ../mimetypes/{$(MIMELIST)}.keys ../mimetypes/openoffice.mime 
-KDEMIMEDEPN = ../mimetypes/{$(MIMELIST)}.desktop
-
-KDEMIMEFLAGFILE = \
-    $(MISC)/$(TARGET)/usr/share/mimelnk/application.flag
-        
-GNOMEICONLIST = \
-    {16x16 32x32 48x48}/apps/$(ICONPREFIX)-{$(LAUNCHERLIST)}.png \
-    {16x16 32x32 48x48}/mimetypes/$(ICONPREFIX)-{$(MIMEICONLIST)}.png
-
-KDEICONLIST = \
-    hicolor/{16x16 32x32 48x48}/apps/$(ICONPREFIX)-{$(LAUNCHERLIST)}.png \
-    hicolor/{16x16 32x32 48x48}/mimetypes/$(ICONPREFIX)-{$(MIMEICONLIST)}.png \
-    locolor/{16x16 32x32}/apps/$(ICONPREFIX)-{$(LAUNCHERLIST)}.png \
-    locolor/{16x16 32x32}/mimetypes/$(ICONPREFIX)-{$(MIMEICONLIST)}.png
-
+ 
 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
 
-PKGNAME=$(shell sed -n -e 's/^Name: //p' $(TARGET)-menus.spec)
-RPMFILE=$(PKGDIR)/$(PKGNAME)-$(PKGVERSION)-$(PKGREV).noarch.rpm
-RPMDEPN = \
-    $(MISC)/$(TARGET)/etc/$(UNIXFILENAME) \
-    $(MISC)/$(TARGET)/usr/bin/soffice \
-    $(MISC)/$(TARGET)/usr/bin/unopkg \
-    $(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME) \
-    $(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME)-printeradmin \
-    $(MISC)/$(TARGET)/usr/share/applications/{$(LAUNCHERDEPN)} \
-    $(MISC)/$(TARGET)/usr/share/mime/packages/openoffice.org.xml \
-    $(MISC)/$(TARGET)/usr/share/applnk-$(TARGET)/Office/{$(LAUNCHERDEPN)} \
-    $(MISC)/$(TARGET)/usr/share/application-registry/$(UNIXFILENAME).applications \
-    $(MISC)/$(TARGET)/usr/share/mime-info/$(UNIXFILENAME).keys \
-    $(MISC)/$(TARGET)/usr/share/mime-info/$(UNIXFILENAME).mime \
-    $(MISC)/$(TARGET)/usr/share/mimelnk/application.flag \
-    $(MISC)/$(TARGET)/usr/share/icons/gnome/{$(GNOMEICONLIST)} \
-    $(MISC)/$(TARGET)/usr/share/icons/{$(KDEICONLIST)} 
-        
-.IF "$(WITH_LANG)"!=""
-ULFDIR = $(COMMONMISC)$/desktopshare
-.ELSE			# "$(WITH_LANG)"!=""
-ULFDIR:=..$/share
-.ENDIF			# "$(WITH_LANG)"!=""
+SPECFILE=$(MISC)$/$(TARGET)-menus.spec
+RPMFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$i)-$(PKGREV).noarch.rpm)
 
 .ENDIF
 
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
+.INCLUDE : ../tg_rpm.mk
 
 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
 
-ALLTAR : $(RPMFILE) 
-
-# --- launcher ------------------------------------------------------
-
-%.desktop :
-    @$(MKDIRHIER) $(@:d)
-    ln -sf $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
-
-# --- icons --------------------------------------------------------
-
-#
-# This target is responsible for copying the GNOME icons to their package specific target
-# e.g. $(LAUNCHERDIR)/usr/share/icons/gnome/16x16/apps/openoffice-writer.png
-#
-$(MISC)/$(TARGET)/usr/share/icons/gnome/{$(GNOMEICONLIST)} : ../icons/hicolor/$$(@:d:d:d:d:f)/$$(@:d:d:f)/$$(@:f:s/$(ICONPREFIX)-//)
-    @$(MKDIRHIER) $(@:d)
-    @$(COPY) $< $@
-
-$(MISC)/$(TARGET)/usr/share/icons/{$(KDEICONLIST)} : ../icons/$$(@:d:d:d:d:d:d:f)/$$(@:d:d:d:d:f)/$$(@:d:d:f)/$$(@:f:s/$(ICONPREFIX)-//)
-    @$(MKDIRHIER) $(@:d)
-    @$(COPY) $< $@
-    
-# --- mime types ---------------------------------------------------
-
-$(MISC)/$(TARGET)/usr/share/mime-info/$(UNIXFILENAME).keys : $(GNOMEMIMEDEPN) ../productversion.mk ../share/brand.pl ../share/translate.pl $(ULFDIR)/documents.ulf
-    @$(MKDIRHIER) $(@:d)
-    @echo Creating GNOME .keys file ..
-    @echo ---------------------------------
-    @$(PERL) ../share/brand.pl -p $(PRODUCTNAME) -u $(UNIXFILENAME) --iconprefix "$(ICONPREFIX)-" $(GNOMEMIMEDEPN) $(MISC)/$(TARGET)
-    @$(PERL) ../share/translate.pl -p $(PRODUCTNAME) -d $(MISC)/$(TARGET) --ext "keys" --key "description"  $(ULFDIR)/documents.ulf
-    @cat $(MISC)/$(TARGET)/{$(MIMELIST)}.keys > $@
-
-$(MISC)/$(TARGET)/usr/share/mime-info/$(UNIXFILENAME).mime : ../mimetypes/openoffice.mime
-    @$(MKDIRHIER) $(@:d)
-    @echo Creating GNOME .mime file ..
-    @echo ---------------------------------
-    @cat $< | tr -d "\015" > $@
-
-$(KDEMIMEFLAGFILE) : $(KDEMIMEDEPN) ../productversion.mk ../share/brand.pl ../share/translate.pl $(ULFDIR)/documents.ulf
-    @$(MKDIRHIER) $(@:db)
-    @echo Creating KDE mimelnk entries ..
-    @echo ---------------------------------
-    @$(PERL) ../share/brand.pl -p "$(PRODUCTNAME)" -u $(UNIXFILENAME) --prefix "$(UNIXFILENAME)-" --iconprefix "$(ICONPREFIX)-" $(KDEMIMEDEPN) $(@:db)
-    @$(PERL) ../share/translate.pl -p "$(PRODUCTNAME)" -d $(@:db) --prefix "$(UNIXFILENAME)-" --ext "desktop" --key "Comment" $(ULFDIR)/documents.ulf
-    @touch $@    
-
-$(MISC)/$(TARGET)/usr/share/application-registry/$(UNIXFILENAME).applications : ../productversion.mk ../mimetypes/openoffice.applications
-    @$(MKDIRHIER) $(@:d)
-    @echo Creating GNOME .applications file ..
-    @echo ---------------------------------
-    @cat ../mimetypes/openoffice.applications | tr -d "\015" | sed -e "s/OFFICENAME/$(UNIXFILENAME)/" -e "s/%PRODUCTNAME/$(LONGPRODUCTNAME)/" > $@
-
-$(MISC)/$(TARGET)/usr/share/mime/packages/openoffice.org.xml : $(COMMONMISC)$/desktopshare/openoffice.org.xml
-    @$(MKDIRHIER) $(@:d)
-    @cp $< $@
-
-# --- script ------------------------------------------------------
-
-$(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME) : ../share/openoffice.sh
-    @$(MKDIRHIER) $(@:d)
-    @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME)/g" > $@
-
-$(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME)-printeradmin : ../share/printeradmin.sh
-    @$(MKDIRHIER) $(@:d)
-    @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME)/g" > $@
-
-$(MISC)/$(TARGET)/usr/bin/soffice : 
-    @$(MKDIRHIER) $(@:d)
-    @ln -sf /etc/$(UNIXFILENAME)/program/soffice $@
-
-$(MISC)/$(TARGET)/usr/bin/unopkg : 
-    @$(MKDIRHIER) $(@:d)
-    @ln -sf /etc/$(UNIXFILENAME)/program/unopkg $@
-
-$(MISC)/$(TARGET)/etc/$(UNIXFILENAME) :
-    @$(MKDIRHIER) $(@:d)
-    @touch $@
+$(RPMFILES) : $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
 
-# --- packaging ---------------------------------------------------
-    
-$(RPMFILE) : $(RPMDEPN) $(MISC)/$(TARGET)-menus.spec
-    @-$(MKDIRHIER) $(@:d)
-    -$(RM) $(@:d)$/$(PKGNAME)-* $(BIN)$/noarch$/$(PKGNAME)-*
-    @$(RPM) -bb $(MISC)/$(TARGET)-menus.spec $(RPMMACROS) \
-        --buildroot $(LAUNCHERDIR) \
-        --define "_builddir $(shell cd ../share; pwd)" \
-        --define "unixfilename $(UNIXFILENAME)" \
-        --define "version $(PKGVERSION)" --define "release $(PKGREV)" && $(TOUCH) $(MISC)$/$(TARGET).rpmflag
-    @$(TYPE) $(MISC)$/$(TARGET).rpmflag || echo "ERROR: packing $(TARGET) failed! "
 .ENDIF