From 32a11b335491dc1940bbc1dc6f449407966e35fac53b93902629a3b994e48806 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 13 Oct 2009 15:26:58 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-bootloader?expand=0&rev=23 --- ready | 0 yast2-bootloader-2.18.16.tar.bz2 | 3 ++ yast2-bootloader-2.18.17.tar.bz2 | 3 -- yast2-bootloader.changes | 7 --- yast2-bootloader.spec | 86 ++++++++++++++++---------------- 5 files changed, 47 insertions(+), 52 deletions(-) create mode 100644 ready create mode 100644 yast2-bootloader-2.18.16.tar.bz2 delete mode 100644 yast2-bootloader-2.18.17.tar.bz2 diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 diff --git a/yast2-bootloader-2.18.16.tar.bz2 b/yast2-bootloader-2.18.16.tar.bz2 new file mode 100644 index 0000000..89755c0 --- /dev/null +++ b/yast2-bootloader-2.18.16.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5179cefd70d36457a2549ad1f53b0b6b3e87de0d39903252f96da75554bce7e2 +size 399304 diff --git a/yast2-bootloader-2.18.17.tar.bz2 b/yast2-bootloader-2.18.17.tar.bz2 deleted file mode 100644 index 3590d33..0000000 --- a/yast2-bootloader-2.18.17.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72a78d6124418a6f4b0e144505ca34d7180cb484fbc42a01e0860455e97bbccd -size 398434 diff --git a/yast2-bootloader.changes b/yast2-bootloader.changes index ce32d19..3a5ca0e 100644 --- a/yast2-bootloader.changes +++ b/yast2-bootloader.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Tue Oct 13 15:41:07 CEST 2009 - juhliarik@suse.cz - -- deleted handling of luks_root and updating initrd for encrypted - "/" (bnc#528474) -- 2.18.17 - ------------------------------------------------------------------- Mon Sep 21 10:40:13 CEST 2009 - juhliarik@suse.cz diff --git a/yast2-bootloader.spec b/yast2-bootloader.spec index dcc6b0e..20de2da 100644 --- a/yast2-bootloader.spec +++ b/yast2-bootloader.spec @@ -1,68 +1,74 @@ # -# spec file for package yast2-bootloader (Version 2.18.17) +# spec file for package yast2-bootloader (Version 2.18.16) # +# Copyright (c) 2009 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.18.17 -Release: 0 - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.18.17.tar.bz2 - -prefix: /usr - -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 +Name: yast2-bootloader +Version: 2.18.16 +Release: 1 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-bootloader-2.18.16.tar.bz2 +Prefix: /usr +Group: System/YaST +License: GPL v2 or later +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 # 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 - -Summary: YaST2 - Bootloader Configuration +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 %description This package contains the YaST2 component for bootloader configuration. %prep -%setup -n yast2-bootloader-2.18.17 +%setup -n yast2-bootloader-2.18.16 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake 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) @@ -77,7 +83,6 @@ 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" @@ -86,15 +91,11 @@ rm -rf "$RPM_BUILD_ROOT" %files %defattr(-,root,root) - # menu items - %ifnarch s390 s390x %{prefix}/share/applications/YaST2/bootloader.desktop %endif - %doc %{prefix}/share/doc/packages/yast2-bootloader - %dir /usr/share/YaST2/include/bootloader /usr/share/YaST2/include/bootloader/* /usr/share/YaST2/modules/* @@ -106,3 +107,4 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/scrconf/*.scr /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc +%changelog