From 7fedf2a7c4a72a255ac8def16de4f4977101e7ffa13c7b96e7a3a9c713b34c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 8 Sep 2011 15:35:30 +0000 Subject: [PATCH] Accepting request 81272 from home:dirkmueller:branches:openSUSE:Tools - remove %%debug_package insertion OBS-URL: https://build.opensuse.org/request/show/81272 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=23 --- obs-service-format_spec_file.changes | 5 +++++ prepare_spec | 23 ----------------------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index b05a8cd..a94cf35 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 7 13:34:45 CEST 2011 - dmueller@suse.de + +- remove %%debug_package insertion + ------------------------------------------------------------------- Mon Aug 8 14:05:45 UTC 2011 - ro@suse.com diff --git a/prepare_spec b/prepare_spec index 4a93690..5c6517b 100644 --- a/prepare_spec +++ b/prepare_spec @@ -99,28 +99,6 @@ sub maybe_add_empty_line() if ($current_section ne "description" && $oldspec[-1] !~ /^\s*$/); } -sub maybe_add_debug_package() -{ - if ( $ENV{'BUILD_DEBUG_FLAGS'} - && ( !$nosrc_result || $base_package =~ /^kernel/ || $base_package =~ /^java/ || $base_package =~ /^texlive-bin/ || $base_package =~ /^glibc/ ) - && !$nodebuginfo - && !$had_debug_package ) - { - my @spec_back; - while(1) { - my $line = pop @oldspec; - unshift @spec_back, $line; - next if ($line =~ /^\s*$/); - next if ($line =~ /^\s*%if\b/); - last; - } - # insert the %debug_package just before the first %if - push @oldspec, shift @spec_back; - push @oldspec, "%debug_package", @spec_back; - $had_debug_package = 1; - } -} - sub change_section($) { my ($new_section) = @_; @@ -331,7 +309,6 @@ sub read_and_parse_old_spec { } else { change_section("prep"); } - maybe_add_debug_package(); $_ =~ s/^(%\w+)/lc($1)/e; if ($debug) { warn "key: $_ value: $definelist->{$_}\n" for (sort { length($b) <=> length($a) } keys (%{$definelist}));