mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow to install desktop integration in Linux dev build

Browse Source 
The desktop integration searched for the package name by the dash "-"
delimiter on many locations. It was not easy to add support for
package names with the dash.

In addition, there was an inconsistence. Most package names used the
"libo-dev" prefix name but the ure packages used "lodev". It was
installed into the prefix /opt/lo-dev.

So, I remaned everything to "lodev". It removed the inconsistence
and solved solution with the dash.
This commit is contained in:
Petr Mladek
2011-12-05 19:32:00 +01:00
parent bee2841519
commit 8412548e73
8 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
instsetoo_native/util/openoffice.lst
View File

@@ -170,12 +170,12 @@ LibreOffice_Dev
{
variables
{
PRODUCTNAME LibO-dev
PRODUCTNAME LOdev
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0
UNIXBASISROOTNAME lo-dev
UNIXBASISROOTNAME lodev3.5
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -183,13 +183,14 @@ LibreOffice_Dev
ABOUTBOXPRODUCTVERSION 3.5.0
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX libobasis-dev
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
SOLSUREPACKAGEPREFIX lodev
REGISTRYLAYERNAME LayerDev
SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
ADDSYSTEMINTEGRATION 1
EVAL
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
@@ -227,7 +228,7 @@ LibreOffice_Dev
downloadname LibO-dev_{productversion}_{os}_install_{languages}
langpackdownloadname LibO_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibO_{productversion}_helppack_{os}_install_{languages}
include {solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
include {solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
}
}
@@ -325,18 +326,18 @@ LibreOffice_Dev_SDK
downloadname OOo-Dev-SDK_{packageversion}_{os}_install_{languages}
variables
{
PRODUCTNAME LibO-dev
PRODUCTNAME LOdev
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0
UNIXBASISROOTNAME lo-dev
UNIXBASISROOTNAME lodev3.5
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.5
PACKAGEVERSION 3.5.0
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX libobasis-dev
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
SOLSUREPACKAGEPREFIX lodev
REGISTRYLAYERNAME LayerDev
@@ -423,18 +424,18 @@ LibreOffice_Dev_Test
downloadname LO-Dev-Test_{packageversion}_{os}_install_{languages}
variables
{
PRODUCTNAME LibO-dev
PRODUCTNAME LOdev
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION alpha0
UNIXBASISROOTNAME lo-dev
UNIXBASISROOTNAME lodev3.5
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 3.5
PACKAGEVERSION 3.5.0
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX libobasis-dev
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
SOLSUREPACKAGEPREFIX lodev
REGISTRYLAYERNAME LayerDev

2
solenv/inc/productversion.mk
View File

@@ -25,7 +25,7 @@
#
#*************************************************************************
PRODUCTLIST = libreoffice oxygenoffice
PRODUCTLIST = libreoffice lodev oxygenoffice
# default values to minimize maintainance effort
PRODUCTVERSION = 3.5

2
sysui/desktop/freedesktop/freedesktop-menus.spec
View File

@@ -372,7 +372,7 @@ done
# glibc breaks rpm unless rpm is build with internal glob-matching (issue 49374)
# https://bugzilla.redhat.com/beta/show_bug.cgi?id=134362
%defattr(-, root, root)
%if "%unixfilename" != "libreoffice%productversion"
%if "%unixfilename" != "libreoffice%productversion" && "%unixfilename" != "lodev%productversion"
# compat symlinks
%attr(0755,root,root) /opt/%unixfilename
%endif

2
sysui/desktop/mandriva/mandriva-menus.spec
View File

@@ -317,7 +317,7 @@ fi
%files
%if "%unixfilename" != "libreoffice%productversion"
%if "%unixfilename" != "libreoffice%productversion" && "%unixfilename" != "lodev%productversion"
# compat symlinks
%attr(0755,root,root) /opt/%unixfilename
%attr(0755,root,root) /usr/bin/libreoffice%productversion

7
sysui/desktop/productversion.mk
View File

@@ -65,6 +65,13 @@ PKGVERSION.libreoffice = $(PKGVERSION)
UNIXFILENAME.libreoffice = $(PRODUCTNAME.libreoffice:l)$(PRODUCTVERSION.libreoffice)
ICONPREFIX.libreoffice = $(UNIXFILENAME.libreoffice:s/.//g)
PRODUCTNAME.lodev = LibreOfficeDev
PRODUCTVERSION.lodev = $(PRODUCTVERSION)
PRODUCTVERSIONSHORT.lodev = $(PRODUCTVERSIONSHORT)
PKGVERSION.lodev = $(PKGVERSION)
UNIXFILENAME.lodev = lodev$(PRODUCTVERSION.lodev)
ICONPREFIX.lodev = $(UNIXFILENAME.lodev:s/.//g)
PRODUCTNAME.oxygenoffice = OxygenOffice
PRODUCTVERSION.oxygenoffice = $(PRODUCTVERSION)
PRODUCTVERSIONSHORT.oxygenoffice = $(PRODUCTVERSIONSHORT)

7
sysui/desktop/share/create_tree.sh
View File

@@ -53,7 +53,7 @@ ln -sf "${office_root}/program/soffice" "${DESTDIR}/usr/bin/${PREFIX}"
cp printeradmin.sh "${DESTDIR}/usr/bin/${PREFIX}-printeradmin"
chmod 0755 "${DESTDIR}/usr/bin/${PREFIX}-printeradmin"
if test "${PREFIX}" != libreoffice${PRODUCTVERSION} ; then
if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != lodev${PRODUCTVERSION} ; then
# compat symlinks
mkdir -p "${DESTDIR}${office_prefix}"
ln -sf libreoffice${PRODUCTVERSION} "${DESTDIR}${office_root}"
@@ -61,9 +61,10 @@ if test "${PREFIX}" != libreoffice${PRODUCTVERSION} ; then
ln -sf /usr/bin/${PREFIX}-printeradmin "${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}-printeradmin"
fi
test "${PREFIX}" = lodev${PRODUCTVERSION} && mime_def_file="lodev${PRODUCTVERSION}.xml" || mime_def_file="libreoffice${PRODUCTVERSION}.xml"
mkdir -p "${DESTDIR}/usr/share/mime/packages"
cp openoffice.org.xml "${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml"
chmod 0644 "${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml"
cp openoffice.org.xml "${DESTDIR}/usr/share/mime/packages/$mime_def_file"
chmod 0644 "${DESTDIR}/usr/share/mime/packages/$mime_def_file"
mkdir -p "${DESTDIR}/usr/share/applications"
for i in `cat launcherlist`; do

8
sysui/desktop/share/makefile.mk
View File

@@ -150,7 +150,7 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
@@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f)
@echo Creating desktop entries for $(@:f) ..
@echo ---------------------------------
@$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$(ICONPREFIX.libreoffice)-' $< $(@:db).$(INPATH).$(@:f)
@$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$(ICONPREFIX.$(@:d:d:f))-' $< $(@:db).$(INPATH).$(@:f)
@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
@@ -180,7 +180,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys : ../mimetypes/{$(MIMELIST)}.ke
@@-$(MKDIRHIER) $(@:d)
@echo Creating GNOME .keys file for $(@:d:d:f) ..
@echo ---------------------------------
@$(PERL) brand.pl -p $(PRODUCTNAME.$(@:d:d:f)) -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix '$(ICONPREFIX.libreoffice)-' $< $(MISC)/$(@:d:d:f)
@$(PERL) brand.pl -p $(PRODUCTNAME.$(@:d:d:f)) -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix '$(ICONPREFIX.$(@:d:d:f))-' $< $(MISC)/$(@:d:d:f)
@$(PERL) translate.pl -p $(PRODUCTNAME.$(@:d:d:f)) -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf
@cat $(MISC)/$(@:d:d:f)/{$(MIMELIST)}.keys > $@.$(INPATH)
@mv -f $@.$(INPATH) $@
@@ -208,7 +208,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/mimelnklist : ../mimetypes/{$(MIMELIST)}.deskto
@@-$(MKDIRHIER) $(@:db).$(INPATH)
@echo Creating KDE mimelnk entries for $(@:d:d:f) ..
@echo ---------------------------------
@$(PERL) brand.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix '$(ICONPREFIX.libreoffice)-' $< $(@:db).$(INPATH)
@$(PERL) brand.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix '$(ICONPREFIX.$(@:d:d:f))-' $< $(@:db).$(INPATH)
@$(PERL) ../share/translate.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/documents.ulf
@mv -f $(@:db).$(INPATH)/* $(@:d)
@rmdir $(@:db).$(INPATH)
@@ -222,7 +222,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh : $$(@:f)
@@-$(MKDIRHIER) $(@:d)
@echo "#!/bin/bash" > $@.$(INPATH)
@echo "PREFIX=$(UNIXFILENAME.$(@:d:d:f))" >> $@.$(INPATH)
@echo "ICON_PREFIX=$(ICONPREFIX.libreoffice)" >> $@.$(INPATH)
@echo "ICON_PREFIX=$(ICONPREFIX.$(@:d:d:f))" >> $@.$(INPATH)
@echo "ICON_SOURCE_DIR=../../../desktop/icons" >> $@.$(INPATH)
@echo "PRODUCTVERSION=$(PRODUCTVERSION.$(@:d:d:f))" >> $@.$(INPATH)
@cat $< >> $@.$(INPATH)

2
sysui/desktop/suse/suse-menus.spec
View File

@@ -338,7 +338,7 @@ for themedir in /opt/gnome/share/icons/gnome /opt/gnome/share/icons/hicolor /opt
done
%files
%if "%unixfilename" != "libreoffice%productversion"
%if "%unixfilename" != "libreoffice%productversion" && "%unixfilename" != "lodev%productversion"
# compat symlinks
%attr(0755,root,root) /opt/%unixfilename
%attr(0755,root,root) /usr/bin/libreoffice%productversion