From c0bee5354a772cea8d727d63f9ac4b0d0198c94ba289d1110d04be83d92923ea Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 25 Feb 2013 15:49:23 +0000 Subject: [PATCH] - support uefi secureboot - Propose grub2 theme path - 2.23.11 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-bootloader?expand=0&rev=142 --- yast2-bootloader-2.23.11.tar.bz2 | 4 +-- yast2-bootloader.spec | 48 +++++++++++--------------------- 2 files changed, 18 insertions(+), 34 deletions(-) diff --git a/yast2-bootloader-2.23.11.tar.bz2 b/yast2-bootloader-2.23.11.tar.bz2 index 9fbb0e2..c65c30e 100644 --- a/yast2-bootloader-2.23.11.tar.bz2 +++ b/yast2-bootloader-2.23.11.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5881f7280d7bbc20649f08de1a051c14711459f295b9982218f351ada7784aad -size 421644 +oid sha256:dcec7925ad875e7fa740630b6630f0df20862e80b3c604a723aa3c7df0e1c587 +size 403820 diff --git a/yast2-bootloader.spec b/yast2-bootloader.spec index 2867669..3331f22 100644 --- a/yast2-bootloader.spec +++ b/yast2-bootloader.spec @@ -46,49 +46,32 @@ BuildRequires: yast2-testsuite PreReq: /bin/sed %fillup_prereq # Installation::*version variables # Wizard::SetDialogTitleAndIcon -Requires: limal-perl -Requires: parted -Requires: perl-Bootloader >= 0.5.4 -Requires: perl-Compress-Zlib Requires: yast2 >= 2.21.22 -Requires: yast2-core >= 2.18.7 Requires: yast2-packager >= 2.17.24 Requires: yast2-pkg-bindings >= 2.17.25 -Requires: yast2-storage >= 2.18.18 -BuildRequires: perl-Bootloader >= 0.5.0 +Requires: perl-Bootloader >= 0.5.4 +Requires: yast2-core >= 2.18.7 +Requires: yast2-storage >= 2.18.18 parted perl-Compress-Zlib limal-perl BuildRequires: yast2 >= 2.18.14 -BuildRequires: yast2-core >= 2.18.6 BuildRequires: yast2-packager >= 2.17.24 BuildRequires: yast2-pkg-bindings >= 2.17.25 +BuildRequires: perl-Bootloader >= 0.5.0 +BuildRequires: yast2-core >= 2.18.6 %ifarch %ix86 x86_64 Requires: syslinux %endif -Provides: yast2-config-bootloader -Provides: yast2-config-lilo -Obsoletes: yast2-config-bootloader -Obsoletes: yast2-config-lilo -Provides: yast2-agent-liloconf -Provides: yast2-agent-prom -Obsoletes: yast2-agent-liloconf -Obsoletes: yast2-agent-prom -Provides: yast2-trans-boot -Provides: yast2-trans-inst-bootloader -Provides: yast2-trans-lilo -Obsoletes: yast2-trans-boot -Obsoletes: yast2-trans-inst-bootloader -Obsoletes: yast2-trans-lilo -Provides: y2c_boot -Provides: y2t_boot -Obsoletes: y2c_boot -Obsoletes: y2t_boot -Provides: y2t_inst-bootloader -Provides: yast2-agent-liloconf-devel -Provides: yast2-agent-prom-devel -Obsoletes: y2t_inst-bootloader -Obsoletes: yast2-agent-liloconf-devel -Obsoletes: yast2-agent-prom-devel +Provides: yast2-config-lilo yast2-config-bootloader +Obsoletes: yast2-config-lilo yast2-config-bootloader +Provides: yast2-agent-liloconf yast2-agent-prom +Obsoletes: yast2-agent-liloconf yast2-agent-prom +Provides: yast2-trans-inst-bootloader yast2-trans-lilo yast2-trans-boot +Obsoletes: yast2-trans-inst-bootloader yast2-trans-lilo yast2-trans-boot +Provides: y2c_boot y2t_boot +Obsoletes: y2c_boot y2t_boot +Provides: y2t_inst-bootloader yast2-agent-liloconf-devel yast2-agent-prom-devel +Obsoletes: y2t_inst-bootloader yast2-agent-liloconf-devel yast2-agent-prom-devel Summary: YaST2 - Bootloader Configuration License: GPL-2.0+ @@ -108,6 +91,7 @@ autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +%{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works