summaryrefslogtreecommitdiff
path: root/sysui/desktop/mandriva
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-07-18 12:59:06 +0000
committerOliver Bolte <obo@openoffice.org>2005-07-18 12:59:06 +0000
commitff86f3ae1e86c5dd7c431767b428bb15d5ae15da (patch)
tree8fbce10f2023e2ceb335d190d30476e3dd47382c /sysui/desktop/mandriva
parent0617bfd6c49eda9eb9a20a578a413cb7055e1d16 (diff)
INTEGRATION: CWS sysui09 (1.2.26); FILE MERGED
2005/07/11 06:30:53 obr 1.2.26.6: #i50945# soffice link needs to exist 2005/07/10 12:53:08 obr 1.2.26.5: add iconprefix parameter 2005/07/08 08:39:10 obr 1.2.26.4: #i50945# added soffice link to mandriva-menus package 2005/07/05 13:37:07 obr 1.2.26.3: - 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 08:42:18 obr 1.2.26.2: - replaced explicit file list with globs where possible - pass version and release via command line 2005/07/05 07:05:26 obr 1.2.26.1: - introduced virtual package openofficeorg-desktop-integration. - removed Windows style HighContrast icons from packages - moved build arch parameter to spec files - introduced debian/control
Diffstat (limited to 'sysui/desktop/mandriva')
-rw-r--r--sysui/desktop/mandriva/makefile.mk42
1 files changed, 21 insertions, 21 deletions
diff --git a/sysui/desktop/mandriva/makefile.mk b/sysui/desktop/mandriva/makefile.mk
index 83d2190290ee..cfb4aa652687 100644
--- a/sysui/desktop/mandriva/makefile.mk
+++ b/sysui/desktop/mandriva/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 \
@@ -156,6 +150,7 @@ PKGNAME=$(shell sed -n -e 's/^Name: //p' $(TARGET)-menus.spec)
RPMFILE=$(BIN)/noarch/$(PKGNAME)-$(PKGVERSION)-$(PKGREV).noarch.rpm
RPMDEPN = \
$(MISC)/$(TARGET)/etc/$(UNIXFILENAME) \
+ $(MISC)/$(TARGET)/usr/bin/soffice \
$(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME) \
$(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME)-printeradmin \
$(MISC)/$(TARGET)/usr/share/applications/{$(LAUNCHERDEPN)} \
@@ -164,11 +159,11 @@ RPMDEPN = \
$(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/{$(HCICONLIST)} \
$(MISC)/$(TARGET)/usr/share/icons/{$(KDEICONLIST)}
-
+
RPMDIR = $(shell cd $(BIN); pwd)
ULFDIR = $(COMMONMISC)$/desktopshare
+SPECFILE = $(MISC)/$(TARGET)-menus.spec
.ENDIF
@@ -196,10 +191,6 @@ $(MISC)/$(TARGET)/usr/share/icons/gnome/{$(GNOMEICONLIST)} : ../icons/hicolor/$$
@$(MKDIRHIER) $(@:d)
@$(COPY) $< $@
-$(MISC)/$(TARGET)/usr/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)/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) $< $@
@@ -244,18 +235,27 @@ $(MISC)/$(TARGET)/usr/bin/$(UNIXFILENAME)-printeradmin : ../share/printeradmin.s
@$(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)/etc/$(UNIXFILENAME) :
@$(MKDIRHIER) $(@:d)
@touch $@
+# --- specfile ----------------------------------------------------
+
+$(SPECFILE) : $$(@:f)
+ @cat $< | tr -d "\015" >$@
+
# --- packaging ---------------------------------------------------
-$(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
+.PHONY $(RPMFILE) : $(RPMDEPN) $(SPECFILE)
+ -$(RM) $(@:d)/$(PKGNAME)-*
+ @$(RPM) -bb $(MISC)/$(TARGET)-menus.spec --buildroot $(LAUNCHERDIR) \
+ --define "_rpmdir $(RPMDIR)" \
+ --define "unixfilename $(UNIXFILENAME)" \
+ --define "iconprefix $(ICONPREFIX)" \
+ --define "version $(PKGVERSION)" --define "release $(PKGREV)"
.ENDIF