From 35447a6586e64bd07da476c1fb01a4ef2319b7704f7dd2190609c4fb2852b59f Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Thu, 3 Apr 2014 15:11:38 +0000
Subject: [PATCH] Accepting request 228891 from
 home:michal-m:branches:Base:System

- pesign-gen-repackage-spec: switch to new rpm style handling
  of weak dependencies

OBS-URL: https://build.opensuse.org/request/show/228891
OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign-obs-integration?expand=0&rev=21
---
 pesign-gen-repackage-spec      | 19 +++++--------------
 pesign-obs-integration.changes |  6 ++++++
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/pesign-gen-repackage-spec b/pesign-gen-repackage-spec
index f1e558f..5d67d70 100644
--- a/pesign-gen-repackage-spec
+++ b/pesign-gen-repackage-spec
@@ -122,14 +122,10 @@ my %dep2tag = (
 	obsoletes => "obsolete",
 	provides => "provide",
 	requires => "require",
-	suggests => "suggests",
-	enhances => "enhances",
-);
-
-# strong version of suggests and enhances
-my %dep2strong = (
-	suggests => "recommends",
-	enhances => "supplements",
+	suggests => "suggest",
+	enhances => "enhance",
+	recommends => "recommend",
+	supplements => "supplement",
 );
 
 # specfile scriptlet => rpm tag name
@@ -310,7 +306,6 @@ my %depflags = (
 	">"    => (1 << 2),
 	"="    => (1 << 3),
 	rpmlib => (1 << 24),
-	strong => (1 << 27),
 );
 
 sub print_deps {
@@ -319,11 +314,7 @@ sub print_deps {
 	foreach my $d (@$list) {
 		next if ($d->{flags} & $depflags{rpmlib});
 
-		if ($d->{flags} & $depflags{strong}) {
-			print SPEC $dep2strong{$depname};
-		} else {
-			print SPEC $depname;
-		}
+		print SPEC $depname;
 		my @deptypes;
 		while (my ($type, $bit) = each(%deptypes)) {
 			push(@deptypes, $type) if $d->{flags} & $bit;
diff --git a/pesign-obs-integration.changes b/pesign-obs-integration.changes
index 63d3f3d..859c0e1 100644
--- a/pesign-obs-integration.changes
+++ b/pesign-obs-integration.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr  3 12:01:54 CEST 2014 - ro@suse.de
+
+- pesign-gen-repackage-spec: switch to new rpm style handling
+  of weak dependencies 
+
 -------------------------------------------------------------------
 Thu Jan 16 15:12:22 UTC 2014 - mmarek@suse.cz