From 8551ce392569b905f09f3e456a46bcf2351f6239e28d92798c473ea1be50e0c6 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 18 Jun 2013 20:00:10 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/gettext-runtime revision 46.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=718b2c1361185d2d343332ad4e2ad217 --- 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} From 5e041d2313752dcea75489d038d0691335b158e474d3bb19a9a7ea3e82cfb3f0 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 19 Jun 2013 08:14:29 +0000 Subject: [PATCH 2/2] Accepting request 179638 from Base:System - move the provides of gettext-devel to gettext-tools-mini too (forwarded request 179637 from coolo) OBS-URL: https://build.opensuse.org/request/show/179638 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=79 --- gettext-runtime-mini.changes | 5 +++++ gettext-runtime-mini.spec | 2 +- gettext-runtime.changes | 5 +++++ gettext-runtime.spec | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes index 081852f..6bbf2f2 100644 --- a/gettext-runtime-mini.changes +++ b/gettext-runtime-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 19 08:12:19 UTC 2013 - coolo@suse.com + +- move the provides of gettext-devel to gettext-tools-mini too + ------------------------------------------------------------------- Tue Jun 18 19:59:21 UTC 2013 - coolo@suse.com diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec index 78234d2..00c1531 100644 --- a/gettext-runtime-mini.spec +++ b/gettext-runtime-mini.spec @@ -78,13 +78,13 @@ License: LGPL-2.1+ Group: Development/Tools/Other Requires: %{name} = %{version} PreReq: info +Provides: gettext-devel = %{version} %if %{without mini} # bug437293 %ifarch ppc64 Obsoletes: gettext-devel-64bit %endif # -Provides: gettext-devel = %{version} Obsoletes: gettext-devel < %{version} Conflicts: gettext-tools-mini Conflicts: gettext-runtime-mini diff --git a/gettext-runtime.changes b/gettext-runtime.changes index 081852f..6bbf2f2 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 19 08:12:19 UTC 2013 - coolo@suse.com + +- move the provides of gettext-devel to gettext-tools-mini too + ------------------------------------------------------------------- Tue Jun 18 19:59:21 UTC 2013 - coolo@suse.com diff --git a/gettext-runtime.spec b/gettext-runtime.spec index 2c4e3ed..84e0990 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -78,13 +78,13 @@ License: LGPL-2.1+ Group: Development/Tools/Other Requires: %{name} = %{version} PreReq: info +Provides: gettext-devel = %{version} %if %{without mini} # bug437293 %ifarch ppc64 Obsoletes: gettext-devel-64bit %endif # -Provides: gettext-devel = %{version} Obsoletes: gettext-devel < %{version} Conflicts: gettext-tools-mini Conflicts: gettext-runtime-mini