INTEGRATION: CWS sysui09 (1.14.22); FILE MERGED

2005/07/10 12:37:39 obr 1.14.22.6: openoffice.org.xml now copied
2005/07/08 08:36:07 obr 1.14.22.5: #i51121,#i49368# delay further unification of package builds to a later CWS
2005/07/05 13:37:09 obr 1.14.22.4: - made spec files independant from version/release, so that they can be
  used as prerequisite for the rpms.
- added openoffice.org.xml to suse-menus.spec
2005/07/05 09:43:46 obr 1.14.22.3: #i51121,#i49368# unified shared-mime-info creation and added it to redhat- and suse-menus package
2005/07/05 08:42:20 obr 1.14.22.2: - replaced explicit file list with globs where possible
- pass version and release via command line
2005/07/05 07:05:31 obr 1.14.22.1: - introduced virtual package openofficeorg-desktop-integration.
- removed Windows style HighContrast icons from packages
- moved build arch parameter to spec files
- introduced debian/control

1 files changed, 22 insertions, 22 deletions

diff --git a/sysui/desktop/suse/makefile.mk b/sysui/desktop/suse/makefile.mk
index f9d53fd828..dd9be7ec00 100644
--- a/sysui/desktop/suse/makefile.mk
+++ b/sysui/desktop/suse/makefile.mk
@@ -103,7 +103,7 @@ MIMELIST = \
     oasis-database \
     oasis-web-template \
 
-HCMIMEICONLIST = \
+MIMEICONLIST = \
     oasis-text \
     oasis-text-template \
     oasis-spreadsheet \
@@ -115,9 +115,7 @@ HCMIMEICONLIST = \
     oasis-formula \
     oasis-master-document \
     oasis-database \
-    oasis-web-template
-
-MIMEICONLIST = $(HCMIMEICONLIST) \
+    oasis-web-template \
     text \
     text-template \
     spreadsheet \
@@ -140,10 +138,6 @@ GNOMEICONLIST = \
     {16x16 32x32 48x48}/apps/$(ICONPREFIX)-{$(LAUNCHERLIST)}.png \
     {16x16 32x32 48x48}/mimetypes/$(ICONPREFIX)-{$(MIMEICONLIST)}.png
 
-HCICONLIST = \
-    HighContrast/{16x16 32x32 48x48}/apps/$(ICONPREFIX)-{$(LAUNCHERLIST)}.png \
-    HighContrast/{16x16 32x32 48x48}/mimetypes/$(ICONPREFIX)-{$(HCMIMEICONLIST)}.png
-    
 KDEICONLIST = \
     hicolor/{16x16 32x32 48x48}/apps/$(ICONPREFIX)-{$(LAUNCHERLIST)}.png \
     hicolor/{16x16 32x32 48x48}/mimetypes/$(ICONPREFIX)-{$(MIMEICONLIST)}.png \
@@ -160,17 +154,18 @@ RPMDEPN = \
     $(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)/opt/gnome/share/application-registry/$(UNIXFILENAME).applications \
     $(MISC)/$(TARGET)/opt/gnome/share/mime-info/$(UNIXFILENAME).keys \
     $(MISC)/$(TARGET)/opt/gnome/share/mime-info/$(UNIXFILENAME).mime \
     $(MISC)/$(TARGET)/opt/kde3/share/mimelnk/application.flag \
     $(MISC)/$(TARGET)/opt/gnome/share/icons/gnome/{$(GNOMEICONLIST)} \
-    $(MISC)/$(TARGET)/opt/gnome/share/icons/{$(HCICONLIST)} \
     $(MISC)/$(TARGET)/opt/kde3/share/icons/{$(KDEICONLIST)} 
         
 RPMDIR  = $(shell cd $(BIN); pwd)
 ULFDIR = $(COMMONMISC)$/desktopshare
-    
+SPECFILE = $(MISC)/$(TARGET)-menus.spec
+
 .ENDIF
 
 # --- Targets -------------------------------------------------------
@@ -197,10 +192,6 @@ $(MISC)/$(TARGET)/opt/gnome/share/icons/gnome/{$(GNOMEICONLIST)} : ../icons/hico
     @$(MKDIRHIER) $(@:d)
     @$(COPY) $< $@
 
-$(MISC)/$(TARGET)/opt/gnome/share/icons/{$(HCICONLIST)} : ../icons/$$(@:d:d:d:d:d:d:f)/$$(@:d:d:d:d:f)/$$(@:d:d:f)/$$(@:f:s/$(ICONPREFIX)-//)
-    @$(MKDIRHIER) $(@:d)
-    @$(COPY) $< $@
-
 $(MISC)/$(TARGET)/opt/kde3/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) $< $@
@@ -235,6 +226,10 @@ $(MISC)/$(TARGET)/opt/gnome/share/application-registry/$(UNIXFILENAME).applicati
     @echo ---------------------------------
     @cat ../mimetypes/openoffice.applications | tr -d "\015" | sed -e "s/openoffice/$(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
@@ -253,14 +248,19 @@ $(MISC)/$(TARGET)/etc/$(UNIXFILENAME) :
     @$(MKDIRHIER) $(@:d)
     @touch $@
 
-# --- packaging ---------------------------------------------------
+# --- specfile ----------------------------------------------------
 
-$(RPMFILE) : $(RPMDEPN) $(TARGET)-menus.spec
-    $(MKDIRHIER) $(@:d)
-    @cat $(TARGET)-menus.spec | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME)/g" \
-        -e "s/%ICONPREFIX/$(ICONPREFIX)/" -e "s/Version: .*/Version: $(PKGVERSION)/" \
-        -e "s/Release: .*/Release: $(PKGREV)/" > $(MISC)/$(TARGET)-menus.spec
-    @echo "%define _rpmdir $(RPMDIR)" >> $(MISC)/$(TARGET)-menus.spec
-    @$(RPM) -bb $(MISC)/$(TARGET)-menus.spec --buildroot $(LAUNCHERDIR) --target noarch
+$(SPECFILE) : $$(@:f)
+    @cat $< | tr -d "\015" >$@
+
+# --- packaging ---------------------------------------------------
+    
+.PHONY $(RPMFILE) : $(RPMDEPN) $(SPECFILE)
+    -$(RM) $(@:d)/$(PKGNAME)-*
+    @$(RPM) -bb $(MISC)/$(TARGET)-menus.spec --buildroot $(LAUNCHERDIR) \
+        --define "_builddir $(shell cd ../share; pwd)" \
+        --define "_rpmdir $(RPMDIR)" \
+        --define "unixfilename $(UNIXFILENAME)" \
+        --define "version $(PKGVERSION)" --define "release $(PKGREV)"
 
 .ENDIF