From 21e567650efece932ff6d975a0b558a69e3b7c042ce6cfe788cb0095e2cd9d52 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 19 Jul 2012 04:53:43 +0000 Subject: [PATCH 1/2] Accepting request 128295 from home:coolo:branches:openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/128295 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=209 --- rpm-suse_macros | 3 ++- rpm.changes | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rpm-suse_macros b/rpm-suse_macros index 362f168..8ab9cdd 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -320,11 +320,12 @@ %nil # Template for lang sub-package. -%lang_package(n:) \ +%lang_package(n:r:) \ %package %{-n:-n %{-n*}-}lang \ Summary: Languages for package %{name} \ Group: System/Localization \ Requires: %{-n:%{-n*}}%{!-n:%{name}} = %{version} \ +%{-r:Requires: %{-r*}} \ Provides: %{-n:%{-n*}}%{!-n:%{name}}-lang-all = %{version} \ Supplements: packageand(bundle-lang-other:%{-n:%{-n*}}%{!-n:%{name}}) \ BuildArch: noarch \ diff --git a/rpm.changes b/rpm.changes index c89967c..8838881 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 18 15:52:25 UTC 2012 - coolo@suse.com + +- add an -r option to %lang_package (bnc#513786) + ------------------------------------------------------------------- Wed Jul 4 18:04:54 CEST 2012 - fcrozat@suse.com From 3cde6479a6c1555dd96c59f8df0c557fa7072452b076737645a06e52f5d95283 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 19 Jul 2012 08:52:30 +0000 Subject: [PATCH 2/2] - add tar to the rpm build essentials OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=210 --- rpm.changes | 5 +++++ rpm.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/rpm.changes b/rpm.changes index 8838881..e1c84e7 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 19 08:52:02 UTC 2012 - coolo@suse.com + +- add tar to the rpm build essentials + ------------------------------------------------------------------- Wed Jul 18 15:52:25 UTC 2012 - coolo@suse.com diff --git a/rpm.spec b/rpm.spec index db321d8..9d02462 100644 --- a/rpm.spec +++ b/rpm.spec @@ -190,6 +190,7 @@ Requires: gzip Requires: make Requires: patch Requires: perl-base +Requires: tar Requires: xz %description build