[Libreoffice-commits] core.git: instsetoo_native/util sysui/CustomTarget_share.mk sysui/desktop
Luboš Luňák
l.lunak at suse.cz
Sun Mar 3 05:00:14 PST 2013
instsetoo_native/util/openoffice.lst.in | 18 +++++++++---------
sysui/CustomTarget_share.mk | 6 +++---
sysui/desktop/freedesktop/freedesktop-menus.spec | 2 +-
sysui/desktop/mandriva/mandriva-menus.spec | 2 +-
sysui/desktop/share/create_tree.sh | 4 ++--
sysui/desktop/suse/suse-menus.spec | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit c1f8861c12e2f66592330a2926db840ede16ea8f
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Sun Mar 3 13:59:34 2013 +0100
fixes for renaming LOdev builds to LibreOfficeDev
Follow-up to 16826147188bd78d67b97863226f903cc24add71 .
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 48298d8..f2076cc 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -96,7 +96,7 @@ LibreOffice_Dev
PRODUCTNAME LibreOfficeDev
PRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
- UNIXBASISROOTNAME lodev at LIBO_VERSION_MAJOR@. at LIBO_VERSION_MINOR@
+ UNIXBASISROOTNAME libreofficedev at LIBO_VERSION_MAJOR@. at LIBO_VERSION_MINOR@
POSTVERSIONEXTENSION
BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
@@ -106,8 +106,8 @@ LibreOffice_Dev
BASEPRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
- UREPACKAGEPREFIX lodev
- SOLSUREPACKAGEPREFIX lodev
+ UREPACKAGEPREFIX libreofficedev
+ SOLSUREPACKAGEPREFIX libreofficedev
REGISTRYLAYERNAME LayerDev
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
@@ -193,15 +193,15 @@ LibreOffice_Dev_SDK
PRODUCTNAME LibreOfficeDev
PRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
- UNIXBASISROOTNAME lodev at LIBO_VERSION_MAJOR@. at LIBO_VERSION_MINOR@
+ UNIXBASISROOTNAME libreofficedev at LIBO_VERSION_MAJOR@. at LIBO_VERSION_MINOR@
POSTVERSIONEXTENSION SDK
BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER at .SDK
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
- UREPACKAGEPREFIX lodev
- SOLSUREPACKAGEPREFIX lodev
+ UREPACKAGEPREFIX libreofficedev
+ SOLSUREPACKAGEPREFIX libreofficedev
REGISTRYLAYERNAME LayerDev
DEVELOPMENTPRODUCT 1
PACK_INSTALLED 1
@@ -277,15 +277,15 @@ LibreOffice_Dev_Test
PRODUCTNAME LibreOfficeDev
PRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
- UNIXBASISROOTNAME lodev at LIBO_VERSION_MAJOR@. at LIBO_VERSION_MINOR@
+ UNIXBASISROOTNAME libreofficedev at LIBO_VERSION_MAJOR@. at LIBO_VERSION_MINOR@
POSTVERSIONEXTENSION TEST
BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER at .Test
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
- UREPACKAGEPREFIX lodev
- SOLSUREPACKAGEPREFIX lodev
+ UREPACKAGEPREFIX libreofficedev
+ SOLSUREPACKAGEPREFIX libreofficedev
REGISTRYLAYERNAME LayerDev
DEVELOPMENTPRODUCT 1
PACK_INSTALLED 1
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index 827d849..7a43a0e 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -102,14 +102,14 @@ ULFS := documents.ulf \
launcher_name.ulf
-PRODUCTLIST := libreoffice lodev oxygenoffice
+PRODUCTLIST := libreoffice libreofficedev oxygenoffice
PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO)
PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)
PRODUCTNAME.libreoffice := LibreOffice
-PRODUCTNAME.lodev := LibreOfficeDev
+PRODUCTNAME.libreofficeodev := LibreOfficeDev
PRODUCTNAME.oxygenoffice := OxygenOffice
UNIXFILENAME.libreoffice := $(PRODUCTNAME.libreoffice)$(PRODUCTVERSION)
-UNIXFILENAME.lodev := $(PRODUCTNAME.lodev)$(PRODUCTVERSION)
+UNIXFILENAME.libreofficedev := $(PRODUCTNAME.libreofficedev)$(PRODUCTVERSION)
UNIXFILENAME.oxygenoffice := $(PRODUCTNAME.oxygenoffice)$(PRODUCTVERSION)
$(eval $(call gb_CustomTarget_CustomTarget,sysui/share))
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 329693d..76fd7a7 100755
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -389,7 +389,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" && "%unixfilename" != "lodev%productversion"
+%if "%unixfilename" != "libreoffice%productversion" && "%unixfilename" != "libreofficedev%productversion"
# compat symlinks
%attr(0755,root,root) /opt/%unixfilename
%endif
diff --git a/sysui/desktop/mandriva/mandriva-menus.spec b/sysui/desktop/mandriva/mandriva-menus.spec
index 00afc1a..aff28fd 100755
--- a/sysui/desktop/mandriva/mandriva-menus.spec
+++ b/sysui/desktop/mandriva/mandriva-menus.spec
@@ -334,7 +334,7 @@ fi
%files
-%if "%unixfilename" != "libreoffice%productversion" && "%unixfilename" != "lodev%productversion"
+%if "%unixfilename" != "libreoffice%productversion" && "%unixfilename" != "libreofficedev%productversion"
# compat symlinks
%attr(0755,root,root) /opt/%unixfilename
%attr(0755,root,root) /usr/bin/libreoffice%productversion
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index ef9f32a..b7cc385 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -70,7 +70,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} -a "${PREFIX}" != lodev${PRODUCTVERSION} ; then
+if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != libreofficedev${PRODUCTVERSION} ; then
# compat symlinks
mkdir -p "${DESTDIR}${office_prefix}"
ln -sf libreoffice${PRODUCTVERSION} "${DESTDIR}${office_root}"
@@ -78,7 +78,7 @@ if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != lodev${PRO
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"
+test "${PREFIX}" = libreofficedev${PRODUCTVERSION} && mime_def_file="libreofficedev${PRODUCTVERSION}.xml" || mime_def_file="libreoffice${PRODUCTVERSION}.xml"
mkdir -p "${DESTDIR}/usr/share/mime/packages"
cp openoffice.org.xml "${DESTDIR}/usr/share/mime/packages/$mime_def_file"
chmod 0644 "${DESTDIR}/usr/share/mime/packages/$mime_def_file"
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index b00e966..ec950e6 100755
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
@@ -355,7 +355,7 @@ for themedir in /opt/gnome/share/icons/gnome /opt/gnome/share/icons/hicolor /opt
done
%files
-%if "%unixfilename" != "libreoffice%productversion" && "%unixfilename" != "lodev%productversion"
+%if "%unixfilename" != "libreoffice%productversion" && "%unixfilename" != "libreofficedev%productversion"
# compat symlinks
%attr(0755,root,root) /opt/%unixfilename
%attr(0755,root,root) /usr/bin/libreoffice%productversion
More information about the Libreoffice-commits
mailing list