From a37dd0f39539647a495cb25bd738df30831e0b22af552bab21972778d98d77e4 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 22 Feb 2011 19:55:28 +0000 Subject: [PATCH 1/6] Updating link to change in openSUSE:Factory/yast2-bootloader revision 129.0 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-bootloader?expand=0&rev=c89977230201e947bbeee853a0497295 --- yast2-bootloader.spec | 73 ++++++++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 29 deletions(-) diff --git a/yast2-bootloader.spec b/yast2-bootloader.spec index 447777e..d82df27 100644 --- a/yast2-bootloader.spec +++ b/yast2-bootloader.spec @@ -1,53 +1,67 @@ # -# spec file for package yast2-bootloader (Version 2.20.1) +# spec file for package yast2-bootloader # +# 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.20.1 -Release: 0 +Name: yast2-bootloader +Version: 2.20.1 +Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.20.1.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-bootloader-2.20.1.tar.bz2 -prefix: /usr +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 +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 # 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. @@ -77,7 +91,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" @@ -106,3 +119,5 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/scrconf/*.scr /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc + +%changelog From b663e4003bf24043409e9a884cb06da820f6d32b7b10e27532c8adeaa8b23a56 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 19 Sep 2011 15:46:19 +0000 Subject: [PATCH 2/6] - s390x: add hvc_iucv=8 to boot options (bnc #718089) - 2.20.3 - fix typo - 2.20.2 - fixed .desktop file (bnc #681249) - fix detection of other linux partitions (BNC#675224) OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-bootloader?expand=0&rev=61 --- yast2-bootloader-2.20.1.tar.bz2 | 3 -- yast2-bootloader-2.20.3.tar.bz2 | 3 ++ yast2-bootloader.changes | 22 ++++++++++ yast2-bootloader.spec | 75 +++++++++++++-------------------- 4 files changed, 55 insertions(+), 48 deletions(-) delete mode 100644 yast2-bootloader-2.20.1.tar.bz2 create mode 100644 yast2-bootloader-2.20.3.tar.bz2 diff --git a/yast2-bootloader-2.20.1.tar.bz2 b/yast2-bootloader-2.20.1.tar.bz2 deleted file mode 100644 index 4537e9d..0000000 --- a/yast2-bootloader-2.20.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:470634b02d876ac688b4676e1f8739219a423e756ea274e6278e783baf9ba7a8 -size 414342 diff --git a/yast2-bootloader-2.20.3.tar.bz2 b/yast2-bootloader-2.20.3.tar.bz2 new file mode 100644 index 0000000..cf59338 --- /dev/null +++ b/yast2-bootloader-2.20.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b0ce35b0bf0ee1d1365ca9391d8849efc4259350bc87fde088952c0f741c168 +size 377877 diff --git a/yast2-bootloader.changes b/yast2-bootloader.changes index 91b87c6..3ea342d 100644 --- a/yast2-bootloader.changes +++ b/yast2-bootloader.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Sep 19 17:14:01 CEST 2011 - snwint@suse.de + +- s390x: add hvc_iucv=8 to boot options (bnc #718089) +- 2.20.3 + +------------------------------------------------------------------- +Fri Sep 16 15:27:09 CEST 2011 - snwint@suse.de + +- fix typo +- 2.20.2 + +------------------------------------------------------------------- +Fri Aug 5 12:30:54 CEST 2011 - tgoettlicher@suse.de + +- fixed .desktop file (bnc #681249) + +------------------------------------------------------------------- +Mon Mar 21 14:26:51 CET 2011 - jreidinger@suse.de + +- fix detection of other linux partitions (BNC#675224) + ------------------------------------------------------------------- Tue Feb 22 11:30:20 UTC 2011 - jreidinger@novell.com diff --git a/yast2-bootloader.spec b/yast2-bootloader.spec index d82df27..1bd390b 100644 --- a/yast2-bootloader.spec +++ b/yast2-bootloader.spec @@ -1,73 +1,59 @@ # -# spec file for package yast2-bootloader +# spec file for package yast2-bootloader (Version 2.20.3) # -# 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.20.3 +Release: 0 -Name: yast2-bootloader -Version: 2.20.1 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.20.1.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-bootloader-2.20.3.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. %prep -%setup -n yast2-bootloader-2.20.1 +%setup -n yast2-bootloader-2.20.3 %build %{prefix}/bin/y2tool y2autoconf @@ -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 From eb7a95be3b3597939e149c61095ad716f9c86e19eceaf11dbab697a582cfe2b8 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 21 Sep 2011 09:57:19 +0000 Subject: [PATCH 3/6] - enable resume for s390x (bnc #692606) - kernel images are in kernel-*-base package - 2.20.4 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-bootloader?expand=0&rev=62 --- yast2-bootloader-2.20.3.tar.bz2 | 3 --- yast2-bootloader-2.20.4.tar.bz2 | 3 +++ yast2-bootloader.changes | 7 +++++++ yast2-bootloader.spec | 8 ++++---- 4 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 yast2-bootloader-2.20.3.tar.bz2 create mode 100644 yast2-bootloader-2.20.4.tar.bz2 diff --git a/yast2-bootloader-2.20.3.tar.bz2 b/yast2-bootloader-2.20.3.tar.bz2 deleted file mode 100644 index cf59338..0000000 --- a/yast2-bootloader-2.20.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b0ce35b0bf0ee1d1365ca9391d8849efc4259350bc87fde088952c0f741c168 -size 377877 diff --git a/yast2-bootloader-2.20.4.tar.bz2 b/yast2-bootloader-2.20.4.tar.bz2 new file mode 100644 index 0000000..ebcab6a --- /dev/null +++ b/yast2-bootloader-2.20.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40e67e91a618d54438b54ccee9f2038675face152fa45a4e27d2f6c6a843b06b +size 377663 diff --git a/yast2-bootloader.changes b/yast2-bootloader.changes index 3ea342d..ef52a8c 100644 --- a/yast2-bootloader.changes +++ b/yast2-bootloader.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 21 11:55:12 CEST 2011 - snwint@suse.de + +- enable resume for s390x (bnc #692606) +- kernel images are in kernel-*-base package +- 2.20.4 + ------------------------------------------------------------------- Mon Sep 19 17:14:01 CEST 2011 - snwint@suse.de diff --git a/yast2-bootloader.spec b/yast2-bootloader.spec index 1bd390b..6a211cf 100644 --- a/yast2-bootloader.spec +++ b/yast2-bootloader.spec @@ -1,15 +1,15 @@ # -# spec file for package yast2-bootloader (Version 2.20.3) +# spec file for package yast2-bootloader (Version 2.20.4) # # norootforbuild Name: yast2-bootloader -Version: 2.20.3 +Version: 2.20.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.20.3.tar.bz2 +Source0: yast2-bootloader-2.20.4.tar.bz2 prefix: /usr @@ -53,7 +53,7 @@ Summary: YaST2 - Bootloader Configuration This package contains the YaST2 component for bootloader configuration. %prep -%setup -n yast2-bootloader-2.20.3 +%setup -n yast2-bootloader-2.20.4 %build %{prefix}/bin/y2tool y2autoconf From 53e41c01e0c063f9cd22d18e1b002e385d3766e2d911fc7969e36de6ee9f46c2 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 21 Sep 2011 10:38:51 +0000 Subject: [PATCH 4/6] - revert kernel-*-base change - 2.20.5 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-bootloader?expand=0&rev=63 --- yast2-bootloader-2.20.4.tar.bz2 | 3 --- yast2-bootloader-2.20.5.tar.bz2 | 3 +++ yast2-bootloader.changes | 6 ++++++ yast2-bootloader.spec | 8 ++++---- 4 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 yast2-bootloader-2.20.4.tar.bz2 create mode 100644 yast2-bootloader-2.20.5.tar.bz2 diff --git a/yast2-bootloader-2.20.4.tar.bz2 b/yast2-bootloader-2.20.4.tar.bz2 deleted file mode 100644 index ebcab6a..0000000 --- a/yast2-bootloader-2.20.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40e67e91a618d54438b54ccee9f2038675face152fa45a4e27d2f6c6a843b06b -size 377663 diff --git a/yast2-bootloader-2.20.5.tar.bz2 b/yast2-bootloader-2.20.5.tar.bz2 new file mode 100644 index 0000000..6a77658 --- /dev/null +++ b/yast2-bootloader-2.20.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0da12564c015c8ee076d9414593781df275f3dd5f99a31711aa1cf882fcbdb8 +size 377645 diff --git a/yast2-bootloader.changes b/yast2-bootloader.changes index ef52a8c..2629e2e 100644 --- a/yast2-bootloader.changes +++ b/yast2-bootloader.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 21 12:37:32 CEST 2011 - snwint@suse.de + +- revert kernel-*-base change +- 2.20.5 + ------------------------------------------------------------------- Wed Sep 21 11:55:12 CEST 2011 - snwint@suse.de diff --git a/yast2-bootloader.spec b/yast2-bootloader.spec index 6a211cf..5874684 100644 --- a/yast2-bootloader.spec +++ b/yast2-bootloader.spec @@ -1,15 +1,15 @@ # -# spec file for package yast2-bootloader (Version 2.20.4) +# spec file for package yast2-bootloader (Version 2.20.5) # # norootforbuild Name: yast2-bootloader -Version: 2.20.4 +Version: 2.20.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.20.4.tar.bz2 +Source0: yast2-bootloader-2.20.5.tar.bz2 prefix: /usr @@ -53,7 +53,7 @@ Summary: YaST2 - Bootloader Configuration This package contains the YaST2 component for bootloader configuration. %prep -%setup -n yast2-bootloader-2.20.4 +%setup -n yast2-bootloader-2.20.5 %build %{prefix}/bin/y2tool y2autoconf From b0faa64bae40a71757bb3a17b7072c1f493e98878331783cb33befe52bb5cf68 Mon Sep 17 00:00:00 2001 From: Stanislav Visnovsky Date: Mon, 26 Sep 2011 10:56:28 +0000 Subject: [PATCH 5/6] 2,7d1 < Mon Sep 26 12:54:57 CEST 2011 - visnov@suse.cz < < - set dialog title < - 2.21.0 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-bootloader?expand=0&rev=64 --- yast2-bootloader-2.20.5.tar.bz2 | 3 -- yast2-bootloader-2.21.0.tar.bz2 | 3 ++ yast2-bootloader.changes | 6 +++ yast2-bootloader.spec | 76 ++++++++++++++++++++------------- 4 files changed, 55 insertions(+), 33 deletions(-) delete mode 100644 yast2-bootloader-2.20.5.tar.bz2 create mode 100644 yast2-bootloader-2.21.0.tar.bz2 diff --git a/yast2-bootloader-2.20.5.tar.bz2 b/yast2-bootloader-2.20.5.tar.bz2 deleted file mode 100644 index 6a77658..0000000 --- a/yast2-bootloader-2.20.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0da12564c015c8ee076d9414593781df275f3dd5f99a31711aa1cf882fcbdb8 -size 377645 diff --git a/yast2-bootloader-2.21.0.tar.bz2 b/yast2-bootloader-2.21.0.tar.bz2 new file mode 100644 index 0000000..a3f0b52 --- /dev/null +++ b/yast2-bootloader-2.21.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8fe4c8924d81cbffc51e7bdd3f164726828b6a0350286fe72bf5bdc276c282c +size 409807 diff --git a/yast2-bootloader.changes b/yast2-bootloader.changes index 2629e2e..edf7799 100644 --- a/yast2-bootloader.changes +++ b/yast2-bootloader.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 26 12:54:57 CEST 2011 - visnov@suse.cz + +- set dialog title +- 2.21.0 + ------------------------------------------------------------------- Wed Sep 21 12:37:32 CEST 2011 - snwint@suse.de diff --git a/yast2-bootloader.spec b/yast2-bootloader.spec index 5874684..f533e95 100644 --- a/yast2-bootloader.spec +++ b/yast2-bootloader.spec @@ -1,59 +1,74 @@ # -# spec file for package yast2-bootloader (Version 2.20.5) +# spec file for package yast2-bootloader # +# 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.20.5 -Release: 0 +Name: yast2-bootloader +Version: 2.21.0 +Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.20.5.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-bootloader-2.21.0.tar.bz2 -prefix: /usr +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 +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 +# Wizard::SetDialogTitleAndIcon +Requires: yast2 >= 2.21.22 +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. %prep -%setup -n yast2-bootloader-2.20.5 +%setup -n yast2-bootloader-2.21.0 %build %{prefix}/bin/y2tool y2autoconf @@ -77,7 +92,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" @@ -106,3 +120,5 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/scrconf/*.scr /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc + +%changelog From 77d8620ca45482880053c7f02760738842b5fe3420f695757d3d7686666e17e7 Mon Sep 17 00:00:00 2001 From: Stanislav Visnovsky Date: Tue, 4 Oct 2011 10:50:02 +0000 Subject: [PATCH 6/6] 2,7d1 < Tue Oct 4 10:06:56 UTC 2011 - cfarrell@suse.com < < - license update: GPL-2.0+ < SPDX format < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-bootloader?expand=0&rev=65 --- yast2-bootloader-2.21.0.tar.bz2 | 4 ++-- yast2-bootloader.changes | 6 ++++++ yast2-bootloader.spec | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/yast2-bootloader-2.21.0.tar.bz2 b/yast2-bootloader-2.21.0.tar.bz2 index a3f0b52..53d9fb1 100644 --- a/yast2-bootloader-2.21.0.tar.bz2 +++ b/yast2-bootloader-2.21.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8fe4c8924d81cbffc51e7bdd3f164726828b6a0350286fe72bf5bdc276c282c -size 409807 +oid sha256:d36e4d9d6a7b3bac766a7d8b08ffe8b362ad11707eded102265d7e4b3cf89a62 +size 409240 diff --git a/yast2-bootloader.changes b/yast2-bootloader.changes index edf7799..caa2e8d 100644 --- a/yast2-bootloader.changes +++ b/yast2-bootloader.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 4 10:06:56 UTC 2011 - cfarrell@suse.com + +- license update: GPL-2.0+ + SPDX format + ------------------------------------------------------------------- Mon Sep 26 12:54:57 CEST 2011 - visnov@suse.cz diff --git a/yast2-bootloader.spec b/yast2-bootloader.spec index f533e95..7f18fa1 100644 --- a/yast2-bootloader.spec +++ b/yast2-bootloader.spec @@ -23,12 +23,12 @@ Version: 2.21.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.21.0.tar.bz2 +Source0: yast2-bootloader-%{version}.tar.bz2 Prefix: /usr Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ 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 @@ -68,7 +68,7 @@ Summary: YaST2 - Bootloader Configuration This package contains the YaST2 component for bootloader configuration. %prep -%setup -n yast2-bootloader-2.21.0 +%setup -n yast2-bootloader-%{version} %build %{prefix}/bin/y2tool y2autoconf