summaryrefslogtreecommitdiff
path: root/sysui
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2005-03-23 08:13:08 +0000
committerVladimir Glazounov <vg@openoffice.org>2005-03-23 08:13:08 +0000
commit1a3ccdfe55ad92191173d486abc0af5f9523d125 (patch)
treeadc25b586cc17a30591bafd75a0b3cf5cf93121f /sysui
parentbe82288e62633d4f058c19564c3e2e15cade3f14 (diff)
INTEGRATION: CWS sysui06 (1.13.2); FILE MERGED
2005/03/08 14:37:48 obr 1.13.2.1: #i44335# /etc/SuSE-release for SuSE, SLES and Novell Linux Desktop
Diffstat (limited to 'sysui')
-rw-r--r--sysui/desktop/suse/suse-menus.spec5
1 files changed, 4 insertions, 1 deletions
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index fa2724518687..246ea9b5386d 100644
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
@@ -5,7 +5,10 @@ Release: 1
Group: Office
License: LGPL, SISSL
AutoReqProv: no
-Requires: openofficeorg-core01, suse-release
+# /etc/SuSE-release for SuSE, SLES and Novell Linux Desktop ..
+Requires: openofficeorg-core01, /etc/SuSE-release
+# .. but not for Sun JDS
+Conflicts: SunDesktopVersion
%define _unpackaged_files_terminate_build 0
%description
OpenOffice.org desktop integration