You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2013/05/30 06:54:25 UTC
svn commit: r1487727 - in /openoffice/trunk/main/sysui/desktop:
freedesktop/freedesktop-menus.spec mandriva/mandriva-menus.spec
redhat/redhat-menus.spec suse/suse-menus.spec
Author: arielch
Date: Thu May 30 04:54:24 2013
New Revision: 1487727
URL: http://svn.apache.org/r1487727
Log:
i121968 - Add Obsoletes to RPM spec files
Modified:
openoffice/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec
openoffice/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec
openoffice/trunk/main/sysui/desktop/redhat/redhat-menus.spec
openoffice/trunk/main/sysui/desktop/suse/suse-menus.spec
Modified: openoffice/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec?rev=1487727&r1=1487726&r2=1487727&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec (original)
+++ openoffice/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec Thu May 30 04:54:24 2013
@@ -32,6 +32,11 @@ Conflicts: %pkgprefix-suse-menus
Conflicts: %pkgprefix-debian-menus
Conflicts: %pkgprefix-redhat-menus
Conflicts: %pkgprefix-mandriva-menus
+Obsoletes: openoffice.org3.0-freedesktop-menus
+Obsoletes: openoffice.org3.1-freedesktop-menus
+Obsoletes: openoffice.org3.2-freedesktop-menus
+Obsoletes: openoffice.org3.3-freedesktop-menus
+Obsoletes: openoffice.org3.4-freedesktop-menus
BuildArch: noarch
AutoReqProv: no
%define _binary_filedigest_algorithm 1
Modified: openoffice/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec?rev=1487727&r1=1487726&r2=1487727&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec (original)
+++ openoffice/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec Thu May 30 04:54:24 2013
@@ -23,6 +23,11 @@ Version: %version
Release: %release
Summary: %productname desktop integration
Name: %pkgprefix-mandriva-menus
+Obsoletes: openoffice.org3.0-mandriva-menus
+Obsoletes: openoffice.org3.1-mandriva-menus
+Obsoletes: openoffice.org3.2-mandriva-menus
+Obsoletes: openoffice.org3.3-mandriva-menus
+Obsoletes: openoffice.org3.4-mandriva-menus
Group: Office
License: ALv2
AutoReqProv: no
Modified: openoffice/trunk/main/sysui/desktop/redhat/redhat-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/redhat/redhat-menus.spec?rev=1487727&r1=1487726&r2=1487727&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/redhat/redhat-menus.spec (original)
+++ openoffice/trunk/main/sysui/desktop/redhat/redhat-menus.spec Thu May 30 04:54:24 2013
@@ -28,6 +28,11 @@ License: ALv2
Vendor: Apache Software Foundation
AutoReqProv: no
BuildArch: noarch
+Obsoletes: openoffice.org3.0-redhat-menus
+Obsoletes: openoffice.org3.1-redhat-menus
+Obsoletes: openoffice.org3.2-redhat-menus
+Obsoletes: openoffice.org3.3-redhat-menus
+Obsoletes: openoffice.org3.4-redhat-menus
Requires: redhat-release
Provides: openoffice-desktop-integration
%define _unpackaged_files_terminate_build 0
Modified: openoffice/trunk/main/sysui/desktop/suse/suse-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/suse/suse-menus.spec?rev=1487727&r1=1487726&r2=1487727&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/suse/suse-menus.spec (original)
+++ openoffice/trunk/main/sysui/desktop/suse/suse-menus.spec Thu May 30 04:54:24 2013
@@ -33,6 +33,11 @@ Requires: /etc/SuSE-release
# .. but not for Sun JDS
Conflicts: SunDesktopVersion
Provides: openoffice-desktop-integration
+Obsoletes: openoffice.org3.0-suse-menus
+Obsoletes: openoffice.org3.1-suse-menus
+Obsoletes: openoffice.org3.2-suse-menus
+Obsoletes: openoffice.org3.3-suse-menus
+Obsoletes: openoffice.org3.4-suse-menus
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
%define _binary_payload w9.gzdio