Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at 2014-12-21 12:04:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxc (Old) and /work/SRC/openSUSE:Factory/.lxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxc" Changes: -------- --- /work/SRC/openSUSE:Factory/lxc/lxc.changes 2014-12-09 09:13:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lxc.new/lxc.changes 2014-12-21 12:04:36.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Dec 17 17:21:48 UTC 2014 - [email protected] + +- Improved error message + +------------------------------------------------------------------- +Wed Dec 17 13:02:29 UTC 2014 - [email protected] + +- Disabling builds on 13.2/Tumbleweed only, if build version before 20141120 + Patch 0007-lxc-opensuse-Disabling-builds-on-13.2-Tumbleweed-onl.patch + +------------------------------------------------------------------- +Fri Dec 12 21:14:18 UTC 2014 - [email protected] + +- lxc-opensuse default release changed to 13.1, as 12.3 reaches end-of-life soon + Patch 0006-lxc-opensuse-default-release-changed-to-13.1-as-12.3.patch +------------------------------------------------------------------- New: ---- 0006-lxc-opensuse-default-release-changed-to-13.1-as-12.3.patch 0007-lxc-opensuse-Disabling-builds-on-13.2-Tumbleweed-onl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.BH7RFh/_old 2014-12-21 12:04:37.000000000 +0100 +++ /var/tmp/diff_new_pack.BH7RFh/_new 2014-12-21 12:04:37.000000000 +0100 @@ -30,6 +30,8 @@ Patch4: 0003-lxc-opensuse-template-now-understands-release-argume.patch Patch3: 0004-lxc-opensuse.in-Added-explanation-on-how-to-use-the-.patch Patch5: 0005-lxc-opensuse.in-Check-if-given-argument-is-a-valid-r.patch +Patch6: 0006-lxc-opensuse-default-release-changed-to-13.1-as-12.3.patch +Patch7: 0007-lxc-opensuse-Disabling-builds-on-13.2-Tumbleweed-onl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -82,6 +84,8 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build chmod 755 configure ++++++ 0006-lxc-opensuse-default-release-changed-to-13.1-as-12.3.patch ++++++ >From 37333bf97f6a69387357a0299c8d2ce2c214ecc4 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Fri, 12 Dec 2014 22:11:14 +0100 Subject: [PATCH] lxc-opensuse default release changed to 13.1, as 12.3 reaches end-of-life soon Signed-off-by: Johannes Kastl <[email protected]> --- templates/lxc-opensuse.in | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in index 812b73d..5bae584 100644 --- a/templates/lxc-opensuse.in +++ b/templates/lxc-opensuse.in @@ -361,8 +361,8 @@ usage() { cat <<EOF $1 -h|--help -p|--path=<path> -r|--release nn.n --clean -Please give the release as 12.3, 13.1, 13.2 etc. -If no release is given, openSUSE 12.3 is installed. +Please give the release as 13.1, 13.2 etc. +If no release is given, openSUSE 13.1 is installed. EOF return 0 } @@ -411,15 +411,11 @@ fi if [ -z "$DISTRO" ]; then echo "" - echo "No release selected, using openSUSE 12.3" - DISTRO=12.3 + echo "No release selected, using openSUSE 13.1" + DISTRO=13.1 else echo "" case "$DISTRO" in - 12.3) - echo "Selected openSUSE 12.3" - ;; - 13.1) echo "Selected openSUSE 13.1" ;; -- 2.2.0 ++++++ 0007-lxc-opensuse-Disabling-builds-on-13.2-Tumbleweed-onl.patch ++++++ >From 0704a340d4af0e7c3eb9afb6bac91c2aaff83278 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Wed, 17 Dec 2014 13:53:38 +0100 Subject: [PATCH] lxc-opensuse: Disabling builds on 13.2/Tumbleweed only if version of build is before 20141120 Signed-off-by: Johannes Kastl <[email protected]> --- templates/lxc-opensuse.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in index 5bae584..772ef96 100644 --- a/templates/lxc-opensuse.in +++ b/templates/lxc-opensuse.in @@ -405,8 +405,10 @@ if [ -z "$path" ]; then fi if grep -q Harlequin /etc/os-release || grep -q Tumbleweed /etc/os-release ; then - echo "Building containers on openSUSE 13.2 or Tumbleweed is broken at the moment. We are working on this problem." - exit 1 + if [[ "$(zypper info build|awk -F "[- ]" '/Version/ {print $2}')" -lt "20141120" ]] ; then + echo "Building openSUSE containers with your version of the build package is broken. Please install the update to version 20141120 or newer." + exit 1 + fi fi if [ -z "$DISTRO" ]; then -- 2.2.0 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
