update

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=29
2017-08-21 12:21:32 +00:00 · 2017-08-21 12:21:32 +00:00 · 5abd6042fd
commit 5abd6042fd
parent 20ff145695
5 changed files with 17 additions and 7 deletions
--- a/product-builder-1.0~pre.1502270961.bdd5e74.obscpio
+++ b/product-builder-1.0~pre.1502270961.bdd5e74.obscpio
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9561409ca1858bd0b11d135a67dba5a14a89cc3df0141b30d17e6f89ebc71881
-size 1305612
--- a/product-builder-1.0~pre.1503317859.14d1a13.obscpio
+++ b/product-builder-1.0~pre.1503317859.14d1a13.obscpio
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f91c90d39a1006a0f8e62836767d3009fba74d52825f03d2d0e50765d1bf9244
+size 1305612
--- a/product-builder.changes
+++ b/product-builder.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug 21 12:18:40 UTC 2017 - adrian@suse.de
+
+- fix metapackage unpack loop
+
 -------------------------------------------------------------------
 Wed Aug  9 11:12:20 CEST 2017 - ro@suse.de

--- a/product-builder.obsinfo
+++ b/product-builder.obsinfo
@ -1,5 +1,5 @@
 name: product-builder
-version: 1.0~pre.1502270961.bdd5e74
-mtime: 1502270961
-commit: bdd5e74d7ee077ce1512d32a9c46e1785e5f3efd
+version: 1.0~pre.1503317859.14d1a13
+mtime: 1503317859
+commit: 14d1a13c01c20638af4d6066788f592363fcc6d7

--- a/product-builder.spec
+++ b/product-builder.spec
@ -23,8 +23,13 @@ Url:            http://github.com/openSUSE/product-builder
 Name:           product-builder
 Conflicts:      kiwi
 Conflicts:      kiwi-instsource
-Version:        1.0~pre.1502270961.bdd5e74
+<<<<<<< ./product-builder.spec.mine
+Version:        1.0~pre.1503317859.14d1a13
 Release:        0
+=======
+Version:        1.0~pre.1503317859.14d1a13
+Release:        0
+>>>>>>> ./product-builder.spec.r0ff8f0de04c2f43d9df4f23d686c1e9c
 Provides:       kiwi-schema = 6.2
 Source:         product-builder-%version.tar.xz