From e3b5553eedba78b5ecb43a95333adfbbee229f1a9c546fbc1acca06b66e39c7e Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Fri, 7 Aug 2015 11:41:31 +0000 Subject: [PATCH] help it build in openSUSE, SLES and LEAP OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=823 --- installation-images-SLES.spec | 5 ++++- installation-images-openSUSE.spec | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/installation-images-SLES.spec b/installation-images-SLES.spec index fd01cb2..9845cdc 100644 --- a/installation-images-SLES.spec +++ b/installation-images-SLES.spec @@ -52,10 +52,13 @@ BuildRequires: sles-release-MINI BuildRequires: openSUSE-release BuildRequires: openSUSE-release-mini %endif +#!BuildIgnore: libsystemd0-mini %ifarch ia64 %ix86 x86_64 BuildRequires: libsmbios2 %endif +%if %suse_version > 1315 BuildRequires: net-tools-deprecated +%endif BuildRequires: snapper BuildRequires: Mesa BuildRequires: Mesa-libEGL1 @@ -189,7 +192,7 @@ BuildRequires: perl-XML-Simple BuildRequires: perl-solv BuildRequires: pinentry BuildRequires: suse-module-tools -BuildRequires: systemd libsystemd0 +BuildRequires: systemd BuildRequires: systemd-presets-branding-%{base_theme} BuildRequires: tunctl BuildRequires: udev diff --git a/installation-images-openSUSE.spec b/installation-images-openSUSE.spec index 49fe599..3bd0c3e 100644 --- a/installation-images-openSUSE.spec +++ b/installation-images-openSUSE.spec @@ -52,10 +52,13 @@ BuildRequires: sles-release-MINI BuildRequires: openSUSE-release BuildRequires: openSUSE-release-mini %endif +#!BuildIgnore: libsystemd0-mini %ifarch ia64 %ix86 x86_64 BuildRequires: libsmbios2 %endif +%if %suse_version > 1315 BuildRequires: net-tools-deprecated +%endif BuildRequires: snapper BuildRequires: Mesa BuildRequires: Mesa-libEGL1 @@ -189,7 +192,7 @@ BuildRequires: perl-XML-Simple BuildRequires: perl-solv BuildRequires: pinentry BuildRequires: suse-module-tools -BuildRequires: systemd libsystemd0 +BuildRequires: systemd BuildRequires: systemd-presets-branding-%{base_theme} BuildRequires: tunctl BuildRequires: udev