summaryrefslogtreecommitdiff
path: root/sysui/desktop/suse
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
commit2014f019a4a93fbcf450454713a14ad247de5241 (patch)
treed145616379844a31a614121a0a1dadc331e0df19 /sysui/desktop/suse
parent76d4cec0c46f7cd7c282e403a69b2b0f99a3037b (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/desktop/suse')
-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 fa27245186..246ea9b538 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