From d72a6108608a8e46c22b2543418e1381d97524f1be673f876775806f93c50359 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 13 Sep 2007 16:38:33 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=24

---
 rpm-python.spec | 2 +-
 rpm-suse_macros | 3 ++-
 rpm.changes     | 6 ++++++
 rpm.spec        | 9 ++++++---
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/rpm-python.spec b/rpm-python.spec
index b878b71..3e12b0f 100644
--- a/rpm-python.spec
+++ b/rpm-python.spec
@@ -16,7 +16,7 @@ License:        GPL v2 or later
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.4.2
-Release:        156
+Release:        159
 Requires:       rpm = %{version}
 
 %py_requires
diff --git a/rpm-suse_macros b/rpm-suse_macros
index 88efc3d..b72bf40 100644
--- a/rpm-suse_macros
+++ b/rpm-suse_macros
@@ -464,6 +464,7 @@
 Summary: Languages for package %{name} \
 Group: System/Localization \
 Requires: %{-n:%{-n*}}%{!-n:%{name}} = %{version} \
-Supplements: bundle-lang-other = %(echo `echo %suse_version | sed -r -e 's,([[:digit:]]*)([[:digit:]])0$,\\1.\\2,'`) \
+Provides: %{-n:%{-n*}}%{!-n:%{name}}-lang-all = %{version} \
+Supplements: packageand(bundle-lang-other:%{-n:%{-n*}}%{!-n:%{name}}) \
 %description %{-n:-n %{-n*}-}lang \
 Provides translations to the package %{name}
diff --git a/rpm.changes b/rpm.changes
index 41776ce..b3b39f7 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep  3 13:27:57 CEST 2007 - dmueller@suse.de
+
+- change %lang_package implementation once again
+  to support bundle-lang-other for only one desktop (#302270)
+
 -------------------------------------------------------------------
 Fri Aug 31 18:41:04 CEST 2007 - dmueller@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index 3d54234..486cdd5 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -20,7 +20,7 @@ PreReq:         %insserv_prereq %fillup_prereq permissions
 Autoreqprov:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2
-Release:        135
+Release:        137
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -341,7 +341,7 @@ Summary:        A C library for parsing command line parameters
 License:        LGPL v2 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        363
+Release:        365
 #
 
 %description -n popt
@@ -364,7 +364,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        LGPL v2 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        363
+Release:        365
 Requires:       popt = 1.7
 Requires:       glibc-devel
 
@@ -400,6 +400,9 @@ Authors:
 %doc	%{_mandir}/man3/popt.3*
 
 %changelog
+* Mon Sep 03 2007 - dmueller@suse.de
+- change %%lang_package implementation once again
+  to support bundle-lang-other for only one desktop (#302270)
 * Fri Aug 31 2007 - dmueller@suse.de
 - implement supplements for lang_packages (#306412)
 * Fri Aug 10 2007 - dmueller@suse.de