Adrian Schröter 2017-08-21 14:52:42 +00:00 committed by Git OBS Bridge
parent cb17c603cb
commit 2c774f886c
5 changed files with 15 additions and 8 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5ee9e881e276dbf4dac0a16deb4ce908e1743da1c5dd3049dd67bb52e939bc97
size 1305612

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:52f5d545fb29c7d7a84e25b430e61d96a2e182ce26e7b8faa69dd642aecc04e8
size 1422348

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Aug 21 14:47:29 UTC 2017 - adrian@suse.de
- bring back media.1/products file
=> means that pure repomd data is not anymore enough for YaST
installer
-------------------------------------------------------------------
Mon Aug 21 12:18:40 UTC 2017 - adrian@suse.de

View File

@ -1,5 +1,5 @@
name: product-builder
version: 1.0~pre.1503323743.11ee104
mtime: 1503323743
commit: 11ee1048c7dd18d6827bb8792be2da89a82f0860
version: 1.0~pre.1503326741.f9c347a
mtime: 1503326741
commit: f9c347a8cfc241a72c748d751aec42ed1f246715

View File

@ -24,10 +24,10 @@ Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
<<<<<<< ./product-builder.spec.mine
Version: 1.0~pre.1503323743.11ee104
Version: 1.0~pre.1503326741.f9c347a
Release: 0
=======
Version: 1.0~pre.1503323743.11ee104
Version: 1.0~pre.1503326741.f9c347a
Release: 0
>>>>>>> ./product-builder.spec.r0ff8f0de04c2f43d9df4f23d686c1e9c
Provides: kiwi-schema = 6.2