From c8b33e430bfb40b80df43249279bd561d874d786 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Tue, 8 Dec 2009 17:51:32 +0100 Subject: - fix whitespace (revert large part of e7cba6) --- mkbaselibs | 604 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 302 insertions(+), 302 deletions(-) (limited to 'mkbaselibs') diff --git a/mkbaselibs b/mkbaselibs index 30f6010..04e3692 100755 --- a/mkbaselibs +++ b/mkbaselibs @@ -6,133 +6,133 @@ use strict; # See: http://www.rpm.org/max-rpm/s1-rpm-file-format-rpm-file-format.html#S3-RPM-FILE-FORMAT-HEADER-TAG-LISTING # cf http://search.cpan.org/~davecross/Parse-RPM-Spec-0.01/lib/Parse/RPM/Spec.pm my %STAG = ( - "NAME" => 1000, - "VERSION" => 1001, - "RELEASE" => 1002, - "EPOCH" => 1003, - "SERIAL" => 1003, - "SUMMARY" => 1004, - "DESCRIPTION" => 1005, - "BUILDTIME" => 1006, - "BUILDHOST" => 1007, - "INSTALLTIME" => 1008, - "SIZE" => 1009, - "DISTRIBUTION" => 1010, - "VENDOR" => 1011, - "GIF" => 1012, - "XPM" => 1013, - "LICENSE" => 1014, - "COPYRIGHT" => 1014, - "PACKAGER" => 1015, - "GROUP" => 1016, - "SOURCE" => 1018, - "PATCH" => 1019, - "URL" => 1020, - "OS" => 1021, - "ARCH" => 1022, - "PREIN" => 1023, - "POSTIN" => 1024, - "PREUN" => 1025, - "POSTUN" => 1026, - "OLDFILENAMES" => 1027, - "FILESIZES" => 1028, - "FILESTATES" => 1029, - "FILEMODES" => 1030, - "FILERDEVS" => 1033, - "FILEMTIMES" => 1034, - "FILEMD5S" => 1035, - "FILELINKTOS" => 1036, - "FILEFLAGS" => 1037, - "FILEUSERNAME" => 1039, - "FILEGROUPNAME" => 1040, - "ICON" => 1043, - "SOURCERPM" => 1044, - "FILEVERIFYFLAGS" => 1045, - "ARCHIVESIZE" => 1046, - "PROVIDENAME" => 1047, - "PROVIDES" => 1047, - "REQUIREFLAGS" => 1048, - "REQUIRENAME" => 1049, - "REQUIREVERSION" => 1050, - "NOSOURCE" => 1051, - "NOPATCH" => 1052, - "CONFLICTFLAGS" => 1053, - "CONFLICTNAME" => 1054, - "CONFLICTVERSION" => 1055, - "EXCLUDEARCH" => 1059, - "EXCLUDEOS" => 1060, - "EXCLUSIVEARCH" => 1061, - "EXCLUSIVEOS" => 1062, - "RPMVERSION" => 1064, - "TRIGGERSCRIPTS" => 1065, - "TRIGGERNAME" => 1066, - "TRIGGERVERSION" => 1067, - "TRIGGERFLAGS" => 1068, - "TRIGGERINDEX" => 1069, - "VERIFYSCRIPT" => 1079, - "CHANGELOGTIME" => 1080, - "CHANGELOGNAME" => 1081, - "CHANGELOGTEXT" => 1082, - "PREINPROG" => 1085, - "POSTINPROG" => 1086, - "PREUNPROG" => 1087, - "POSTUNPROG" => 1088, - "BUILDARCHS" => 1089, - "OBSOLETENAME" => 1090, - "OBSOLETES" => 1090, - "VERIFYSCRIPTPROG" => 1091, - "TRIGGERSCRIPTPROG" => 1092, - "COOKIE" => 1094, - "FILEDEVICES" => 1095, - "FILEINODES" => 1096, - "FILELANGS" => 1097, - "PREFIXES" => 1098, - "INSTPREFIXES" => 1099, - "SOURCEPACKAGE" => 1106, - "PROVIDEFLAGS" => 1112, - "PROVIDEVERSION" => 1113, - "OBSOLETEFLAGS" => 1114, - "OBSOLETEVERSION" => 1115, - "DIRINDEXES" => 1116, - "BASENAMES" => 1117, - "DIRNAMES" => 1118, - "OPTFLAGS" => 1122, - "DISTURL" => 1123, - "PAYLOADFORMAT" => 1124, - "PAYLOADCOMPRESSOR" => 1125, - "PAYLOADFLAGS" => 1126, - "INSTALLCOLOR" => 1127, - "INSTALLTID" => 1128, - "REMOVETID" => 1129, - "RHNPLATFORM" => 1131, - "PLATFORM" => 1132, - "PATCHESNAME" => 1133, - "PATCHESFLAGS" => 1134, - "PATCHESVERSION" => 1135, - "CACHECTIME" => 1136, - "CACHEPKGPATH" => 1137, - "CACHEPKGSIZE" => 1138, - "CACHEPKGMTIME" => 1139, - "FILECOLORS" => 1140, - "FILECLASS" => 1141, - "CLASSDICT" => 1142, - "FILEDEPENDSX" => 1143, - "FILEDEPENDSN" => 1144, - "DEPENDSDICT" => 1145, - "SOURCEPKGID" => 1146, - "PRETRANS" => 1151, - "POSTTRANS" => 1152, - "PRETRANSPROG" => 1153, - "POSTTRANSPROG" => 1154, - "DISTTAG" => 1155, - "SUGGESTSNAME" => 1156, - "SUGGESTSVERSION" => 1157, - "SUGGESTSFLAGS" => 1158, - "ENHANCESNAME" => 1159, - "ENHANCESVERSION" => 1160, - "ENHANCESFLAGS" => 1161, - "PRIORITY" => 1162, - "CVSID" => 1163, + "NAME" => 1000, + "VERSION" => 1001, + "RELEASE" => 1002, + "EPOCH" => 1003, + "SERIAL" => 1003, + "SUMMARY" => 1004, + "DESCRIPTION" => 1005, + "BUILDTIME" => 1006, + "BUILDHOST" => 1007, + "INSTALLTIME" => 1008, + "SIZE" => 1009, + "DISTRIBUTION" => 1010, + "VENDOR" => 1011, + "GIF" => 1012, + "XPM" => 1013, + "LICENSE" => 1014, + "COPYRIGHT" => 1014, + "PACKAGER" => 1015, + "GROUP" => 1016, + "SOURCE" => 1018, + "PATCH" => 1019, + "URL" => 1020, + "OS" => 1021, + "ARCH" => 1022, + "PREIN" => 1023, + "POSTIN" => 1024, + "PREUN" => 1025, + "POSTUN" => 1026, + "OLDFILENAMES" => 1027, + "FILESIZES" => 1028, + "FILESTATES" => 1029, + "FILEMODES" => 1030, + "FILERDEVS" => 1033, + "FILEMTIMES" => 1034, + "FILEMD5S" => 1035, + "FILELINKTOS" => 1036, + "FILEFLAGS" => 1037, + "FILEUSERNAME" => 1039, + "FILEGROUPNAME" => 1040, + "ICON" => 1043, + "SOURCERPM" => 1044, + "FILEVERIFYFLAGS" => 1045, + "ARCHIVESIZE" => 1046, + "PROVIDENAME" => 1047, + "PROVIDES" => 1047, + "REQUIREFLAGS" => 1048, + "REQUIRENAME" => 1049, + "REQUIREVERSION" => 1050, + "NOSOURCE" => 1051, + "NOPATCH" => 1052, + "CONFLICTFLAGS" => 1053, + "CONFLICTNAME" => 1054, + "CONFLICTVERSION" => 1055, + "EXCLUDEARCH" => 1059, + "EXCLUDEOS" => 1060, + "EXCLUSIVEARCH" => 1061, + "EXCLUSIVEOS" => 1062, + "RPMVERSION" => 1064, + "TRIGGERSCRIPTS" => 1065, + "TRIGGERNAME" => 1066, + "TRIGGERVERSION" => 1067, + "TRIGGERFLAGS" => 1068, + "TRIGGERINDEX" => 1069, + "VERIFYSCRIPT" => 1079, + "CHANGELOGTIME" => 1080, + "CHANGELOGNAME" => 1081, + "CHANGELOGTEXT" => 1082, + "PREINPROG" => 1085, + "POSTINPROG" => 1086, + "PREUNPROG" => 1087, + "POSTUNPROG" => 1088, + "BUILDARCHS" => 1089, + "OBSOLETENAME" => 1090, + "OBSOLETES" => 1090, + "VERIFYSCRIPTPROG" => 1091, + "TRIGGERSCRIPTPROG" => 1092, + "COOKIE" => 1094, + "FILEDEVICES" => 1095, + "FILEINODES" => 1096, + "FILELANGS" => 1097, + "PREFIXES" => 1098, + "INSTPREFIXES" => 1099, + "SOURCEPACKAGE" => 1106, + "PROVIDEFLAGS" => 1112, + "PROVIDEVERSION" => 1113, + "OBSOLETEFLAGS" => 1114, + "OBSOLETEVERSION" => 1115, + "DIRINDEXES" => 1116, + "BASENAMES" => 1117, + "DIRNAMES" => 1118, + "OPTFLAGS" => 1122, + "DISTURL" => 1123, + "PAYLOADFORMAT" => 1124, + "PAYLOADCOMPRESSOR" => 1125, + "PAYLOADFLAGS" => 1126, + "INSTALLCOLOR" => 1127, + "INSTALLTID" => 1128, + "REMOVETID" => 1129, + "RHNPLATFORM" => 1131, + "PLATFORM" => 1132, + "PATCHESNAME" => 1133, + "PATCHESFLAGS" => 1134, + "PATCHESVERSION" => 1135, + "CACHECTIME" => 1136, + "CACHEPKGPATH" => 1137, + "CACHEPKGSIZE" => 1138, + "CACHEPKGMTIME" => 1139, + "FILECOLORS" => 1140, + "FILECLASS" => 1141, + "CLASSDICT" => 1142, + "FILEDEPENDSX" => 1143, + "FILEDEPENDSN" => 1144, + "DEPENDSDICT" => 1145, + "SOURCEPKGID" => 1146, + "PRETRANS" => 1151, + "POSTTRANS" => 1152, + "PRETRANSPROG" => 1153, + "POSTTRANSPROG" => 1154, + "DISTTAG" => 1155, + "SUGGESTSNAME" => 1156, + "SUGGESTSVERSION" => 1157, + "SUGGESTSFLAGS" => 1158, + "ENHANCESNAME" => 1159, + "ENHANCESVERSION" => 1160, + "ENHANCESFLAGS" => 1161, + "PRIORITY" => 1162, + "CVSID" => 1163, ); # do not mix numeric tags with symbolic tags. @@ -244,34 +244,34 @@ sub rpmq_many { $tag = 0+$tag; if ($stags{$tag}) { eval { - my $otag = $stags{$tag}; - if ($type == 0) { - $res{$otag} = [ '' ]; - } elsif ($type == 1) { - $res{$otag} = [ unpack("\@${offset}c$count", $data) ]; - } elsif ($type == 2) { - $res{$otag} = [ unpack("\@${offset}c$count", $data) ]; - } elsif ($type == 3) { - $res{$otag} = [ unpack("\@${offset}n$count", $data) ]; - } elsif ($type == 4) { - $res{$otag} = [ unpack("\@${offset}N$count", $data) ]; - } elsif ($type == 5) { - $res{$otag} = [ undef ]; - } elsif ($type == 6) { - $res{$otag} = [ unpack("\@${offset}Z*", $data) ]; - } elsif ($type == 7) { - $res{$otag} = [ unpack("\@${offset}a$count", $data) ]; - } elsif ($type == 8 || $type == 9) { - my $d = unpack("\@${offset}a*", $data); - my @res = split("\0", $d, $count + 1); - $res{$otag} = [ splice @res, 0, $count ]; - } else { - $res{$otag} = [ undef ]; - } + my $otag = $stags{$tag}; + if ($type == 0) { + $res{$otag} = [ '' ]; + } elsif ($type == 1) { + $res{$otag} = [ unpack("\@${offset}c$count", $data) ]; + } elsif ($type == 2) { + $res{$otag} = [ unpack("\@${offset}c$count", $data) ]; + } elsif ($type == 3) { + $res{$otag} = [ unpack("\@${offset}n$count", $data) ]; + } elsif ($type == 4) { + $res{$otag} = [ unpack("\@${offset}N$count", $data) ]; + } elsif ($type == 5) { + $res{$otag} = [ undef ]; + } elsif ($type == 6) { + $res{$otag} = [ unpack("\@${offset}Z*", $data) ]; + } elsif ($type == 7) { + $res{$otag} = [ unpack("\@${offset}a$count", $data) ]; + } elsif ($type == 8 || $type == 9) { + my $d = unpack("\@${offset}a*", $data); + my @res = split("\0", $d, $count + 1); + $res{$otag} = [ splice @res, 0, $count ]; + } else { + $res{$otag} = [ undef ]; + } }; if ($@) { - warn("Bad rpm $rpm: $@\n"); - return (); + warn("Bad rpm $rpm: $@\n"); + return (); } } } @@ -551,40 +551,40 @@ sub handle_rpms { for my $r (@baselib) { my $rr = substr($r, 1); if (substr($r, 0, 1) eq '+') { - if ($rr =~ /^(.*?)\s*->\s*(.*?)$/) { - if (grep {$_ eq $1} @rpmfiles) { - $files{$1} = 1; - $moves{$1} = $2; - } - } else { - for (grep {/$rr/} @rpmfiles) { - $files{$_} = 1; - delete $moves{$_}; - } - } + if ($rr =~ /^(.*?)\s*->\s*(.*?)$/) { + if (grep {$_ eq $1} @rpmfiles) { + $files{$1} = 1; + $moves{$1} = $2; + } + } else { + for (grep {/$rr/} @rpmfiles) { + $files{$_} = 1; + delete $moves{$_}; + } + } } elsif (substr($r, 0, 1) eq '-') { - delete $files{$_} for grep {/$rr/} keys %files; + delete $files{$_} for grep {/$rr/} keys %files; } elsif (substr($r, 0, 1) eq '"') { - $rr =~ s/\"$//; - if ($rr =~ /^(.*?)\s*->\s*(.*?)$/) { - $symlinks{$1} = $2; - } else { - die("bad baselib string rule: $r\n"); - } + $rr =~ s/\"$//; + if ($rr =~ /^(.*?)\s*->\s*(.*?)$/) { + $symlinks{$1} = $2; + } else { + die("bad baselib string rule: $r\n"); + } } else { - die("bad baselib rule: $r\n"); + die("bad baselib rule: $r\n"); } } if ($configdir) { for my $r (@config) { - my $rr = substr($r, 1); - if (substr($r, 0, 1) eq '+') { - $cfiles{$_} = 1 for grep {/$rr/} grep {!$ghosts{$_}} @rpmfiles; - } elsif (substr($r, 0, 1) eq '-') { - delete $cfiles{$_} for grep {/$rr/} keys %cfiles; - } else { - die("bad config rule: $r\n"); - } + my $rr = substr($r, 1); + if (substr($r, 0, 1) eq '+') { + $cfiles{$_} = 1 for grep {/$rr/} grep {!$ghosts{$_}} @rpmfiles; + } elsif (substr($r, 0, 1) eq '-') { + delete $cfiles{$_} for grep {/$rr/} keys %cfiles; + } else { + die("bad config rule: $r\n"); + } } } $files{$_} = 1 for keys %cfiles; @@ -613,12 +613,12 @@ sub handle_rpms { next if $cfiles{$_}; my $fn = $_; if ($moves{$fn}) { - $fn = $moves{$fn}; - next unless $fn =~ s/\/[^\/]+$//; - $alldirs{$fn} = 1; + $fn = $moves{$fn}; + next unless $fn =~ s/\/[^\/]+$//; + $alldirs{$fn} = 1; } else { - next unless $fn =~ s/\/[^\/]+$//; - $alldirs{"$prefix$fn"} = 1; + next unless $fn =~ s/\/[^\/]+$//; + $alldirs{"$prefix$fn"} = 1; } } $alldirs{$_} = 1 for keys %symlinks; @@ -631,9 +631,9 @@ sub handle_rpms { next if $cfiles{$_}; my $fn = $_; if ($moves{$fn}) { - delete $alldirs{$moves{$fn}}; + delete $alldirs{$moves{$fn}}; } else { - delete $alldirs{"$prefix$fn"}; + delete $alldirs{"$prefix$fn"}; } } $ad = $prefix; @@ -651,20 +651,20 @@ sub handle_rpms { my $d = $res{$pt}->[0]; $d =~ s/%/%%/g; if ($p eq 'Name') { - print SPEC "Name: $sname\n"; - next; + print SPEC "Name: $sname\n"; + next; } if ($p eq 'Version') { - print SPEC "Version: $sversion\n"; - next; + print SPEC "Version: $sversion\n"; + next; } if ($p eq 'Release') { - print SPEC "Release: $srelease\n"; - next; + print SPEC "Release: $srelease\n"; + next; } if ($p eq 'Disturl') { - print SPEC "%define disturl $d\n"; - next; + print SPEC "%define disturl $d\n"; + next; } print SPEC "$p: $d\n"; } @@ -682,37 +682,37 @@ sub handle_rpms { my $d = $res{$pt}->[0]; $d =~ s/%/%%/g; if ($pt eq 'VERSION' && $legacyversion) { - $d = $legacyversion; + $d = $legacyversion; } elsif ($pt eq 'RELEASE' && $legacyversion) { - my @bt = localtime($res{'BUILDTIME'}->[0]); - $bt[5] += 1900; - $bt[4] += 1; - $d = sprintf("%04d%02d%02d%02d%02d\n", @bt[5,4,3,2,1]); + my @bt = localtime($res{'BUILDTIME'}->[0]); + $bt[5] += 1900; + $bt[4] += 1; + $d = sprintf("%04d%02d%02d%02d%02d\n", @bt[5,4,3,2,1]); } print SPEC "$p: $d\n"; } print SPEC "Autoreqprov: $autoreqprov\n"; for my $ar ([\@provides, 'provides'], - [\@prerequires, 'prereq'], - [\@requires, 'requires'], - [\@recommends, 'recommends'], - [\@supplements, 'supplements'], - [\@obsoletes, 'obsoletes'], - [\@conflicts, 'conflicts']) { - my @a = @{$ar->[0]}; - my @na = (); - for (@a) { - if (substr($_, 0, 1) eq '"') { - die("bad $ar->[1] rule: $_\n") unless /^\"(.*)\"$/; - push @na, $1; - } elsif (substr($_, 0, 1) eq '-') { - my $ra = substr($_, 1); - @na = grep {!/$ra/} @na; - } else { - die("bad $ar->[1] rule: $_\n"); - } - } + [\@prerequires, 'prereq'], + [\@requires, 'requires'], + [\@recommends, 'recommends'], + [\@supplements, 'supplements'], + [\@obsoletes, 'obsoletes'], + [\@conflicts, 'conflicts']) { + my @a = @{$ar->[0]}; + my @na = (); + for (@a) { + if (substr($_, 0, 1) eq '"') { + die("bad $ar->[1] rule: $_\n") unless /^\"(.*)\"$/; + push @na, $1; + } elsif (substr($_, 0, 1) eq '-') { + my $ra = substr($_, 1); + @na = grep {!/$ra/} @na; + } else { + die("bad $ar->[1] rule: $_\n"); + } + } print SPEC ucfirst($ar->[1]).": $_\n" for @na; } my $cpiopre = ''; @@ -733,8 +733,8 @@ sub handle_rpms { my @cfl = grep {!$cfiles{$_} && !$moves{$_}} sort keys %files; if (@cfl) { if ($prefix ne '') { - print SPEC "mkdir -p \$RPM_BUILD_ROOT$prefix\n"; - print SPEC "pushd \$RPM_BUILD_ROOT$prefix\n"; + print SPEC "mkdir -p \$RPM_BUILD_ROOT$prefix\n"; + print SPEC "pushd \$RPM_BUILD_ROOT$prefix\n"; } print SPEC "cat <.filelist\n"; print SPEC "$_\n" for map {$cpiopre.substr($_, 1)} @cfl; @@ -743,15 +743,15 @@ sub handle_rpms { print SPEC "rpm2cpio $rpm | cpio -i -d -v -E .filelist\n"; print SPEC "rm .filelist\n"; if (%ghosts) { - for my $fn (grep {$ghosts{$_}} @cfl) { - my $fnm = $fn; - $fnm = '.' unless $fnm =~ s/\/[^\/]+$//; - print SPEC "mkdir -p \$RPM_BUILD_ROOT$prefix$fnm\n"; - print SPEC "touch \$RPM_BUILD_ROOT$prefix$fn\n"; - } + for my $fn (grep {$ghosts{$_}} @cfl) { + my $fnm = $fn; + $fnm = '.' unless $fnm =~ s/\/[^\/]+$//; + print SPEC "mkdir -p \$RPM_BUILD_ROOT$prefix$fnm\n"; + print SPEC "touch \$RPM_BUILD_ROOT$prefix$fn\n"; + } } if ($prefix ne '') { - print SPEC "popd\n"; + print SPEC "popd\n"; } } if (%cfiles || %moves) { @@ -763,14 +763,14 @@ sub handle_rpms { print SPEC "rpm2cpio $rpm | cpio -i -d -v -E .filelist\n"; print SPEC "popd\n"; if (%cfiles) { - print SPEC "mkdir -p \$RPM_BUILD_ROOT$configdir\n"; - print SPEC "mv .cfiles$_ \$RPM_BUILD_ROOT$configdir\n" for sort keys %cfiles; + print SPEC "mkdir -p \$RPM_BUILD_ROOT$configdir\n"; + print SPEC "mv .cfiles$_ \$RPM_BUILD_ROOT$configdir\n" for sort keys %cfiles; } for my $fn (sort keys %moves) { - my $fnm = $moves{$fn}; - $fnm = '.' unless $fnm =~ s/\/[^\/]+$//; - print SPEC "mkdir -p \$RPM_BUILD_ROOT$fnm\n"; - print SPEC "mv .cfiles$fn \$RPM_BUILD_ROOT$moves{$fn}\n"; + my $fnm = $moves{$fn}; + $fnm = '.' unless $fnm =~ s/\/[^\/]+$//; + print SPEC "mkdir -p \$RPM_BUILD_ROOT$fnm\n"; + print SPEC "mv .cfiles$fn \$RPM_BUILD_ROOT$moves{$fn}\n"; } print SPEC "rm -rf .cfiles\n"; } @@ -789,32 +789,32 @@ sub handle_rpms { print SPEC "%pre -n $targetname"; print SPEC $prein[0] =~ /^\"-p/ ? " " : "\n"; for (@prein) { - die("bad prein rule: $_\n") unless /^\"(.*)\"$/; - print SPEC "$1\n"; + die("bad prein rule: $_\n") unless /^\"(.*)\"$/; + print SPEC "$1\n"; } } if (@postin) { print SPEC "%post -n $targetname"; print SPEC $postin[0] =~ /^\"-p/ ? " " : "\n"; for (@postin) { - die("bad postin rule: $_\n") unless /^\"(.*)\"$/; - print SPEC "$1\n"; + die("bad postin rule: $_\n") unless /^\"(.*)\"$/; + print SPEC "$1\n"; } } if (@preun) { print SPEC "%preun -n $targetname"; print SPEC $preun[0] =~ /^\"-p/ ? " " : "\n"; for (@preun) { - die("bad preun rule: $_\n") unless /^\"(.*)\"$/; - print SPEC "$1\n"; + die("bad preun rule: $_\n") unless /^\"(.*)\"$/; + print SPEC "$1\n"; } } if (@postun) { print SPEC "%postun -n $targetname"; print SPEC $postun[0] =~ /^\"-p/ ? " " : "\n"; for (@postun) { - die("bad postun rule: $_\n") unless /^\"(.*)\"$/; - print SPEC "$1\n"; + die("bad postun rule: $_\n") unless /^\"(.*)\"$/; + print SPEC "$1\n"; } } @@ -830,53 +830,53 @@ sub handle_rpms { my $fv = $res{'FILEVERIFYFLAGS'}->[$fi]; my $ff = $res{'FILEFLAGS'}->[$fi]; if (POSIX::S_ISDIR($fm)) { - print SPEC "%dir "; + print SPEC "%dir "; } if ($ff & ((1 << 3) | (1 << 4))) { - print SPEC "%config(missingok noreplace) "; + print SPEC "%config(missingok noreplace) "; } elsif ($ff & (1 << 3)) { - print SPEC "%config(missingok) "; + print SPEC "%config(missingok) "; } elsif ($ff & (1 << 4)) { - print SPEC "%config(noreplace) "; + print SPEC "%config(noreplace) "; } elsif ($ff & (1 << 0)) { - print SPEC "%config "; + print SPEC "%config "; } print SPEC "%doc " if $ff & (1 << 1); print SPEC "%ghost " if $ff & (1 << 6); print SPEC "%license " if $ff & (1 << 7); print SPEC "%readme " if $ff & (1 << 8); if ($fv != 4294967295) { - print SPEC "%verify("; - if ($fv & 2147483648) { - print SPEC "not "; - $fv ^= 4294967295; - } - print SPEC "md5 " if $fv & (1 << 0); - print SPEC "size " if $fv & (1 << 1); - print SPEC "link " if $fv & (1 << 2); - print SPEC "user " if $fv & (1 << 3); - print SPEC "group " if $fv & (1 << 4); - print SPEC "mtime " if $fv & (1 << 5); - print SPEC "mode " if $fv & (1 << 6); - print SPEC "rdev " if $fv & (1 << 7); - print SPEC ") "; + print SPEC "%verify("; + if ($fv & 2147483648) { + print SPEC "not "; + $fv ^= 4294967295; + } + print SPEC "md5 " if $fv & (1 << 0); + print SPEC "size " if $fv & (1 << 1); + print SPEC "link " if $fv & (1 << 2); + print SPEC "user " if $fv & (1 << 3); + print SPEC "group " if $fv & (1 << 4); + print SPEC "mtime " if $fv & (1 << 5); + print SPEC "mode " if $fv & (1 << 6); + print SPEC "rdev " if $fv & (1 << 7); + print SPEC ") "; } #sigh, no POSIX::S_ISLNK ... if (($fm & 0170000) == 0120000) { - printf SPEC "%%attr(-,%s,%s) ", $res{'FILEUSERNAME'}->[$fi], $res{'FILEGROUPNAME'}->[$fi]; + printf SPEC "%%attr(-,%s,%s) ", $res{'FILEUSERNAME'}->[$fi], $res{'FILEGROUPNAME'}->[$fi]; } else { - printf SPEC "%%attr(%03o,%s,%s) ", $fm & 07777, $res{'FILEUSERNAME'}->[$fi], $res{'FILEGROUPNAME'}->[$fi]; + printf SPEC "%%attr(%03o,%s,%s) ", $fm & 07777, $res{'FILEUSERNAME'}->[$fi], $res{'FILEGROUPNAME'}->[$fi]; } if ($cfiles{$file}) { - my $fn = $file; - $fn =~ s/.*\///; - print SPEC "$configdir/$fn\n"; + my $fn = $file; + $fn =~ s/.*\///; + print SPEC "$configdir/$fn\n"; } else { - if ($moves{$file}) { - print SPEC "$moves{$file}\n"; - } else { - print SPEC "$prefix$file\n"; - } + if ($moves{$file}) { + print SPEC "$moves{$file}\n"; + } else { + print SPEC "$prefix$file\n"; + } } } for (keys %symlinks) { @@ -890,14 +890,14 @@ sub handle_rpms { my @wdays = qw{Sun Mon Tue Wed Thu Fri Sat}; my @months = qw{Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec}; for my $cc (@{$res{'CHANGELOGTEXT'}}) { - my @lt = localtime($ct[0]); - my $cc2 = $cc; - my $cn2 = $cn[0]; - $cc2 =~ s/%/%%/g; - $cn2 =~ s/%/%%/g; - printf SPEC "* %s %s %02d %04d %s\n%s\n", $wdays[$lt[6]], $months[$lt[4]], $lt[3], 1900 + $lt[5], $cn2, $cc2; - shift @ct; - shift @cn; + my @lt = localtime($ct[0]); + my $cc2 = $cc; + my $cn2 = $cn[0]; + $cc2 =~ s/%/%%/g; + $cn2 =~ s/%/%%/g; + printf SPEC "* %s %s %02d %04d %s\n%s\n", $wdays[$lt[6]], $months[$lt[4]], $lt[3], 1900 + $lt[5], $cn2, $cc2; + shift @ct; + shift @cn; } } @@ -924,8 +924,8 @@ sub handle_debs { if ($@){ print "mkbaselibs needs the perl module Parse::DebControl\n". "Error. baselibs-deb.conf specified but mkbaselibs can't run\n". - "Please ensure that 'osc meta prjconf' contains the following line:\n". - " Support: libparse-debcontrol-perl\n"; + "Please ensure that 'osc meta prjconf' contains the following line:\n". + " Support: libparse-debcontrol-perl\n"; return; }; @@ -1031,36 +1031,36 @@ sub handle_debs { # Tidy up the various control files. # the md5sums are regenerated by dpkg-deb when building foreach my $c_file qw(conffiles postinst postrm preinst prerm) { - unlink "${baseTarget}/DEBIAN/$c_file"; + unlink "${baseTarget}/DEBIAN/$c_file"; } # Create them if needed if (@prein) { - map s/^"(.*)"$/$1/, @prein; # remove leading/trailing "s - open(my $SCRIPT, ">${baseTarget}/DEBIAN/preinst"); - print $SCRIPT join("\n", @prein) ; - chmod(0755, $SCRIPT); - close($SCRIPT); + map s/^"(.*)"$/$1/, @prein; # remove leading/trailing "s + open(my $SCRIPT, ">${baseTarget}/DEBIAN/preinst"); + print $SCRIPT join("\n", @prein) ; + chmod(0755, $SCRIPT); + close($SCRIPT); } if (@postin) { - map s/^"(.*)"$/$1/, @postin; - open(my $SCRIPT, ">${baseTarget}/DEBIAN/postinst"); - print $SCRIPT join("\n", @postin) ; - chmod(0755, $SCRIPT); - close($SCRIPT); + map s/^"(.*)"$/$1/, @postin; + open(my $SCRIPT, ">${baseTarget}/DEBIAN/postinst"); + print $SCRIPT join("\n", @postin) ; + chmod(0755, $SCRIPT); + close($SCRIPT); } if (@preun) { - map s/^"(.*)"$/$1/, @preun; - open(my $SCRIPT, ">${baseTarget}/DEBIAN/prerm"); - print $SCRIPT join("\n", @preun) ; - chmod(0755, $SCRIPT); - close($SCRIPT); + map s/^"(.*)"$/$1/, @preun; + open(my $SCRIPT, ">${baseTarget}/DEBIAN/prerm"); + print $SCRIPT join("\n", @preun) ; + chmod(0755, $SCRIPT); + close($SCRIPT); } if (@postun) { - map s/^"(.*)"$/$1/, @postun; - open(my $SCRIPT, ">${baseTarget}/DEBIAN/postrm"); - print $SCRIPT join("\n", @postun) ; - chmod(0755, $SCRIPT); - close($SCRIPT); + map s/^"(.*)"$/$1/, @postun; + open(my $SCRIPT, ">${baseTarget}/DEBIAN/postrm"); + print $SCRIPT join("\n", @postun) ; + chmod(0755, $SCRIPT); + close($SCRIPT); } # Don't forget to rename the package - or it will replace/uninstall the /-based one -- cgit v1.2.3