summaryrefslogtreecommitdiff
path: root/sysui
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2005-03-08 14:38:24 +0000
committerVladimir Glazounov <vg@openoffice.org>2005-03-08 14:38:24 +0000
commit474fac9ba60806133abe6682693640a9643f4624 (patch)
treecfb7d1c69d635ffc0c82c950e8d8d1c7d8c84a90 /sysui
parent558b69e8bd598e7298a9cd7f68d9b8e3f80b6ff5 (diff)
INTEGRATION: CWS sysui05 (1.10.6); FILE MERGED
2005/03/01 12:56:18 obr 1.10.6.2: RESYNC: (1.10-1.11); FILE MERGED 2005/02/25 08:49:09 obr 1.10.6.1: #i5704# added >>requires: redhat-release<< (also provided by fedora core)
Diffstat (limited to 'sysui')
-rw-r--r--sysui/desktop/redhat/redhat-menus.spec3
1 files changed, 1 insertions, 2 deletions
diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec
index 05f55ff85210..370cb9b69a82 100644
--- a/sysui/desktop/redhat/redhat-menus.spec
+++ b/sysui/desktop/redhat/redhat-menus.spec
@@ -5,8 +5,7 @@ Release: 1
Group: Office
License: LGPL, SISSL
AutoReqProv: no
-Requires: openofficeorg-core01
-Conflicts: suse-release
+Requires: openofficeorg-core01, redhat-release
%define _unpackaged_files_terminate_build 0
%description
OpenOffice.org desktop integration