From b9e583095a6dc3ecfa7cedf38c960c7286ff70fdc1d903fd03acbb9e4501ed23 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 18 Jun 2013 20:00:10 +0000 Subject: [PATCH] - more conflicts between the minis - more conflicts between the minis OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gettext-runtime?expand=0&rev=46 --- gettext-runtime-mini.changes | 5 +++++ gettext-runtime-mini.spec | 2 ++ gettext-runtime.changes | 5 +++++ gettext-runtime.spec | 2 ++ 4 files changed, 14 insertions(+) diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes index ba01af2..081852f 100644 --- a/gettext-runtime-mini.changes +++ b/gettext-runtime-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 18 19:59:21 UTC 2013 - coolo@suse.com + +- more conflicts between the minis + ------------------------------------------------------------------- Tue Jun 18 11:10:59 UTC 2013 - coolo@suse.com diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec index 2bb3bc0..78234d2 100644 --- a/gettext-runtime-mini.spec +++ b/gettext-runtime-mini.spec @@ -41,6 +41,7 @@ Obsoletes: gettext-64bit Provides: gettext = %{version} Obsoletes: gettext < %{version} Conflicts: gettext-runtime-mini +Conflicts: gettext-tools-mini %else # to allow a prjconf preference which to take per build Provides: gettext-runtime = %{version} @@ -86,6 +87,7 @@ Obsoletes: gettext-devel-64bit Provides: gettext-devel = %{version} Obsoletes: gettext-devel < %{version} Conflicts: gettext-tools-mini +Conflicts: gettext-runtime-mini %else # to allow a prjconf preference which to take per build Provides: gettext-tools = %{version} diff --git a/gettext-runtime.changes b/gettext-runtime.changes index ba01af2..081852f 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 18 19:59:21 UTC 2013 - coolo@suse.com + +- more conflicts between the minis + ------------------------------------------------------------------- Tue Jun 18 11:10:59 UTC 2013 - coolo@suse.com diff --git a/gettext-runtime.spec b/gettext-runtime.spec index 0e81819..2c4e3ed 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -41,6 +41,7 @@ Obsoletes: gettext-64bit Provides: gettext = %{version} Obsoletes: gettext < %{version} Conflicts: gettext-runtime-mini +Conflicts: gettext-tools-mini %else # to allow a prjconf preference which to take per build Provides: gettext-runtime = %{version} @@ -86,6 +87,7 @@ Obsoletes: gettext-devel-64bit Provides: gettext-devel = %{version} Obsoletes: gettext-devel < %{version} Conflicts: gettext-tools-mini +Conflicts: gettext-runtime-mini %else # to allow a prjconf preference which to take per build Provides: gettext-tools = %{version}