From c40b4a53585389ad383ac4127be563f7a5543588ca66d0e8bf1610d359378191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Oct 2014 13:44:04 +0000 Subject: [PATCH] Accepting request 256903 from home:olh:branches:LibreOffice:Factory - Obsolete old libreoffice-ure to avoid conflicts during zypper dup (bnc#900877) !!!!!!!!!!!!!! Also remove bogus comments. Provides/Obsoletes have to stay. !!!!!!!!!!!!!! OBS-URL: https://build.opensuse.org/request/show/256903 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=198 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 7e33cf7..2450fbb 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 16 13:35:20 UTC 2014 - olaf@aepfle.de + +- Obsolete old libreoffice-ure to avoid conflicts during zypper dup + (bnc#900877) + ------------------------------------------------------------------- Wed Oct 1 12:24:03 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 9b478d7..4a88bf2 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -223,21 +223,18 @@ Requires(post): zip Requires(postun): coreutils Requires(postun): gtk2 Requires(pre): findutils -# Remove after 13.1 is out of support scope Provides: %{name}-draw-extensions = %{version} Obsoletes: %{name}-draw-extensions < %{version} -# Remove after 13.1 is out of support scope Provides: %{name}-impress-extensions = %{version} Obsoletes: %{name}-impress-extensions < %{version} -# Remove after 13.1 is out of support scope Provides: %{name}-base-extensions = %{version} Obsoletes: %{name}-base-extensions < %{version} -# Remove after 13.1 is out of support scope Provides: %{name}-kde = %{version} Obsoletes: %{name}-kde < %{version} -# Remove after 13.1 is out of support scope Provides: %{name}-l10n-prebuild = %{version} Obsoletes: %{name}-l10n-prebuild < %{version} +Provides: %{name}-ure = %{version} +Obsoletes: %{name}-ure < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64 %if %{with vlc}