From 48bb9a003205501e5b53eb49735c36ff64918442bed4583882f2d226163c8005 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 16 Jan 2019 11:07:21 +0000 Subject: [PATCH] Automatic update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000release-packages?expand=0&rev=7 --- openSUSE-Addon-NonOss-release.spec | 18 ++++---- openSUSE-Tumbleweed-Kubic-release.spec | 21 ++++++---- openSUSE-release.spec | 57 ++++++++++++++++---------- stub.spec | 26 ++---------- 4 files changed, 60 insertions(+), 62 deletions(-) diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec index 6f62a51f..e497eb8e 100644 --- a/openSUSE-Addon-NonOss-release.spec +++ b/openSUSE-Addon-NonOss-release.spec @@ -1,7 +1,7 @@ # -# spec file for package openSUSE-Addon-NonOss-release +# spec file for package openSUSE-Addon-NonOss-release (Version 20190115) # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 openSUSE. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,24 +12,23 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# - Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss Summary: openSUSE NonOSS Addon -License: BSD-3-Clause -Group: System/Fhs Version: 20190115 Release: 0 +License: BSD-3-Clause +Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss Provides: product(openSUSE-Addon-NonOss) = 20190115-0 -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20190115 Provides: product-label() = non%20oss%20addon +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20190115 + +AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -42,6 +41,7 @@ non oss repo and cd %build + %install mkdir -p $RPM_BUILD_ROOT/etc/products.d cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF @@ -119,6 +119,8 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Addon-NonOss.prod << EOF EOF + + %clean rm -rf %buildroot diff --git a/openSUSE-Tumbleweed-Kubic-release.spec b/openSUSE-Tumbleweed-Kubic-release.spec index 2131fa5c..52b526cf 100644 --- a/openSUSE-Tumbleweed-Kubic-release.spec +++ b/openSUSE-Tumbleweed-Kubic-release.spec @@ -39,34 +39,36 @@ ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 Provides: %name-%version Provides: product() = openSUSE-Tumbleweed-Kubic Provides: product(openSUSE-Tumbleweed-Kubic) = 20190115-0 -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20190115 -Provides: product-endoflife() Provides: product-label() = openSUSE%20Tumbleweed%20Kubic +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20190115 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm +Provides: product-endoflife() Requires: product_flavor(openSUSE-Tumbleweed-Kubic) + + %description openSUSE Tumbleweed Kubic combines the benefits of a rolling OS with a container orchestration platform. It is a modern Linux Operating System, designed for containers and optimized for large, clustered deployments. It inherits the - benefits of openSUSE Tumbleweed while redefining the operating system into a small, efficient and reliable distribution. %package dvd -Provides: flavor(dvd) -Provides: product_flavor() -Provides: product_flavor(openSUSE-Tumbleweed-Kubic) = 20190115-0 -Summary: openSUSE Tumbleweed Kubic License: BSD-3-Clause Group: System/Fhs +Provides: product_flavor() +Provides: flavor(dvd) +Provides: product_flavor(openSUSE-Tumbleweed-Kubic) = 20190115-0 +Summary: openSUSE Tumbleweed Kubic %description dvd openSUSE Tumbleweed Kubic combines the benefits of a rolling OS with a container orchestration platform. It is a modern Linux Operating System, designed for containers and optimized for large, clustered deployments. It inherits the - benefits of openSUSE Tumbleweed while redefining the operating system into a small, efficient and reliable distribution. %files dvd %defattr(-,root,root) %doc %{_defaultdocdir}/openSUSE-Tumbleweed-Kubic-release-dvd + + %prep %build @@ -128,7 +130,6 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Tumbleweed-Kubic.prod << EOF openSUSE Tumbleweed Kubic openSUSE Tumbleweed Kubic openSUSE Tumbleweed Kubic combines the benefits of a rolling OS with a container orchestration platform. It is a modern Linux Operating System, designed for containers and optimized for large, clustered deployments. It inherits the - benefits of openSUSE Tumbleweed while redefining the operating system into a small, efficient and reliable distribution. en_US @@ -158,6 +159,8 @@ This package only exists for providing the product flavor 'dvd'. EOF + + %files %defattr(644,root,root,755) %{_sysconfdir}/os-release diff --git a/openSUSE-release.spec b/openSUSE-release.spec index c1a0ec52..5bd6fecc 100644 --- a/openSUSE-release.spec +++ b/openSUSE-release.spec @@ -59,15 +59,15 @@ Source100: weakremovers.inc %include %{SOURCE100} # bnc#826592 -Provides: %name-%version -Provides: product() = openSUSE -Provides: product(openSUSE) = 20190115-0 Provides: weakremover(kernel-default) < 3.11 Provides: weakremover(kernel-desktop) < 4.2 Provides: weakremover(kernel-ec2) < 3.11 Provides: weakremover(kernel-pae) < 3.11 Provides: weakremover(kernel-vanilla) < 3.11 Provides: weakremover(kernel-xen) < 3.11 +Provides: %name-%version +Provides: product() = openSUSE +Provides: product(openSUSE) = 20190115-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -80,21 +80,23 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Dppc64le %ifarch aarch64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20190115 Provides: product-label() = openSUSE +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20190115 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F Requires: product_flavor(openSUSE) + %description openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. %package ftp -Provides: flavor(ftp) +License: BSD-3-Clause +Group: System/Fhs Provides: product_flavor() +Provides: flavor(ftp) Provides: product_flavor(openSUSE) = 20190115-0 Summary: openSUSE Tumbleweed -Group: System/Fhs %description ftp openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. @@ -104,11 +106,12 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. %doc %{_defaultdocdir}/openSUSE-release-ftp %package mini -Provides: flavor(mini) +License: BSD-3-Clause +Group: System/Fhs Provides: product_flavor() +Provides: flavor(mini) Provides: product_flavor(openSUSE) = 20190115-0 Summary: openSUSE Tumbleweed -Group: System/Fhs %description mini openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. @@ -118,11 +121,12 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. %doc %{_defaultdocdir}/openSUSE-release-mini %package dvd -Provides: flavor(dvd) +License: BSD-3-Clause +Group: System/Fhs Provides: product_flavor() +Provides: flavor(dvd) Provides: product_flavor(openSUSE) = 20190115-0 Summary: openSUSE Tumbleweed -Group: System/Fhs %description dvd openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. @@ -132,11 +136,12 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. %doc %{_defaultdocdir}/openSUSE-release-dvd %package livecd-kde -Provides: flavor(livecd-kde) +License: BSD-3-Clause +Group: System/Fhs Provides: product_flavor() +Provides: flavor(livecd-kde) Provides: product_flavor(openSUSE) = 20190115-0 Summary: openSUSE Tumbleweed -Group: System/Fhs %description livecd-kde openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. @@ -146,11 +151,12 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. %doc %{_defaultdocdir}/openSUSE-release-livecd-kde %package livecd-x11 -Provides: flavor(livecd-x11) +License: BSD-3-Clause +Group: System/Fhs Provides: product_flavor() +Provides: flavor(livecd-x11) Provides: product_flavor(openSUSE) = 20190115-0 Summary: openSUSE Tumbleweed -Group: System/Fhs %description livecd-x11 openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. @@ -160,11 +166,12 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. %doc %{_defaultdocdir}/openSUSE-release-livecd-x11 %package livecd-gnome -Provides: flavor(livecd-gnome) +License: BSD-3-Clause +Group: System/Fhs Provides: product_flavor() +Provides: flavor(livecd-gnome) Provides: product_flavor(openSUSE) = 20190115-0 Summary: openSUSE Tumbleweed -Group: System/Fhs %description livecd-gnome openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. @@ -174,11 +181,12 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. %doc %{_defaultdocdir}/openSUSE-release-livecd-gnome %package usb-kde -Provides: flavor(usb-kde) +License: BSD-3-Clause +Group: System/Fhs Provides: product_flavor() +Provides: flavor(usb-kde) Provides: product_flavor(openSUSE) = 20190115-0 Summary: openSUSE Tumbleweed -Group: System/Fhs %description usb-kde openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. @@ -188,11 +196,12 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. %doc %{_defaultdocdir}/openSUSE-release-usb-kde %package usb-gnome -Provides: flavor(usb-gnome) +License: BSD-3-Clause +Group: System/Fhs Provides: product_flavor() +Provides: flavor(usb-gnome) Provides: product_flavor(openSUSE) = 20190115-0 Summary: openSUSE Tumbleweed -Group: System/Fhs %description usb-gnome openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. @@ -202,11 +211,12 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. %doc %{_defaultdocdir}/openSUSE-release-usb-gnome %package usb-x11 -Provides: flavor(usb-x11) +License: BSD-3-Clause +Group: System/Fhs Provides: product_flavor() +Provides: flavor(usb-x11) Provides: product_flavor(openSUSE) = 20190115-0 Summary: openSUSE Tumbleweed -Group: System/Fhs %description usb-x11 openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. @@ -215,6 +225,8 @@ openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. %defattr(-,root,root) %doc %{_defaultdocdir}/openSUSE-release-usb-x11 + + %prep %setup -qcT mkdir license @@ -390,6 +402,7 @@ This package only exists for providing the product flavor 'usb-x11'. EOF + # this is a base product, create symlink ln -s openSUSE.prod %{buildroot}%{_sysconfdir}/products.d/baseproduct diff --git a/stub.spec b/stub.spec index 9e6843ba..059ada15 100644 --- a/stub.spec +++ b/stub.spec @@ -1,23 +1,3 @@ -# -# spec file for package stub -# -# Copyright (c) 2019 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# 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 https://bugs.opensuse.org/ -# - - -Name: stub -Version: 0.0 -Release: 0 - -%changelog +# prevent building single spec files twice +Name: stub +Version: 0.0