From 5146f1c36d7bc79cb58d8f0d1c872ff89830ecc377c8d8daaa11e0b658d9bfad Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 18 Jun 2013 11:11:19 +0000 Subject: [PATCH] - make gettext-runtime conflict with gettext-runtime-mini OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=74 --- gettext-runtime-mini.spec | 2 ++ gettext-runtime.changes | 5 +++++ gettext-runtime.spec | 2 ++ 3 files changed, 9 insertions(+) diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec index 049b921..b1577a8 100644 --- a/gettext-runtime-mini.spec +++ b/gettext-runtime-mini.spec @@ -40,6 +40,7 @@ Obsoletes: gettext-64bit #Rename done for openSUSE 11.0 Provides: gettext = %{version} Obsoletes: gettext < %{version} +Conflicts: gettext-runtime-mini %endif Summary: Tools for Native Language Support (NLS) License: GPL-3.0+ and LGPL-2.0+ @@ -81,6 +82,7 @@ Obsoletes: gettext-devel-64bit # Provides: gettext-devel = %{version} Obsoletes: gettext-devel < %{version} +Conflicts: gettext-tools-mini %endif %description -n gettext-tools%{?with_mini:-mini} diff --git a/gettext-runtime.changes b/gettext-runtime.changes index 1834c38..ba01af2 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 18 11:10:59 UTC 2013 - coolo@suse.com + +- make gettext-runtime conflict with gettext-runtime-mini + ------------------------------------------------------------------- Tue Jun 18 09:54:33 UTC 2013 - schwab@suse.de diff --git a/gettext-runtime.spec b/gettext-runtime.spec index 8d60e33..893f441 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -40,6 +40,7 @@ Obsoletes: gettext-64bit #Rename done for openSUSE 11.0 Provides: gettext = %{version} Obsoletes: gettext < %{version} +Conflicts: gettext-runtime-mini %endif Summary: Tools for Native Language Support (NLS) License: GPL-3.0+ and LGPL-2.0+ @@ -81,6 +82,7 @@ Obsoletes: gettext-devel-64bit # Provides: gettext-devel = %{version} Obsoletes: gettext-devel < %{version} +Conflicts: gettext-tools-mini %endif %description -n gettext-tools%{?with_mini:-mini}