diff --git a/libreoffice.changes b/libreoffice.changes index 7e33cf7..d47a3d5 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Oct 17 08:55:21 UTC 2014 - olaf@aepfle.de + +- Obsolete old libreoffice-ure-devel in sdk and devel-docs in sdk-doc + to avoid possible conflicts during zypper dup (bnc#900877) + +------------------------------------------------------------------- +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..fb4ef73 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} @@ -534,6 +531,8 @@ Requires: make Requires: ucpp Requires: zip Recommends: java-devel +Provides: libreoffice-ure-devel = %version +Obsoletes: libreoffice-ure-devel < %version %description sdk This package contains the files needed to build plugins/add-ons for @@ -548,6 +547,8 @@ License: LGPL-3.0 Group: Development/Libraries/Other Suggests: %{name}-sdk = %{version} Enhances: %{name}-sdk = %{version} +Provides: libreoffice-ure-devel-doc = %version +Obsoletes: libreoffice-ure-devel-doc < %version %description sdk-doc This package includes documentation and examples for the LibreOffice