From 8f0d67775667c4228dea75c491e23a4ce1b88f4e63423d5e3ff8cdf303782223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 17 Jun 2011 07:52:59 +0000 Subject: [PATCH] Accepting request 73966 from home:coolo:branches:openSUSE:Factory fix invalid licenses OBS-URL: https://build.opensuse.org/request/show/73966 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=11 --- obs-service-format_spec_file.changes | 6 ++++++ prepare_spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 7911eca..06621a9 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 17 07:27:18 UTC 2011 - coolo@novell.com + +- do not replace licenses without knowing them (not sure this + is necessary at all) + ------------------------------------------------------------------- Tue May 31 08:03:34 UTC 2011 - adrian@suse.de diff --git a/prepare_spec b/prepare_spec index e27a4d0..01f1f11 100644 --- a/prepare_spec +++ b/prepare_spec @@ -592,7 +592,7 @@ while (@oldspec) { if ($line =~ /^%package/ && $line !~ /\\$/) { $line =~ s/^(%\w+)/lc($1)/e; my ($current_package, $current_lang) = set_current_pkg ( $line ); - unless ($please_replace{"XXXLICENSE $current_package"}) { + unless ($please_replace{"XXXLICENSE $current_package"} || !$replace_hash{"XXXLICENSE $current_package"}) { print $replace_hash{"XXXLICENSE $current_package"}."\n"; } }