pool/installation-images
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

readd the conditional ;(

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=742
This commit is contained in:
Stephan Kulow
2014-09-03 09:18:51 +00:00
committed by Git OBS Bridge
parent f5af74c521
commit 72dd79ee3b
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
installation-images-SLES.changes
View File

@@ -1,8 +1,3 @@
-------------------------------------------------------------------
Wed Sep 3 09:09:53 UTC 2014 - coolo@suse.com
- remove vnc conditional, yast can't cope without vnc
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 2 10:45:23 CEST 2014 - locilka@suse.cz Tue Sep 2 10:45:23 CEST 2014 - locilka@suse.cz

8
installation-images-SLES.spec
View File

@@ -26,9 +26,11 @@
%define base_theme %theme %define base_theme %theme
%endif %endif
%define with_vbox 0
%define with_plymouth 1 %define with_plymouth 1
%define with_shim 1 %define with_shim 1
%bcond_without sbl %bcond_without sbl
%bcond_without vnc
%ifarch %ix86 %ifarch %ix86
# FIXME: xen not working on i586 # FIXME: xen not working on i586
%bcond_with xen %bcond_with xen
@@ -254,10 +256,12 @@ BuildRequires: xterm
BuildRequires: xz BuildRequires: xz
BuildRequires: yast2-devtools BuildRequires: yast2-devtools
BuildRequires: yast2-trans-allpacks BuildRequires: yast2-trans-allpacks
BuildRequires: xorg-x11-Xvnc
%if %{with sbl} %if %{with sbl}
BuildRequires: sbl BuildRequires: sbl
%endif %endif
%if %{with vnc}
BuildRequires: xorg-x11-Xvnc
%endif
# kmps # kmps
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
BuildRequires: atmel-firmware BuildRequires: atmel-firmware
@@ -358,7 +362,7 @@ ExcludeArch: %arm
Summary: Installation Image Files for %theme Summary: Installation Image Files for %theme
License: GPL-2.0+ License: GPL-2.0+
Group: Metapackages Group: Metapackages
Version: 14.134 Version: 14.135
Release: 0 Release: 0
Provides: installation-images = %version-%release Provides: installation-images = %version-%release
Source: installation-images-14.134.tar.xz Source: installation-images-14.134.tar.xz

5
installation-images-openSUSE.changes
View File

@@ -1,8 +1,3 @@
-------------------------------------------------------------------
Wed Sep 3 09:09:53 UTC 2014 - coolo@suse.com
- remove vnc conditional, yast can't cope without vnc
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 2 10:45:23 CEST 2014 - locilka@suse.cz Tue Sep 2 10:45:23 CEST 2014 - locilka@suse.cz

6
installation-images-openSUSE.spec
View File

@@ -26,9 +26,11 @@
%define base_theme %theme %define base_theme %theme
%endif %endif
%define with_vbox 0
%define with_plymouth 1 %define with_plymouth 1
%define with_shim 1 %define with_shim 1
%bcond_without sbl %bcond_without sbl
%bcond_without vnc
%ifarch %ix86 %ifarch %ix86
# FIXME: xen not working on i586 # FIXME: xen not working on i586
%bcond_with xen %bcond_with xen
@@ -254,10 +256,12 @@ BuildRequires: xterm
BuildRequires: xz BuildRequires: xz
BuildRequires: yast2-devtools BuildRequires: yast2-devtools
BuildRequires: yast2-trans-allpacks BuildRequires: yast2-trans-allpacks
BuildRequires: xorg-x11-Xvnc
%if %{with sbl} %if %{with sbl}
BuildRequires: sbl BuildRequires: sbl
%endif %endif
%if %{with vnc}
BuildRequires: xorg-x11-Xvnc
%endif
# kmps # kmps
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
BuildRequires: atmel-firmware BuildRequires: atmel-firmware