From c4d0489cee91414a776050cb81546f225d38aa2c28317d5451cdcf16762df6f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 27 Apr 2017 09:52:49 +0000 Subject: [PATCH] conflicts OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=7 --- _service | 2 +- ...builder-1.0~pre.1490686312.b24ea32.obscpio | 3 --- _service:obs_scm:product-builder.obsinfo | 5 ---- product-builder.changes | 2 +- product-builder.spec | 25 ++++++++++--------- 5 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 _service:obs_scm:product-builder-1.0~pre.1490686312.b24ea32.obscpio delete mode 100644 _service:obs_scm:product-builder.obsinfo diff --git a/_service b/_service index 31e5a08..33f248e 100644 --- a/_service +++ b/_service @@ -1,5 +1,5 @@ - + https://github.com/openSUSE/product-builder.git 1.0~pre git diff --git a/_service:obs_scm:product-builder-1.0~pre.1490686312.b24ea32.obscpio b/_service:obs_scm:product-builder-1.0~pre.1490686312.b24ea32.obscpio deleted file mode 100644 index b5ccefc..0000000 --- a/_service:obs_scm:product-builder-1.0~pre.1490686312.b24ea32.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:48634eed52fc7cb4e04cdc9fd74c438e821f62e92562a5ebc74a23f422070efb -size 1306636 diff --git a/_service:obs_scm:product-builder.obsinfo b/_service:obs_scm:product-builder.obsinfo deleted file mode 100644 index 4610b4c..0000000 --- a/_service:obs_scm:product-builder.obsinfo +++ /dev/null @@ -1,5 +0,0 @@ -name: product-builder -version: 1.0~pre.1490686312.b24ea32 -mtime: 1490686312 -commit: b24ea325287cea2480d15a97d7531f6ee5a4f39c - diff --git a/product-builder.changes b/product-builder.changes index 0264319..c9f841d 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- Tue Apr 11 14:57:20 UTC 2017 - adrian@suse.de -- initial package +- initial package based on kiwi 7, first attempt for Leap 15 diff --git a/product-builder.spec b/product-builder.spec index 6eef03b..88a2278 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -1,7 +1,7 @@ # # spec file for package product-builder # -# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -11,24 +11,25 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# Please submit bugfixes or comments via: -# -# https://github.com/openSUSE/product-builder/issues -# -# + + Summary: SUSE Product Builder -Url: http://github.com/openSUSE/product-builder -Name: product-builder License: GPL-2.0 Group: System/Management +Url: http://github.com/openSUSE/product-builder +Name: product-builder +Conflicts: kiwi +Conflicts: kiwi-instsource Version: 1.01.01 -Provides: kiwi-schema = 6.2 Release: 0 +Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz -Requires: perl >= %{perl_version} Requires: libxslt +Requires: perl >= %{perl_version} Requires: perl-Class-Singleton Requires: perl-Config-IniFiles >= 2.49 Requires: perl-File-Slurp @@ -41,10 +42,10 @@ Requires: perl-libwww-perl Provides: kiwi-packagemanager:instsource Requires: build +Requires: checkmedia +Requires: genisoimage Requires: inst-source-utils Requires: product-builder-plugin -Requires: genisoimage -Requires: checkmedia %ifarch %ix86 x86_64 Requires: syslinux %endif