Hello community,
here is the log from the commit of package installation-images for openSUSE:Factory
checked in at Wed Apr 21 18:22:26 CEST 2010.
--------
--- installation-images/installation-images.changes 2010-04-12 11:53:24.000000000 +0200
+++ installation-images/installation-images.changes 2010-04-21 17:23:22.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 21 17:23:12 CEST 2010 - snwint@suse.de
+
+- support wildcard in package name to avoid specifying the package version
+- adjust package config
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
installation-images-12.46.tar.bz2
needed_space_in_mb
New:
----
installation-images-12.47.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.lr7LU6/_old 2010-04-21 18:21:24.000000000 +0200
+++ /var/tmp/diff_new_pack.lr7LU6/_new 2010-04-21 18:21:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package installation-images (Version 12.46)
+# spec file for package installation-images (Version 12.47)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -103,9 +103,9 @@
Obsoletes: y2image
AutoReqProv: off
Summary: Installation Image Files
-Version: 12.46
+Version: 12.47
Release: 1
-Source: installation-images-12.46.tar.bz2
+Source: installation-images-12.47.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
++++++ installation-images-12.46.tar.bz2 -> installation-images-12.47.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/README new/installation-images-12.47/README
--- old/installation-images-12.46/README 2010-02-05 11:43:09.000000000 +0100
+++ new/installation-images-12.47/README 2010-04-21 17:22:59.000000000 +0200
@@ -146,6 +146,9 @@
may be empty, which matters only for disk usage accounting.
Files are still taken from the last non-empty .
+ can contain '*'s. In that case the latest package version
+ is used. If ends in '~' the last but one version is used.
+
examples:
k_delft:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/VERSION new/installation-images-12.47/VERSION
--- old/installation-images-12.46/VERSION 2010-04-12 11:53:03.000000000 +0200
+++ new/installation-images-12.47/VERSION 2010-04-21 17:23:05.000000000 +0200
@@ -1 +1 @@
-12.46
+12.47
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/changelog new/installation-images-12.47/changelog
--- old/installation-images-12.46/changelog 2010-04-12 11:53:06.000000000 +0200
+++ new/installation-images-12.47/changelog 2010-04-21 17:23:08.000000000 +0200
@@ -1,4 +1,8 @@
-2010-04-12: HEAD
+2010-04-21: HEAD
+ - support wildcard in package name to avoid specifying the package version
+ - adjust package config
+
+2010-04-12: 12.46
- added /etc/xorg.conf.d (bnc #595641)
2010-04-09: 12.45
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/data/base/base.file_list new/installation-images-12.47/data/base/base.file_list
--- old/installation-images-12.46/data/base/base.file_list 2010-04-06 17:03:00.000000000 +0200
+++ new/installation-images-12.47/data/base/base.file_list 2010-04-21 17:22:59.000000000 +0200
@@ -273,7 +273,7 @@
/usr/lib*/liblber-*.so.*
/usr/lib*/libldap-*.so.*
-libopenssl0_9_8:
+libopenssl*:
/usr/lib*/libcrypto.so.*
/usr/lib*/libssl.so.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/data/initrd/biostest.file_list new/installation-images-12.47/data/initrd/biostest.file_list
--- old/installation-images-12.46/data/initrd/biostest.file_list 2010-04-06 17:03:00.000000000 +0200
+++ new/installation-images-12.47/data/initrd/biostest.file_list 2010-04-21 17:22:59.000000000 +0200
@@ -56,6 +56,13 @@
/usr/lib*/libopensc.so.*
/usr/lib*/libscconf.so.*
+# FIXME
+if exists(libopenssl*~)
+ libopenssl*~:
+ /usr/lib*/libcrypto.so.*
+ /usr/lib*/libssl.so.*
+endif
+
krb5:
/etc
/usr/lib*/libkrb5.so.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/data/initrd/initrd.file_list new/installation-images-12.47/data/initrd/initrd.file_list
--- old/installation-images-12.46/data/initrd/initrd.file_list 2010-04-12 11:40:19.000000000 +0200
+++ new/installation-images-12.47/data/initrd/initrd.file_list 2010-04-21 17:22:59.000000000 +0200
@@ -424,7 +424,7 @@
endif
# i386/x86_64/ppc
-libopenssl0_9_8:
+libopenssl*:
/usr/lib*/libcrypto.so.*
/usr/lib*/libssl.so.*
@@ -669,9 +669,10 @@
bind-libs:
/usr/lib*
+endif
+
libcap2:
/lib*
-endif
strace:
/usr/bin/strace
@@ -705,11 +706,13 @@
/var/run/nscd
if exists(xorg-x11-driver-input)
- /lib/udev/rules.d
+ xorg-x11-driver-input:
+ /lib/udev/rules.d
endif
if exists(xorg-x11-server)
- /etc/modprobe.d
+ xorg-x11-server:
+ /etc/modprobe.d
endif
if 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/data/rescue/rescue.file_list new/installation-images-12.47/data/rescue/rescue.file_list
--- old/installation-images-12.46/data/rescue/rescue.file_list 2010-04-06 17:03:00.000000000 +0200
+++ new/installation-images-12.47/data/rescue/rescue.file_list 2010-04-21 17:22:59.000000000 +0200
@@ -467,10 +467,17 @@
/usr/lib*/liblber-*.so.*
/usr/lib*/libldap-*.so.*
-libopenssl0_9_8:
+libopenssl*:
/usr/lib*/libcrypto.so.*
/usr/lib*/libssl.so.*
+# FIXME
+if exists(libopenssl*~)
+ libopenssl*~:
+ /usr/lib*/libcrypto.so.*
+ /usr/lib*/libssl.so.*
+endif
+
cyrus-sasl:
/usr/lib*/libsasl2.so.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/data/root/machbunt.file_list new/installation-images-12.47/data/root/machbunt.file_list
--- old/installation-images-12.46/data/root/machbunt.file_list 2010-04-12 11:39:42.000000000 +0200
+++ new/installation-images-12.47/data/root/machbunt.file_list 2010-04-21 17:22:59.000000000 +0200
@@ -37,7 +37,6 @@
xorg-x11-driver-input:
/etc/X11/xorg.conf.d
/usr/lib*/xorg/modules/input
- /usr/share/hal
xorg-x11-driver-video:
/usr/lib*/xorg/modules/drivers/ati_drv.so
@@ -65,7 +64,6 @@
xorg-x11-driver-virtualbox-ose:
/etc/X11/xorg.conf.d
/usr/lib*/xorg/modules
- /usr/share/hal
endif
xterm:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/data/root/root.file_list new/installation-images-12.47/data/root/root.file_list
--- old/installation-images-12.46/data/root/root.file_list 2010-04-06 17:03:00.000000000 +0200
+++ new/installation-images-12.47/data/root/root.file_list 2010-04-21 17:22:59.000000000 +0200
@@ -753,9 +753,15 @@
/etc
/usr/bin
-libopenssl0_9_8:
+libopenssl*:
/usr/lib*
+# FIXME
+if exists(libopenssl*~)
+ libopenssl*~:
+ /usr/lib*
+endif
+
openssl:
/usr/share/ssl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/data/root/zenroot.file_list new/installation-images-12.47/data/root/zenroot.file_list
--- old/installation-images-12.46/data/root/zenroot.file_list 2010-04-06 17:03:00.000000000 +0200
+++ new/installation-images-12.47/data/root/zenroot.file_list 2010-04-21 17:22:59.000000000 +0200
@@ -371,7 +371,7 @@
/usr/sbin
/usr/lib*
-libopenssl0_9_8:
+libopenssl*:
/usr/lib*/libcrypto.so.*
/usr/lib*/libssl.so.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/etc/module.config new/installation-images-12.47/etc/module.config
--- old/installation-images-12.46/etc/module.config 2010-04-06 17:03:00.000000000 +0200
+++ new/installation-images-12.47/etc/module.config 2010-04-21 17:22:59.000000000 +0200
@@ -708,6 +708,7 @@
cxgb3,"Chelsio T3 10Gb Ethernet"
cxgb3i,"Chelsio S3xx iSCSI"
cxgb3i_ddp,,-
+cxgb4,"Chelsio T4"
tlan,"Compaq Netelligent 10/100/NetFlex 3",,,,,0
cs89x0,"CS89x0"
de600,"D-Link DE600 pocket adaptor",,,,,0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/lib/AddFiles.pm new/installation-images-12.47/lib/AddFiles.pm
--- old/installation-images-12.46/lib/AddFiles.pm 2010-04-06 17:03:00.000000000 +0200
+++ new/installation-images-12.47/lib/AddFiles.pm 2010-04-21 17:23:00.000000000 +0200
@@ -277,6 +277,11 @@
undef $rc;
undef $r;
+
+ $r = RealRPM $p;
+ warn("$Script: no such package: $p"), next unless $r;
+ $p = $r;
+
if($p =~ /^\//) {
$r = $p;
warn("$Script: no such package: $r"), next unless -f $r;
@@ -747,7 +752,7 @@
substr($re, length($2), length($3)) = $val;
}
- $re =~ s/\bexists\(([^)]*)\)/-f(RPMFileName($1)) ? 1 : 0/eg;
+ $re =~ s/\bexists\(([^)]*)\)/RealRPM($1) ? 1 : 0/eg;
return $re;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.46/lib/ReadConfig.pm new/installation-images-12.47/lib/ReadConfig.pm
--- old/installation-images-12.46/lib/ReadConfig.pm 2010-02-05 11:43:09.000000000 +0100
+++ new/installation-images-12.47/lib/ReadConfig.pm 2010-04-21 17:23:00.000000000 +0200
@@ -165,7 +165,7 @@
@ISA = qw ( Exporter );
@EXPORT = qw (
$Script $BasePath $LibPath $BinPath $CfgPath $ImagePath $DataPath
- $TmpBase %ConfigData RPMFileName $SUBinary SUSystem Print2File $MToolsCfg $AutoBuild
+ $TmpBase %ConfigData RPMFileName RealRPM $SUBinary SUSystem Print2File $MToolsCfg $AutoBuild
);
use strict 'vars';
@@ -270,6 +270,32 @@
}
+sub RealRPM
+{
+ my $rpm = shift;
+ my ($f, @f, $p, $back);
+ local $_;
+
+ my $dir = $ConfigData{'suse_base'};
+
+ $back = 1 if $rpm =~ s/~$//;
+
+ @f = <$dir/$rpm.rpm>;
+ s#^.*/|\.rpm$##g for @f;
+ # @f = grep { !/(-32bit|-debuginfo|-debugsource|-devel)$/ } @f;
+ $p = $rpm;
+ $p = "\Q$p";
+ $p =~ s/\\\*/([0-9_]+)/g;
+ @f = grep { /^$p$/ } @f;
+ @f = sort @f;
+ # for (@f) { print ">$_<\n"; }
+ $f = pop @f;
+ $f = pop @f if $back;
+
+ return $f;
+}
+
+
#
# execute string as root
#
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org