From c10c07701a57d5e13fb47312615a946d51fc3b3b Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Sun, 12 Dec 2010 20:54:39 +0100
Subject: fix broffice branding packages (fdo#32229)

- rename the packages from broffice.org to broffice
- add /opt/broffice compat symlink
---
 sysui/desktop/freedesktop/freedesktop-menus.spec |  4 ++++
 sysui/desktop/mandriva/mandriva-menus.spec       |  7 ++++++-
 sysui/desktop/productversion.mk                  | 12 ++++++------
 sysui/desktop/redhat/redhat-menus.spec           |  5 +++++
 sysui/desktop/share/create_tree.sh               |  6 +++++-
 sysui/desktop/suse/suse-menus.spec               |  5 +++++
 6 files changed, 31 insertions(+), 8 deletions(-)

(limited to 'sysui')

diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 01bec9ffe734..30c2dd61e839 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -318,6 +318,10 @@ 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
+# compat symlinks
+%attr(0755, root, root) /opt/%unixfilename
+%endif
 %attr(0755, root, root) /usr/bin/*
 /usr/share/applications/%unixfilename-base.desktop
 /usr/share/applications/%unixfilename-calc.desktop
diff --git a/sysui/desktop/mandriva/mandriva-menus.spec b/sysui/desktop/mandriva/mandriva-menus.spec
index f02a468ea088..f06878857776 100644
--- a/sysui/desktop/mandriva/mandriva-menus.spec
+++ b/sysui/desktop/mandriva/mandriva-menus.spec
@@ -309,7 +309,12 @@ fi
 
 
 %files
-%attr(0755,root,root) /usr/bin/%unixfilename
+%if %unixfilename != libreoffice
+# compat symlinks
+%attr(0755,root,root) /opt/%unixfilename
+%attr(0755,root,root) /usr/bin/libreoffice
+%attr(0755,root,root) /usr/bin/libreoffice-printeradmin
+%endif
 %attr(0755,root,root) %verify(not size md5) /usr/bin/%unixfilename
 %attr(0755,root,root) /usr/bin/%unixfilename-printeradmin
 %defattr(0644, root, root)
diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index e9bd131eff4f..6f41333370dc 100644
--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
@@ -65,11 +65,11 @@ PKGVERSION.libreoffice = $(PKGVERSION)
 UNIXFILENAME.libreoffice = $(PRODUCTNAME.libreoffice:l)
 ICONPREFIX.libreoffice = $(UNIXFILENAME.libreoffice:s/.//g)
 
-PRODUCTNAME.broffice.org = BrOffice.org
-PRODUCTVERSION.broffice.org = $(PRODUCTVERSION)
-PRODUCTVERSIONSHORT.broffice.org = $(PRODUCTVERSIONSHORT)
-PKGVERSION.broffice.org = $(PKGVERSION)
-UNIXFILENAME.broffice.org = $(PRODUCTNAME.broffice.org:l)
-ICONPREFIX.broffice.org = $(UNIXFILENAME.broffice.org:s/.//g)
+PRODUCTNAME.broffice = BrOffice
+PRODUCTVERSION.broffice = $(PRODUCTVERSION)
+PRODUCTVERSIONSHORT.broffice = $(PRODUCTVERSIONSHORT)
+PKGVERSION.broffice = $(PKGVERSION)
+UNIXFILENAME.broffice = $(PRODUCTNAME.broffice:l)
+ICONPREFIX.broffice = $(UNIXFILENAME.broffice:s/.//g)
 
 
diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec
index ce9cdc29ab64..663fe2314573 100644
--- a/sysui/desktop/redhat/redhat-menus.spec
+++ b/sysui/desktop/redhat/redhat-menus.spec
@@ -268,7 +268,12 @@ for theme in gnome hicolor locolor; do
 done
 
 %files
+%if %unixfilename != libreoffice
+# compat symlinks
+%attr(0755,root,root) /opt/%unixfilename
 %attr(0755,root,root) /usr/bin/libreoffice
+%attr(0755,root,root) /usr/bin/libreoffice-printeradmin
+%endif
 %attr(0755,root,root) %verify(not size md5) /usr/bin/%unixfilename
 %attr(0755,root,root) /usr/bin/%unixfilename-printeradmin
 %defattr(0644, root, root)
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 60aff1738d5d..f8a2712d5b9a 100644
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -92,13 +92,17 @@ fi
 
 mkdir -p ${DESTDIR}/usr/bin
 
-office_root=/opt/${PREFIX}
+office_prefix=/opt
+office_root=${office_prefix}/${PREFIX}
 
 cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX}
 cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 
 if test "${PREFIX}" != libreoffice ; then
+    # compat symlinks
+    mkdir -p ${DESTDIR}${office_prefix}
+    ln -sf libreoffice ${DESTDIR}${office_root}
     ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice
     ln -sf /usr/bin/${PREFIX}-printeradmin ${DESTDIR}/usr/bin/libreoffice-printeradmin
 fi
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index 52df81fc8096..fe709694c3fd 100644
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
@@ -280,7 +280,12 @@ for themedir in /opt/gnome/share/icons/gnome /opt/gnome/share/icons/hicolor /opt
 done
 
 %files
+%if %unixfilename != libreoffice
+# compat symlinks
+%attr(0755,root,root) /opt/%unixfilename
 %attr(0755,root,root) /usr/bin/libreoffice
+%attr(0755,root,root) /usr/bin/libreoffice-printeradmin
+%endif
 %attr(0755,root,root) %verify(not size md5) /usr/bin/%unixfilename
 %attr(0755,root,root) /usr/bin/%unixfilename-printeradmin
 %defattr(0644, root, root)
-- 
cgit v1.2.3