From ae0c0c6f698b1df1d1dd60537459e2a59d1c0c8c77aebb8a1c674643c643153f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 18 Jun 2013 11:26:39 +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=75 --- gettext-runtime-mini.changes | 5 +++++ gettext-runtime-mini.spec | 3 +++ gettext-runtime.spec | 3 +++ 3 files changed, 11 insertions(+) diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes index 1834c38..ba01af2 100644 --- a/gettext-runtime-mini.changes +++ b/gettext-runtime-mini.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-mini.spec b/gettext-runtime-mini.spec index b1577a8..4f8a8d3 100644 --- a/gettext-runtime-mini.spec +++ b/gettext-runtime-mini.spec @@ -83,6 +83,9 @@ Obsoletes: gettext-devel-64bit Provides: gettext-devel = %{version} Obsoletes: gettext-devel < %{version} Conflicts: gettext-tools-mini +%else +# to allow a prjconf preference which to take per build +Provides: gettext-tools = %{version} %endif %description -n gettext-tools%{?with_mini:-mini} diff --git a/gettext-runtime.spec b/gettext-runtime.spec index 893f441..1909e7d 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -83,6 +83,9 @@ Obsoletes: gettext-devel-64bit Provides: gettext-devel = %{version} Obsoletes: gettext-devel < %{version} Conflicts: gettext-tools-mini +%else +# to allow a prjconf preference which to take per build +Provides: gettext-tools = %{version} %endif %description -n gettext-tools%{?with_mini:-mini}