Hello community,
here is the log from the commit of package autoyast2
checked in at Wed Apr 19 15:59:53 CEST 2006.
--------
--- autoyast2/autoyast2.changes 2006-04-19 10:56:45.000000000 +0200
+++ NOARCH/autoyast2/autoyast2.changes 2006-04-19 15:45:33.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 19 15:44:06 CEST 2006 - ug@suse.de
+
+- create_package_descr updated
+- 2.13.46
+
+-------------------------------------------------------------------
Old:
----
autoyast2-2.13.45.tar.bz2
New:
----
autoyast2-2.13.46.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.1Y9mQd/_old 2006-04-19 15:59:30.000000000 +0200
+++ /var/tmp/diff_new_pack.1Y9mQd/_new 2006-04-19 15:59:30.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package autoyast2 (Version 2.13.45)
+# spec file for package autoyast2 (Version 2.13.46)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: autoyast2
URL: http://www.suse.com/
-Version: 2.13.45
+Version: 2.13.46
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.13.45.tar.bz2
+Source0: autoyast2-2.13.46.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets fop java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update
Requires: yast2-core yast2-xml libxslt
@@ -48,7 +48,7 @@
Anas Nashif
%package installation
-Version: 2.13.45
+Version: 2.13.46
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -68,7 +68,7 @@
Anas Nashif
%package utils
-Version: 2.13.45
+Version: 2.13.46
Release: 1
Summary: YaST2 - Auto Installation Utilities
Group: System/YaST
@@ -81,7 +81,7 @@
%prep
-%setup -n autoyast2-2.13.45
+%setup -n autoyast2-2.13.46
%build
%{prefix}/bin/y2tool y2autoconf
@@ -229,6 +229,9 @@
%changelog -n autoyast2
* Wed Apr 19 2006 - ug@suse.de
+- create_package_descr updated
+- 2.13.46
+* Wed Apr 19 2006 - ug@suse.de
- fixed using of the 'add_on_products'-file
- 2.13.45
* Tue Apr 18 2006 - ug@suse.de
++++++ autoyast2-2.13.45.tar.bz2 -> autoyast2-2.13.46.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.45/VERSION new/autoyast2-2.13.46/VERSION
--- old/autoyast2-2.13.45/VERSION 2006-04-19 10:38:16.000000000 +0200
+++ new/autoyast2-2.13.46/VERSION 2006-04-19 15:43:54.000000000 +0200
@@ -1 +1 @@
-2.13.45
+2.13.46
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.45/configure new/autoyast2-2.13.46/configure
--- old/autoyast2-2.13.45/configure 2006-04-19 10:55:01.000000000 +0200
+++ new/autoyast2-2.13.46/configure 2006-04-19 15:44:56.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for autoyast2 2.13.45.
+# Generated by GNU Autoconf 2.59 for autoyast2 2.13.46.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.13.45'
-PACKAGE_STRING='autoyast2 2.13.45'
+PACKAGE_VERSION='2.13.46'
+PACKAGE_STRING='autoyast2 2.13.46'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures autoyast2 2.13.45 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.13.46 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 2.13.45:";;
+ short | recursive ) echo "Configuration of autoyast2 2.13.46:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 2.13.45
+autoyast2 configure 2.13.46
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by autoyast2 $as_me 2.13.45, which was
+It was created by autoyast2 $as_me 2.13.46, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='2.13.45'
+ VERSION='2.13.46'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.45"
+VERSION="2.13.46"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
@@ -2764,7 +2764,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by autoyast2 $as_me 2.13.45, which was
+This file was extended by autoyast2 $as_me 2.13.46, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2819,7 +2819,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-autoyast2 config.status 2.13.45
+autoyast2 config.status 2.13.46
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.45/configure.in new/autoyast2-2.13.46/configure.in
--- old/autoyast2-2.13.45/configure.in 2006-04-19 10:54:55.000000000 +0200
+++ new/autoyast2-2.13.46/configure.in 2006-04-19 15:44:50.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.13.45, http://www.suse.de/feedback, autoyast2)
+AC_INIT(autoyast2, 2.13.46, http://www.suse.de/feedback, autoyast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.45"
+VERSION="2.13.46"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.45/scripts/create_package_descr new/autoyast2-2.13.46/scripts/create_package_descr
--- old/autoyast2-2.13.45/scripts/create_package_descr 2006-04-03 11:19:00.000000000 +0200
+++ new/autoyast2-2.13.46/scripts/create_package_descr 2006-04-19 15:37:20.000000000 +0200
@@ -5,6 +5,26 @@
use strict 'refs';
#use RPMQ; # FIXME: a local copy of RPM.pm is here.
+sub filter_weak {
+ my ($r, $tn, $tf) = @_;
+ my @tf = @{$r->{$tf} || []};
+ my @res;
+ for (@{$r->{$tn}}) {
+ push @res, $_ unless (shift @tf) & 0x8000000;
+ }
+ return @res;
+}
+
+sub filter_strong {
+ my ($r, $tn, $tf) = @_;
+ my @tf = @{$r->{$tf} || []};
+ my @res;
+ for (@{$r->{$tn}}) {
+ push @res, $_ if (shift @tf) & 0x8000000;
+ }
+ return @res;
+}
+
local (@DATADIRS,@LANGUAGES,%SEEN_PACKAGE,%IGNORE_PACKAGE);
my %lang_alias = ("czech"=>"cs","english"=>"en","french"=>"fr","german"=>"de","italian"=>"it","spanish"=>"es","hungarian"=>"hu" );
my %tag_short = ("description"=>"Des","notice"=>"Ins","delnotice"=>"Del");
@@ -13,6 +33,7 @@
my $ignore_symlinks = "0";
my $prefer_yastdescr = "0";
my $add_licenses = "0";
+my $do_checksums = "0";
while ( $arg = shift ( @ARGV ) ) {
if ( $arg eq "-d" ) { push @DATADIRS , shift @ARGV ; }
@@ -26,6 +47,7 @@
elsif ( $arg eq "-S" ) { $ignore_sources = "1"; }
elsif ( $arg eq "-P" ) { $prefer_yastdescr = "1"; }
elsif ( $arg eq "-L" ) { $ignore_symlinks = "1"; }
+ elsif ( $arg eq "-C" ) { $do_checksums = "1"; }
else {
print "usage: create_package_descr\n";
print " [-d DATADIR1 [-d DATADIR2 [... ] ] ] (default cwd)\n";
@@ -38,6 +60,7 @@
print " [-S ] (ignore_sources)\n";
print " [-P ] (prefer_yastdescr)\n";
print " [-L ] (ignore_symlinks)\n";
+ print " [-C ] (do_checksums)\n";
die ("unknown parameter\n");
}
}
@@ -153,19 +176,26 @@
1047, 1112, 1113,
1049, 1048, 1050,
1054, 1053, 1055,
+ 1156, 1157, 1158,
+ 1159, 1160, 1161,
1027, 1116, 1117, 1118, 1030, 1028, 1095, 1096,
1014, 1016, 1006, 1009, 1044, 1004, 1005);
- my @depexcl = $res{1054};
- my @prereq = rpmq_add_req_flagsvers(\%res, 1049, 1048, 1050); # requires
- RPM::rpmq_add_flagsvers(\%res, 1047, 1112, 1113); # provides
- RPM::rpmq_add_flagsvers(\%res, 1090, 1114, 1115); # obsoletes
- RPM::rpmq_add_flagsvers(\%res, 1054, 1053, 1055); # conflicts
+ my @depexcl = $res{1054};
+ my @prereq = rpmq_add_req_flagsvers(\%res, 1049, 1048, 1050); # requires
+ RPM::rpmq_add_flagsvers(\%res, 1047, 1112, 1113); # provides
+ RPM::rpmq_add_flagsvers(\%res, 1090, 1114, 1115); # obsoletes
+ RPM::rpmq_add_flagsvers(\%res, 1054, 1053, 1055); # conflicts
+ RPM::rpmq_add_flagsvers(\%res, 1156, 1158, 1157); # suggests
+ RPM::rpmq_add_flagsvers(\%res, 1159, 1161, 1160); # enhances
$rpm_name = $res{1000}[0];
if ( $IGNORE_PACKAGE{$rpm_name} && $IGNORE_PACKAGE{$rpm_name} eq "yes" ) {
$ignored_packages .= " $rpm_name";
next;
}
+ my $checksum = "";
+ my $dummy = "";
+ ($checksum,$dummy) = split('\s+',`sha1sum $package`) if ($do_checksums eq "1");
$srcrpm = $res{1044}[0];
$srcrpm =~ s/^(.*)-([^-]*)-([^-]*)\.([^\.]*)\.rpm$/$1 $2 $3 $4/;
if ( $res{1044}[0] ) {
@@ -196,6 +226,7 @@
WriteSeparator( $pkg_main );
WriteSEntry( $pkg_main, "Pkg", "$res{1000}[0] $res{1001}[0] $res{1002}[0] $file_arch");
+ WriteSEntry( $pkg_main, "Cks", "SHA1 $checksum") if ($checksum);
if ( $res{1044}[0] ) {
# has src, so it's a binary package
WriteMEntry( $pkg_main, "Req", @{$res{1049}} );
@@ -203,6 +234,10 @@
WriteMEntry( $pkg_main, "Prv", @{$res{1047}} );
WriteMEntry( $pkg_main, "Con", @{$res{1054}} );
WriteMEntry( $pkg_main, "Obs", @{$res{1090}} );
+ WriteMEntry( $pkg_main, "Rec", filter_strong(\%res, 1156, 1158));
+ WriteMEntry( $pkg_main, "Sug", filter_weak(\%res, 1156, 1158));
+ WriteMEntry( $pkg_main, "Sup", filter_strong(\%res, 1159, 1161));
+ WriteMEntry( $pkg_main, "Enh", filter_weak(\%res, 1159, 1161));
WriteSEntry( $pkg_main, "Grp", $res{1016}[0] );
WriteSEntry( $pkg_main, "Lic", $res{1014}[0] );
WriteSEntry( $pkg_main, "Src", $srcrpm );
@@ -218,48 +253,59 @@
WriteSEntry( $pkg_main, "Shr", "$res{1000}[0] $res{1001}[0] $res{1002}[0] $found_in");
} else {
if ( $pdb_data_dir ) {
- delete $INC{"$pdb_data_dir/$rpm_name.pl"};
- if ( -f "$pdb_data_dir/$rpm_name.pl") {
- require "$pdb_data_dir/$rpm_name.pl";
+ my $pac_rpm_name = $rpm_name;
+ $pac_rpm_name =~ s/-debuginfo//;
+ $pac_rpm_name =~ s/-kmp-[^-]*$/-KMP/;
+ delete $INC{"$pdb_data_dir/$pac_rpm_name.pl"};
+ 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
- print "no pdb data for $rpm_name found\n";
- $pacdata{$rpm_name}{'english'}{"label"} = "$res{1004}[0]";
+ print "no pdb data for $pac_rpm_name found\n";
+ $pacdata{$pac_rpm_name}{'english'}{"label"} = "$res{1004}[0]";
+ }
+ if ( $pacdata{$pac_rpm_name}{'english'}{"label"} =~ /\n/ ) {
+ warn ("newline in summary for package $pac_rpm_name\n");
+ $pacdata{$pac_rpm_name}{'english'}{"label"} =~ s/\n/ /g;
}
- WriteMEntry( $pkg_main, "Aut", @{$pacdata{$rpm_name}{"authorname"}} );
+ WriteMEntry( $pkg_main, "Aut", @{$pacdata{$pac_rpm_name}{"authorname"}} );
foreach $lang (@LANGUAGES) {
WriteSeparator( $pkg_lang{$lang} );
WriteSEntry( $pkg_lang{$lang}, "Pkg", "$res{1000}[0] $res{1001}[0] $res{1002}[0] $file_arch");
- if ( $pacdata{$rpm_name}{$lang}{"label"} ) {
- WriteSEntry( $pkg_lang{$lang}, "Sum", $pacdata{$rpm_name}{$lang}{"label"} );
+ if ( $pacdata{$pac_rpm_name}{$lang}{"label"} ) {
+ if ( $pacdata{$pac_rpm_name}{$lang}{"label"} =~ /\n/ ) {
+ warn ("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{$rpm_name}{'english'}{"label"} );
+ WriteSEntry( $pkg_lang{$lang}, "Sum", $pacdata{$pac_rpm_name}{'english'}{"label"} );
}
if ( $prefer_yastdescr eq "1" ) {
foreach $tag (keys (%tag_short)) {
- if ( $pacdata{$rpm_name}{$lang}{$tag._yast} ) {
- WriteMEntry( $pkg_lang{$lang}, $tag_short{$tag}, @{$pacdata{$rpm_name}{$lang}{$tag._yast}});
- } elsif ( $pacdata{$rpm_name}{$lang}{$tag} ) {
- WriteMEntry( $pkg_lang{$lang}, $tag_short{$tag}, @{$pacdata{$rpm_name}{$lang}{$tag}});
- } elsif ( $pacdata{$rpm_name}{'english'}{$tag._yast} ) {
- WriteMEntry( $pkg_lang{$lang}, $tag_short{$tag}, @{$pacdata{$rpm_name}{'english'}{$tag._yast}});
+ if ( $pacdata{$pac_rpm_name}{$lang}{$tag._yast} ) {
+ WriteMEntry( $pkg_lang{$lang}, $tag_short{$tag}, @{$pacdata{$pac_rpm_name}{$lang}{$tag._yast}});
+ } 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}{'english'}{$tag._yast} ) {
+ WriteMEntry( $pkg_lang{$lang}, $tag_short{$tag}, @{$pacdata{$pac_rpm_name}{'english'}{$tag._yast}});
} else {
- WriteMEntry( $pkg_lang{$lang}, $tag_short{$tag}, @{$pacdata{$rpm_name}{'english'}{$tag}});
+ WriteMEntry( $pkg_lang{$lang}, $tag_short{$tag}, @{$pacdata{$pac_rpm_name}{'english'}{$tag}});
}
}
if ( $add_licenses eq "1" ) {
- if ( $pacdata{$rpm_name}{$lang}{'confirmlic_yast'} ) {
- WriteMEntry( $pkg_lang{$lang}, "Eul", @{$pacdata{$rpm_name}{$lang}{'confirmlic_yast'}});
- } elsif ( $pacdata{$rpm_name}{'english'}{'confirmlic_yast'} ) {
- WriteMEntry( $pkg_lang{$lang}, "Eul", @{$pacdata{$rpm_name}{'english'}{'confirmlic_yast'}});
+ 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}{'english'}{'confirmlic_yast'} ) {
+ WriteMEntry( $pkg_lang{$lang}, "Eul", @{$pacdata{$pac_rpm_name}{'english'}{'confirmlic_yast'}});
}
}
} else {
foreach $tag (keys (%tag_short)) {
- if ( $pacdata{$rpm_name}{$lang}{$tag} ) {
- WriteMEntry( $pkg_lang{$lang}, $tag_short{$tag}, @{$pacdata{$rpm_name}{$lang}{$tag}});
+ 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{$rpm_name}{'english'}{$tag}});
+ WriteMEntry( $pkg_lang{$lang}, $tag_short{$tag}, @{$pacdata{$pac_rpm_name}{'english'}{$tag}});
}
}
}
@@ -276,7 +322,7 @@
WriteSeparator( $pkg_du );
WriteSEntry( $pkg_du, "Pkg", "$res{1000}[0] $res{1001}[0] $res{1002}[0] $file_arch");
WriteMEntry( $pkg_du, "Dir", @DULIST );
- $SEEN_PACKAGE{"$rpm_name $res{1001}[0] $res{1002}[0]"} = $file_arch;
+ $SEEN_PACKAGE{"$rpm_name $res{1001}[0] $res{1002}[0]"} = $file_arch unless $SEEN_PACKAGE{"$rpm_name $res{1001}[0] $res{1002}[0]"};
}
}
print " done\nprocessed $allcounter packages\n";
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...