Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2013-04-05 07:31:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inst-source-utils", Maintainer is "lr...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2013-01-29 10:46:38.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2013-04-05 07:36:27.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Apr 3 12:03:43 CEST 2013 - r...@suse.de
+
+- remove pdb code from create_package_descr
+- create_sha1sums: replace "which" by "type -p"
+- create_repo_for_patch.sh: same change
+- RPMQ: fix for name-version-release > 64 characters
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ inst-source-utils.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr
new/inst-source-utils/usr/bin/create_package_descr
--- old/inst-source-utils/usr/bin/create_package_descr 2013-01-25
01:22:42.000000000 +0100
+++ new/inst-source-utils/usr/bin/create_package_descr 2013-04-03
12:05:42.000000000 +0200
@@ -62,9 +62,8 @@
my $add_vendor = 0;
my $allow_shr = 1;
my %used_fallbacks;
-my $num_pdb_records = 0;
my $checksum_binary = "sha1sum";
-my $pdb_data_dir = "";
+my $unused_data_dir = "";
my $eula_data_dir = "";
my $ignore_file = "";
my $ignore_dir = "";
@@ -83,7 +82,6 @@
my $exit_code=shift || 1;
print "Usage: create_package_descr [OPTIONS]\n";
print " [-d DATADIR1 [-d DATADIR2 [... ] ] ] (default cwd)\n";
- print " [-p PDB_DATA_DIR ]\n";
print " [-e EULA_DIR ]\n";
print " [-x EXTRA_PROV_FILE ]\n";
print " [-r EXTRA_REQUIRES_FILE]\n";
@@ -160,7 +158,7 @@
elsif ( $arg eq "-l" ) { push @LANGUAGES , shift @ARGV ; }
elsif (( $arg eq "-h" ) || ( $arg eq "--help" )) { shift @ARGV ; usage(0); }
elsif ( $arg eq "-o" ) { $output_dir = shift @ARGV ; }
- elsif ( $arg eq "-p" ) { $pdb_data_dir = shift @ARGV ; }
+ elsif ( $arg eq "-p" ) { $unused_data_dir = shift @ARGV ; }
elsif ( $arg eq "-e" ) { $eula_data_dir = shift @ARGV ; }
elsif ( $arg eq "-r" ) { $extra_requires = shift @ARGV ; }
elsif ( $arg eq "-x" ) { $extra_provides = shift @ARGV ; }
@@ -188,12 +186,6 @@
print "INFO: datadirs : ".join(",",@DATADIRS)."\n";
print "INFO: languages : ".join(",",@LANGUAGES)."\n";
print "INFO: output dir : $output_dir\n";
-if ( -d $pdb_data_dir ) {
- print "INFO: pdb data : $pdb_data_dir\n";
-} elsif ( $pdb_data_dir ) {
- print "$pdb_data_dir is not a directory: ignoring\n";
- $pdb_data_dir = "";
-}
if ( $extra_provides ) {
if ( -f $extra_provides ) {
@@ -451,89 +443,6 @@
my $found_in = $SEEN_PACKAGE{"$rpm_name $res{1001}[0]
$res{1002}[0]"};
WriteSEntry( $pkg_main, "Shr", "$res{1000}[0] $res{1001}[0]
$res{1002}[0] $found_in");
} else {
- if ( $pdb_data_dir ) {
- my $pac_rpm_name = $rpm_name;
- $num_pdb_records++;
- delete $INC{"$pdb_data_dir/$pac_rpm_name.pl"};
- if ( ! -f "$pdb_data_dir/$pac_rpm_name.pl" ) {
- $pac_rpm_name =~ s/-32bit$//;
- $pac_rpm_name =~ s/-64bit$//;
- $pac_rpm_name =~ s/-x86$//;
- $pac_rpm_name =~ s/-ia32$//;
- $pac_rpm_name =~ s/-lang$//;
- $pac_rpm_name =~ s/-debuginfo$//;
- $pac_rpm_name =~ s/-debugsource$//;
- $pac_rpm_name =~ s/-kmp-[^-]*$/-KMP/;
- }
- if ( -f "$pdb_data_dir/$pac_rpm_name.pl") {
- require "$pdb_data_dir/$pac_rpm_name.pl";
- } else {
- # no pdb data for this package, use rpm summary
- #warn "ERROR: no pdb data for $pac_rpm_name\n";
- $pacdata{$pac_rpm_name}{$default_lang}{'label'} =
"$res{1004}[0]";
- }
- if ( ! $pacdata{$pac_rpm_name}{$default_lang}{'label'} ) {
- warn "ERROR: no pdb data for $pac_rpm_name received\n";
- }
- if ( $pacdata{$pac_rpm_name}{$default_lang}{'label'} =~ /\n/ ) {
- warn "ERROR: newline in summary for package
$pac_rpm_name\n";
- $pacdata{$pac_rpm_name}{$default_lang}{'label'} =~ s/\n/ /g;
- }
- WriteMEntry( $pkg_main, "Aut",
@{$pacdata{$pac_rpm_name}{"authorname"}} );
- if ( $do_keywords eq "1" && $pacdata{$pac_rpm_name}{"keywords"} ) {
- WriteMEntry( $pkg_main, "Kwd",
@{$pacdata{$pac_rpm_name}{"keywords"}} );
- }
- foreach my $lang (@LANGUAGES) {
- WriteSeparator( $pkg_lang{$lang} );
- WriteSEntry( $pkg_lang{$lang}, "Pkg", "$res{1000}[0]
$res{1001}[0] $res{1002}[0] $file_arch");
- if ( $pacdata{$pac_rpm_name}{$lang}{"label"} ) {
- if ( $pacdata{$pac_rpm_name}{$lang}{"label"} =~ /\n/ ) {
- warn "ERROR: newline in $lang summary for package
$pac_rpm_name\n";
- $pacdata{$pac_rpm_name}{$lang}{"label"} =~ s/\n/ /g;
- }
- WriteSEntry( $pkg_lang{$lang}, "Sum",
$pacdata{$pac_rpm_name}{$lang}{'label'} );
- } else {
- WriteSEntry( $pkg_lang{$lang}, "Sum",
$pacdata{$pac_rpm_name}{$default_lang}{'label'} );
- $used_fallbacks{$lang}++;
- }
- if ( $prefer_yastdescr eq "1" ) {
- foreach my $tag (sort keys (%tag_short)) {
- my $ytag = $tag."_yast";
- if ( $pacdata{$pac_rpm_name}{$lang}{$ytag} ) {
- WriteMEntry( $pkg_lang{$lang},
$tag_short{$tag}, @{$pacdata{$pac_rpm_name}{$lang}{$ytag}});
- } elsif ( $pacdata{$pac_rpm_name}{$lang}{$tag}
) {
- WriteMEntry( $pkg_lang{$lang},
$tag_short{$tag}, @{$pacdata{$pac_rpm_name}{$lang}{$tag}});
- } elsif (
$pacdata{$pac_rpm_name}{$default_lang}{$ytag} ) {
- WriteMEntry( $pkg_lang{$lang},
$tag_short{$tag}, @{$pacdata{$pac_rpm_name}{$default_lang}{$ytag}});
- } else {
- WriteMEntry( $pkg_lang{$lang},
$tag_short{$tag}, @{$pacdata{$pac_rpm_name}{$default_lang}{$tag}});
- }
- }
- if ( $add_licenses eq "1" ) {
- if (
$pacdata{$pac_rpm_name}{$lang}{'confirmlic_yast'} ) {
- WriteMEntry( $pkg_lang{$lang}, "Eul",
@{$pacdata{$pac_rpm_name}{$lang}{'confirmlic_yast'}});
- } elsif (
$pacdata{$pac_rpm_name}{$default_lang}{'confirmlic_yast'} ) {
- WriteMEntry( $pkg_lang{$lang}, "Eul",
@{$pacdata{$pac_rpm_name}{$default_lang}{'confirmlic_yast'}});
- }
- }
- } else {
- foreach my $tag (sort keys (%tag_short)) {
- if ( $pacdata{$pac_rpm_name}{$lang}{$tag} ) {
- WriteMEntry( $pkg_lang{$lang},
$tag_short{$tag}, @{$pacdata{$pac_rpm_name}{$lang}{$tag}});
- } else {
- WriteMEntry( $pkg_lang{$lang},
$tag_short{$tag}, @{$pacdata{$pac_rpm_name}{$default_lang}{$tag}});
- }
- }
- if ( $add_licenses eq "1" ) {
- if ( $pacdata{$pac_rpm_name}{$lang}{'confirmlic'} )
{
- WriteMEntry( $pkg_lang{$lang}, "Eul",
@{$pacdata{$pac_rpm_name}{$lang}{'confirmlic'}});
- } elsif (
$pacdata{$pac_rpm_name}{$default_lang}{'confirmlic'} ) {
- WriteMEntry( $pkg_lang{$lang}, "Eul",
@{$pacdata{$pac_rpm_name}{$default_lang}{'confirmlic'}});
- }
- }
- }
- }
- } else {
foreach my $lang (@LANGUAGES) {
WriteSeparator( $pkg_lang{$lang} );
WriteSEntry( $pkg_lang{$lang}, "Pkg", "$res{1000}[0]
$res{1001}[0] $res{1002}[0] $file_arch");
@@ -547,7 +456,6 @@
}
}
- }
}
WriteSeparator( $pkg_du );
WriteSEntry( $pkg_du, "Pkg", "$res{1000}[0] $res{1001}[0] $res{1002}[0]
$file_arch");
@@ -572,12 +480,6 @@
close ( $pkg_du );
close ( $pkg_fl ) if $do_file_list;
-if ($num_pdb_records) {
- warn ("used pdb records $num_pdb_records\n") if $num_pdb_records;
- foreach my $lang (@LANGUAGES) {
- warn ("used fallbacks for $lang $used_fallbacks{$lang}\n");
- }
-}
print "INFO: now recoding to UTF-8: ";
foreach my $file ("packages","packages.DU") {
print "$file ";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_repo_for_patch.sh
new/inst-source-utils/usr/bin/create_repo_for_patch.sh
--- old/inst-source-utils/usr/bin/create_repo_for_patch.sh 2013-01-25
01:22:42.000000000 +0100
+++ new/inst-source-utils/usr/bin/create_repo_for_patch.sh 2013-04-03
12:05:42.000000000 +0200
@@ -56,7 +56,7 @@
}
function check_binary(){
- local BINARY=$(which $1 2>/dev/null)
+ local BINARY=$(type -p $1 2>/dev/null)
if [ x"$BINARY" = x"" ]; then
echo "ERROR: $1 not found! Please install the missing package
first!" >&2
exit 3
@@ -220,8 +220,8 @@
if [ "${SIGN_ID}" = "" ]; then
if [ -f "/etc/sign.conf" ]; then
[ "$DEBUG" ] && echo "INFO: Try to sign with key from
/etc/sign.conf"
- if [ -x $(which sign) ]; then
- $(which sign) -d "$REPODIR/repodata/repomd.xml"
+ if [ -x $(type -p sign) ]; then
+ $(type -p sign) -d
"$REPODIR/repodata/repomd.xml"
else
echo "ERROR: Could not execute 'sign'" >&2
exit 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_sha1sum
new/inst-source-utils/usr/bin/create_sha1sum
--- old/inst-source-utils/usr/bin/create_sha1sum 2013-01-25
01:22:42.000000000 +0100
+++ new/inst-source-utils/usr/bin/create_sha1sum 2013-04-03
12:05:42.000000000 +0200
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301,
# USA.
#
-# $Id: create_sha1sum 421 2011-05-05 10:25:22Z ro $
+# $Id: create_sha1sum 1012 2013-02-17 10:49:03Z lrupp $
#
function usage (){
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_sha1sums
new/inst-source-utils/usr/bin/create_sha1sums
--- old/inst-source-utils/usr/bin/create_sha1sums 2013-01-25
01:22:42.000000000 +0100
+++ new/inst-source-utils/usr/bin/create_sha1sums 2013-04-03
12:05:42.000000000 +0200
@@ -19,7 +19,7 @@
# Boston, MA 02110-1301,
# USA.
#
-# $Id: create_sha1sums 419 2011-05-05 10:13:45Z ro $
+# $Id: create_sha1sums 1012 2013-02-17 10:49:03Z lrupp $
#
SIGN="yes"
@@ -50,7 +50,7 @@
}
function signit(){
- if [ "$(which sign 2>/dev/null)" != "" ]; then
+ if [ "$(type -p sign 2>/dev/null)" != "" ]; then
sign $SIGN_OPTS -d $1
sign $SIGN_OPTS -p > $1.key
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/inst-source-utils/usr/share/inst-source-utils/modules/RPMQ.pm
new/inst-source-utils/usr/share/inst-source-utils/modules/RPMQ.pm
--- old/inst-source-utils/usr/share/inst-source-utils/modules/RPMQ.pm
2013-01-25 01:22:42.000000000 +0100
+++ new/inst-source-utils/usr/share/inst-source-utils/modules/RPMQ.pm
2013-04-03 12:05:42.000000000 +0200
@@ -210,7 +210,10 @@
return undef;
}
close RPM;
- return unpack('@10Z65', $head);
+ my $name = unpack('@10Z65', $head);
+ return $name if length($name) < 65;
+ my %q = rpmq_many($rpm, 'NAME', 'VERSION', 'RELEASE');
+ return "$q{'NAME'}->[0]-$q{'VERSION'}->[0]-$q{'RELEASE'}->[0]";
}
sub rpmq {
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
