Hello community,
here is the log from the commit of package obs-service-format_spec_file for
openSUSE:Factory
checked in at Tue Aug 9 16:35:11 CEST 2011.
--------
--- obs-service-format_spec_file/obs-service-format_spec_file.changes
2011-07-04 11:43:18.000000000 +0200
+++
/mounts/work_src_done/STABLE/obs-service-format_spec_file/obs-service-format_spec_file.changes
2011-08-08 16:06:29.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Aug 8 14:05:45 UTC 2011 - [email protected]
+
+- more work on disabled subpackages, port from internal
+ prepare_spec
+
+-------------------------------------------------------------------
+Mon Aug 1 17:29:28 CEST 2011 - [email protected]
+
+- try to keep summary and group for cases like openldap2
+ (bnc#624980)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-format_spec_file.spec ++++++
--- /var/tmp/diff_new_pack.lTYUXy/_old 2011-08-09 16:34:44.000000000 +0200
+++ /var/tmp/diff_new_pack.lTYUXy/_new 2011-08-09 16:34:44.000000000 +0200
@@ -22,7 +22,7 @@
Group: Development/Tools/Building
Summary: An OBS source service: reformats a spec file to SUSE standard.
Version: 0.1
-Release: 7
+Release: 9
Source: format_spec_file
Source1: format_spec_file.service
Source2: prepare_spec
++++++ prepare_spec ++++++
--- /var/tmp/diff_new_pack.lTYUXy/_old 2011-08-09 16:34:44.000000000 +0200
+++ /var/tmp/diff_new_pack.lTYUXy/_new 2011-08-09 16:34:44.000000000 +0200
@@ -345,8 +345,10 @@
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 ) {
@@ -391,14 +393,16 @@
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:/ ) {
@@ -422,8 +426,8 @@
$_ =~ 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 ) {
@@ -431,13 +435,13 @@
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 ) {
@@ -448,11 +452,11 @@
}
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;
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
