From 92a3dbb83ae0845184caabef6238afc50079d744311ab79dfd40d7bc12bc9e5c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 4 Jul 2011 10:31:38 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/obs-service-format_spec_file revision 8.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=1daeaf33878ddc1d9843ee16ed819631 --- obs-service-format_spec_file.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 9d5696d..11ddf8f 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -22,7 +22,7 @@ License: GPL v2 or later Group: Development/Tools/Building Summary: An OBS source service: reformats a spec file to SUSE standard. Version: 0.1 -Release: 5 +Release: 7 Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec @@ -30,7 +30,6 @@ Requires: osc-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch - %description This is a source service for openSUSE Build Service. @@ -44,22 +43,17 @@ spec file instead of creating a new one. %setup -q -D -T 0 -n . - %build - %install mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files - %files %defattr(-,root,root) %dir /usr/lib/obs /usr/lib/obs/service - - %changelog From fa1673e9ba052155a9d41c66bc615923e1a1e83e14746df9065d8af42c2ec5cf Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Mon, 1 Aug 2011 15:30:16 +0000 Subject: [PATCH 2/3] - try to keep summary and group for cases like openldap2 (bnc#624980) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=19 --- obs-service-format_spec_file.changes | 6 ++++++ prepare_spec | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 4117da9..0769b97 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 1 17:29:28 CEST 2011 - ro@suse.de + +- try to keep summary and group for cases like openldap2 + (bnc#624980) + ------------------------------------------------------------------- Mon Jul 4 11:42:26 CEST 2011 - ro@suse.de diff --git a/prepare_spec b/prepare_spec index 37945ba..d40c28b 100644 --- a/prepare_spec +++ b/prepare_spec @@ -391,14 +391,16 @@ sub read_and_parse_old_spec { next; } if ($current_section eq "header") { + my $c_pack = $current_package; + $c_pack .= "_disabled" if $ifhandler->{"disabled"}; if ( /^Summary\b\s*:\s*(.*)/i ) { - $replace_hash{"XXXSUMMARY $current_package"} = sprintf("%-16s%s","Summary:", $1); - push @oldspec, "XXXSUMMARY $current_package"; + $replace_hash{"XXXSUMMARY $c_pack"} = sprintf("%-16s%s","Summary:", $1); + push @oldspec, "XXXSUMMARY $c_pack"; next; } if ( /^Group\b\s*:\s*(.*)/i ) { - $replace_hash{"XXXGROUP $current_package"} = sprintf("%-16s%s", "Group:", $1); - push @oldspec, "XXXGROUP $current_package"; + $replace_hash{"XXXGROUP $c_pack"} = sprintf("%-16s%s", "Group:", $1); + push @oldspec, "XXXGROUP $c_pack"; next; } if ( /^Vendor:/ || /^Distribution:/ || /^Packager:/ ) { From e6010bfc12a1708e0175a1af1fef348fbf3a8cbb7da9c732ef45a24d1bfe2b14 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Mon, 8 Aug 2011 14:06:29 +0000 Subject: [PATCH 3/3] - more work on disabled subpackages, port from internal prepare_spec OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=20 --- obs-service-format_spec_file.changes | 6 ++++++ prepare_spec | 28 +++++++++++++++------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 0769b97..b05a8cd 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 8 14:05:45 UTC 2011 - ro@suse.com + +- more work on disabled subpackages, port from internal + prepare_spec + ------------------------------------------------------------------- Mon Aug 1 17:29:28 CEST 2011 - ro@suse.de diff --git a/prepare_spec b/prepare_spec index d40c28b..4a93690 100644 --- a/prepare_spec +++ b/prepare_spec @@ -345,8 +345,10 @@ sub read_and_parse_old_spec { warn "after: $_\n"; } ($current_package, $current_lang) = set_current_pkg ( $_ ); - $disabled_packs->{$current_package} = 1 if $ifhandler->{"disabled"}; - warn "$current_package is disabled\n" if $ifhandler->{"disabled"} && $debug; + if ($ifhandler->{"disabled"}) { + $disabled_packs->{$current_package} = 1; + warn "$current_package is disabled\n" if $debug; + } next; } if ( /^%description\b/i ) { @@ -424,8 +426,8 @@ sub read_and_parse_old_spec { $_ =~ s/^[^:]+:/BuildArch:/; } if ( /^Release\s*:\s*(.*)/i ) { - $pkg_release{$current_package} = $_; - $replace_hash{"XXXRELEASE $current_package"} = sprintf("%-16s%s","Release:", $1); + $pkg_release{$c_pack} = $_; + $replace_hash{"XXXRELEASE $c_pack"} = sprintf("%-16s%s","Release:", $1); next; } if ( /^BuildRoot\s*:/i ) { @@ -433,13 +435,13 @@ sub read_and_parse_old_spec { next; } if ( /^Copyright\s*:\s*(.*)/i || /^License\s*:\s*(.*)/i ) { - $replace_hash{"XXXLICENSE $current_package"} = sprintf("%-16s%s","License:", $1); - push @oldspec, "XXXLICENSE $current_package"; + $replace_hash{"XXXLICENSE $c_pack"} = sprintf("%-16s%s","License:", $1); + push @oldspec, "XXXLICENSE $c_pack"; next; } if ( /^Url\s*:\s*(.*)/i ) { - $replace_hash{"XXXURL $current_package"} = sprintf("%-16s%s","Url:", $1); - push @oldspec, "XXXURL $current_package"; + $replace_hash{"XXXURL $c_pack"} = sprintf("%-16s%s","Url:", $1); + push @oldspec, "XXXURL $c_pack"; next; } if ( m/$global_tags_re\s*(.*)/oi ) { @@ -450,11 +452,11 @@ sub read_and_parse_old_spec { } if ( /^Version:/ ) { warn "found Version, section = $current_section\n" if $debug; - $version{$current_package} = $_; - $version{$current_package} =~ s/^Version:\s*(.*)\s*/$1/; - $replace_hash{"XXXVERSION $current_package"} = sprintf("%-16s%s","Version:",$version{$current_package}); - push @oldspec, $replace_hash{"XXXVERSION $current_package"}; - push @oldspec, "XXXRELEASE $current_package"; + $version{$c_pack} = $_; + $version{$c_pack} =~ s/^Version:\s*(.*)\s*/$1/; + $replace_hash{"XXXVERSION $c_pack"} = sprintf("%-16s%s","Version:",$version{$c_pack}); + push @oldspec, $replace_hash{"XXXVERSION $c_pack"}; + push @oldspec, "XXXRELEASE $c_pack"; next; } }