From dd0707b38c957781bf8c7da7bd7d2cc8537f9561 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Mon, 26 Sep 2011 20:36:55 +0000 Subject: [PATCH] update Rev openSUSE:Tools/147 Md5 7f82938c1e79cccf1d2177f69c8aa27d 2011-09-26 20:36:55 adrianSuSE None --- _service | 2 +- build-2011.07.01.tar.gz | 3 --- build-2011.09.26.tar.gz | 3 +++ build-mkbaselibs-sle.spec | 4 ++-- build.changes | 7 +++++++ build.dsc | 2 +- build.spec | 9 +++++++-- debian.changelog | 6 ++++++ 8 files changed, 27 insertions(+), 9 deletions(-) delete mode 100644 build-2011.07.01.tar.gz create mode 100644 build-2011.09.26.tar.gz diff --git a/_service b/_service index 5e984b89..6311f063 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2011.07.01 + 2011.09.26 git://gitorious.org/opensuse/build.git git diff --git a/build-2011.07.01.tar.gz b/build-2011.07.01.tar.gz deleted file mode 100644 index f389687e..00000000 --- a/build-2011.07.01.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:084956f749d3e778c23039fc7a7d5d9795df338a3ac9b7644b84799127375fb6 -size 269586 diff --git a/build-2011.09.26.tar.gz b/build-2011.09.26.tar.gz new file mode 100644 index 00000000..93610e5a --- /dev/null +++ b/build-2011.09.26.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94473d8ca028f2dc7640d2220290fb5d85315d78c6f55fccb7d7c0b5678c8f69 +size 122310 diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index ab2bf864..53a5c6a8 100644 --- a/build-mkbaselibs-sle.spec +++ b/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: 1 +Version: 2011.09.26 +Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs Source: build-%{version}.tar.gz diff --git a/build.changes b/build.changes index 0d727099..0e4e04b5 100644 --- a/build.changes +++ b/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 diff --git a/build.dsc b/build.dsc index 4c8fdea0..650f77e8 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2011.07.01 +Version: 2011.09.26 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index aa00fbc0..636fff59 100644 --- a/build.spec +++ b/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: 1 +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 diff --git a/debian.changelog b/debian.changelog index 8346d602..705acdcb 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,9 @@ +build (2011.09.26-1) unstable; urgency=low + + * Update to current git trunk + + -- Adrian Schroeter Fri, 01 Jul 2010 10:03:54 +0200 + build (2011.07.01-1) unstable; urgency=low * Update to current git trunk