Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory
checked in at Fri Jul 22 17:11:44 CEST 2011.
--------
--- kiwi/kiwi.changes 2011-07-19 11:17:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-07-22 15:30:21.000000000 +0200
@@ -1,0 +2,38 @@
+Fri Jul 22 15:23:35 CEST 2011 - ms@suse.de
+
+- v4.93.2 released
+
+-------------------------------------------------------------------
+Thu Jul 21 17:10:44 CEST 2011 - ms@suse.de
+
+- fixed config dir path serach in --build mode
+
+-------------------------------------------------------------------
+Thu Jul 21 16:57:09 CEST 2011 - ms@suse.de
+
+- added patch for genName creation. The generated name is now
+ unique according to the repository name. This allows to use
+ the cache zypper creates per repository again
+
+-------------------------------------------------------------------
+Wed Jul 20 11:54:20 CEST 2011 - ms@suse.de
+
+- DB: rebuild documentation
+
+-------------------------------------------------------------------
+Wed Jul 20 11:40:01 CEST 2011 - ms@suse.de
+
+- DB: use the 2 part version number for the documentation
+
+-------------------------------------------------------------------
+Wed Jul 20 09:58:08 CEST 2011 - ms@suse.de
+
+- fixed .newrelease to just increase the release part of the new
+ kiwi version string by one
+
+-------------------------------------------------------------------
+Wed Jul 20 09:38:01 CEST 2011 - ms@suse.de
+
+- DB: rebuild images only if the .fig has changed
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.MVrl4F/_old 2011-07-22 17:11:18.000000000 +0200
+++ /var/tmp/diff_new_pack.MVrl4F/_new 2011-07-22 17:11:18.000000000 +0200
@@ -69,8 +69,8 @@
%endif
%endif
Summary: OpenSuSE - KIWI Image System
-Version: 4.93.1
-Release: 5
+Version: 4.93.2
+Release: 1
Group: System/Management
License: GPLv2
Source: %{name}.tar.bz2
++++++ kiwi-docu.tar.bz2 ++++++
kiwi/kiwi-docu.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi-docu.tar.bz2 differ: char 11, line 1
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.newrelease new/kiwi/.newrelease
--- old/kiwi/.newrelease 2009-03-10 10:29:33.000000000 +0100
+++ new/kiwi/.newrelease 2011-07-22 15:26:57.000000000 +0200
@@ -1,14 +1,10 @@
#!/bin/bash
-version=$1
-if ! echo $version | pcregrep -q "^\d+$";then
- echo "NOT A RELEASE ! ... abort"
- exit 1
-fi
+version=$(cat modules/KIWIGlobals.pm|grep {Version}|cut -f2 -d= | cut -f2 -d\")
+v_part1=$(echo $version | cut -f1-2 -d.)
+v_part2=$(echo $version | cut -f3 -d.)
+v_part2=$((v_part2 + 1))
-# spec file version update
-cat rpm/kiwi.spec | sed \
- -e s"@Release: .*@Release: $version@" \
-> rpm/kiwi.spec.new && mv rpm/kiwi.spec.new rpm/kiwi.spec
+version=$v_part1.$v_part2
-echo "update to release: $version... done"
+./.newversion $version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2011-06-12 21:49:13.000000000 +0200
+++ new/kiwi/.revision 2011-07-22 15:26:57.000000000 +0200
@@ -1 +1 @@
-b62beddc5db94b47049b45f082ea150533a6577d
+5f31fff1eb1c048ccacef6d59ac274b06224e421
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl
--- old/kiwi/kiwi.pl 2011-06-12 21:49:13.000000000 +0200
+++ new/kiwi/kiwi.pl 2011-07-22 15:26:57.000000000 +0200
@@ -941,12 +941,6 @@
}
}
#========================================
- # check if prepare & create
- #----------------------------------------
- if (defined $Build) {
- $cmdL -> setConfigDir ($Build);
- }
- #========================================
# check if force-new-root is set
#----------------------------------------
if (defined $ForceNewRoot) {
@@ -1041,6 +1035,12 @@
}
$Create =~ s/\/$//;
}
+ if (defined $Build) {
+ if (($Build !~ /^\//) && (! -d $Build)) {
+ $Build = $gdata->{System}."/".$Build;
+ }
+ $Build =~ s/\/$//;
+ }
#========================================
# store uniq path to image description
#----------------------------------------
@@ -1053,6 +1053,9 @@
if (defined $Create) {
$cmdL -> setConfigDir ($Create);
}
+ if (defined $Build) {
+ $cmdL -> setConfigDir ($Build);
+ }
#========================================
# store operation modes
#----------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWICommandLine.pm new/kiwi/modules/KIWICommandLine.pm
--- old/kiwi/modules/KIWICommandLine.pm 2011-07-01 16:20:06.000000000 +0200
+++ new/kiwi/modules/KIWICommandLine.pm 2011-07-22 15:26:57.000000000 +0200
@@ -4,7 +4,7 @@
# PROJECT : OpenSUSE Build-Service
# COPYRIGHT : (c) 2011 SUSE LINUX Products GmbH, Germany
# :
-# AUTHOR : Robert Schweikert