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}