From 92af7960160c121a9dc990639796991dd771ad7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian.schroeter@suse.com>
Date: Thu, 24 Apr 2014 19:13:08 +0000
Subject: [PATCH 1/2] merge

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=233
---
 PKGBUILD                  | 4 ++--
 build.changes             | 6 ++++++
 build.dsc                 | 2 +-
 build.spec                | 2 +-
 obs-build-20140220.tar.gz | 3 ---
 obs-build-20140424.tar.gz | 3 +++
 6 files changed, 13 insertions(+), 7 deletions(-)
 delete mode 100644 obs-build-20140220.tar.gz
 create mode 100644 obs-build-20140424.tar.gz

diff --git a/PKGBUILD b/PKGBUILD
index 55bc783a..0b0131eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=build
-pkgver=20140220
+pkgver=20140424
 pkgrel=0
 pkgdesc="Build packages in sandbox"
 arch=('i686' 'x86_64')
@@ -8,7 +8,7 @@ license=('GPL-2.0+' 'GPL-2.0')
 groups=('base-devel')
 depends=('perl')
 source=(obs-build-${pkgver}.tar.gz)
-md5sums=('2da128f38381b82851281ba6ad41aee4')
+md5sums=('118afc7b791cd6873244f4948d38ba36')
 
 package() {
   msg "Installing build ..."
diff --git a/build.changes b/build.changes
index e279ffe7..7f126ad1 100644
--- a/build.changes
+++ b/build.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr 24 19:09:19 UTC 2014 - adrian@suse.de
+
+- build script got refactored and split in multiple modules
+
 -------------------------------------------------------------------
 Thu Feb 20 18:41:16 UTC 2014 - adrian@suse.de
 
@@ -16,6 +21,7 @@ Thu Dec  5 10:01:44 UTC 2013 - adrian@suse.de
 - fix vc tool regression from "minor fixes"
 
 -------------------------------------------------------------------
+>>>>>>> .new
 Wed Dec  4 08:26:56 UTC 2013 - adrian@suse.de
 
 - support for project side configured VM kernels
diff --git a/build.dsc b/build.dsc
index 59f718f2..4e07ddcc 100644
--- a/build.dsc
+++ b/build.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 20140220
+Version: 20140424
 Binary: build
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all
diff --git a/build.spec b/build.spec
index 60f0d9ab..21f387ad 100644
--- a/build.spec
+++ b/build.spec
@@ -20,7 +20,7 @@ Name:           build
 Summary:        A Script to Build SUSE Linux RPMs
 License:        GPL-2.0+ and GPL-2.0
 Group:          Development/Tools/Building
-Version:        20140220
+Version:        20140424
 Release:        0
 #!BuildIgnore:  build-mkbaselibs
 Source:         obs-build-%{version}.tar.gz
diff --git a/obs-build-20140220.tar.gz b/obs-build-20140220.tar.gz
deleted file mode 100644
index b1a89ece..00000000
--- a/obs-build-20140220.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af959c30a9da0237cbb32a79dd55347156cd68d73f3c8f6e818a74b6c915b328
-size 156717
diff --git a/obs-build-20140424.tar.gz b/obs-build-20140424.tar.gz
new file mode 100644
index 00000000..3f6e3885
--- /dev/null
+++ b/obs-build-20140424.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a98c7c0e2020382eceee304bee65e81e92e8530a60c5b6f9b30a73803986951
+size 160362

From 83795f6bf4c464333a2f37ec00cd49314c1789c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian.schroeter@suse.com>
Date: Fri, 2 May 2014 06:52:45 +0000
Subject: [PATCH 2/2] fix changes file

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=234
---
 build.changes | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.changes b/build.changes
index 7f126ad1..961bf09a 100644
--- a/build.changes
+++ b/build.changes
@@ -21,7 +21,6 @@ Thu Dec  5 10:01:44 UTC 2013 - adrian@suse.de
 - fix vc tool regression from "minor fixes"
 
 -------------------------------------------------------------------
->>>>>>> .new
 Wed Dec  4 08:26:56 UTC 2013 - adrian@suse.de
 
 - support for project side configured VM kernels