From cb9f76cca7ac3c8a8a76243cb7e6afa2cb13932b9ba3920eed8ee67de82722da Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 22 Feb 2011 11:33:30 +0000 Subject: [PATCH] 2,8d1 < Tue Feb 22 11:30:20 UTC 2011 - jreidinger@novell.com < < - during probe of partitions don't try to mount encrypted one < (bnc#673906) < - 2.20.1 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-bootloader?expand=0&rev=57 --- yast2-bootloader-2.19.16.tar.bz2 | 4 +- yast2-bootloader.changes | 7 ++++ yast2-bootloader.spec | 71 +++++++++++++------------------- 3 files changed, 37 insertions(+), 45 deletions(-) diff --git a/yast2-bootloader-2.19.16.tar.bz2 b/yast2-bootloader-2.19.16.tar.bz2 index 84d1277..7c42b72 100644 --- a/yast2-bootloader-2.19.16.tar.bz2 +++ b/yast2-bootloader-2.19.16.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb2bda6174de7358a81c14849075e3152639fd5e908045c6595e8f920fed328a -size 414221 +oid sha256:446b452ee446b1486fe25a99221ee42b29185546df030b162dd40de025dd1328 +size 405605 diff --git a/yast2-bootloader.changes b/yast2-bootloader.changes index 81b74d6..91b87c6 100644 --- a/yast2-bootloader.changes +++ b/yast2-bootloader.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 22 11:30:20 UTC 2011 - jreidinger@novell.com + +- during probe of partitions don't try to mount encrypted one + (bnc#673906) +- 2.20.1 + ------------------------------------------------------------------- Mon Jan 10 12:56:07 UTC 2011 - jreidinger@novell.com diff --git a/yast2-bootloader.spec b/yast2-bootloader.spec index 9bd1aee..349c3b7 100644 --- a/yast2-bootloader.spec +++ b/yast2-bootloader.spec @@ -1,67 +1,53 @@ # # spec file for package yast2-bootloader (Version 2.19.16) # -# Copyright (c) 2011 SUSE LINUX Products 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 http://bugs.opensuse.org/ -# - # norootforbuild +Name: yast2-bootloader +Version: 2.19.16 +Release: 0 -Name: yast2-bootloader -Version: 2.19.16 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.19.16.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-bootloader-2.19.16.tar.bz2 -Prefix: /usr +prefix: /usr -Group: System/YaST -License: GPLv2+ -BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage >= 2.18.18 yast2-testsuite +Group: System/YaST +License: GPL v2 or later +BuildRequires: gcc-c++ limal-perl yast2-devtools yast2-testsuite yast2-installation yast2-storage >= 2.18.18 update-desktop-files swig docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel yast2-perl-bindings perl-gettext perl-Bootloader update-alternatives # to eliminate a cyclic dependency in autobuild: #!BuildIgnore: autoyast2-installation PreReq: /bin/sed %fillup_prereq # Installation::*version variables -Requires: yast2 >= 2.18.14 -Requires: yast2-packager >= 2.17.24 -Requires: yast2-pkg-bindings >= 2.17.25 -Requires: perl-Bootloader >= 0.5.4 -Requires: yast2-core >= 2.18.7 +Requires: yast2 >= 2.18.14 +Requires: yast2-packager >= 2.17.24 +Requires: yast2-pkg-bindings >= 2.17.25 +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-packager >= 2.17.24 BuildRequires: yast2-pkg-bindings >= 2.17.25 BuildRequires: perl-Bootloader >= 0.5.0 -BuildRequires: yast2-core >= 2.18.6 +BuildRequires: yast2-core >= 2.18.6 %ifarch %ix86 x86_64 -Requires: master-boot-code +Requires: master-boot-code %endif -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 +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 +Summary: YaST2 - Bootloader Configuration %description This package contains the YaST2 component for bootloader configuration. @@ -91,6 +77,7 @@ for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desk %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done + %clean rm -rf "$RPM_BUILD_ROOT" @@ -119,5 +106,3 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/scrconf/*.scr /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc - -%changelog