CONFLICT Accepting request 84971: fixed kvm, xen and qemu support

Rev openSUSE:Factory/58 Md5 2de64d4a5c2c01662723508b351c73de 2011-09-27 14:07:54 saschpe 84971

_service

@@ -1,6 +1,6 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="version">2011.07.01</param>
+    <param name="version">2011.09.26</param>
     <param name="url">git://gitorious.org/opensuse/build.git</param>
     <param name="scm">git</param>
   </service>

build-2011.07.01.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:084956f749d3e778c23039fc7a7d5d9795df338a3ac9b7644b84799127375fb6
-size 269586

build-2011.09.26.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94473d8ca028f2dc7640d2220290fb5d85315d78c6f55fccb7d7c0b5678c8f69
+size 122310

build-mkbaselibs-sle.spec

@@ -23,8 +23,8 @@ License:        GPLv2+
 Group:          Development/Tools/Building
 AutoReqProv:    on
 Summary:        Tools to generate base lib packages
-Version:        2011.07.01
-Release:        2
+Version:        2011.09.26
+Release:        0
 #!BuildIgnore:  build-mkbaselibs
 Provides:       build-mkbaselibs
 Source:         build-%{version}.tar.gz

build.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Sep 26 20:33:59 UTC 2011 - adrian@suse.de
+
+- fixing kvm cpuid setting for AMD and Intel CPU's
+- support new xen tools
+- fixed qemu build initialisation
+
 -------------------------------------------------------------------
 Sun Aug  7 19:58:28 UTC 2011 - opensuse@cboltz.de
 

build.dsc

@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 2011.07.01
+Version: 2011.09.26
 Binary: build
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all

build.spec

@@ -23,8 +23,8 @@ License:        GPLv2+
 Group:          Development/Tools/Building
 AutoReqProv:    on
 Summary:        A Script to Build SUSE Linux RPMs
-Version:        2011.07.01
-Release:        3
+Version:        2011.09.26
+Release:        0
 #!BuildIgnore:  build-mkbaselibs
 Source:         build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -100,6 +100,11 @@ cd $RPM_BUILD_ROOT/usr/lib/build/configs/
 %if 0%{?suse_version}
 %if 0%{?sles_version}
  ln -s sles%{sles_version}.conf default.conf
+%if 0%{?sles_version} < 12
+ # use sle variation with IA64 compat package generation
+ install -m 0644 baselibs_global-sle.conf \
+                $RPM_BUILD_ROOT/usr/lib/build/baselibs_global.conf
+%endif
 %else
  V=%suse_version
  ln -s sl${V:0:2}.${V:2:1}.conf default.conf

debian.changelog

@@ -1,3 +1,9 @@
+build (2011.09.26-1) unstable; urgency=low
+
+  * Update to current git trunk
+
+ -- Adrian Schroeter <adrian@suse.de>  Fri, 01 Jul 2010 10:03:54 +0200
+
 build (2011.07.01-1) unstable; urgency=low
 
   * Update to current git trunk