From 1a3ccdfe55ad92191173d486abc0af5f9523d125 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 23 Mar 2005 08:13:08 +0000 Subject: 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 --- sysui/desktop/suse/suse-menus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3