From 3015977708f776802639f483f4a6150940b29808d342648e2a6df214c685994c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Thu, 19 May 2011 12:24:11 +0000 Subject: [PATCH] 2,7d1 < Thu May 19 14:22:10 CEST 2011 - jsuchome@suse.cz < < - enable YaST restart in the 1st stage (bnc#694299) < - 2.21.4 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=91 --- yast2-installation-2.21.3.tar.bz2 | 3 - yast2-installation-2.21.4.tar.bz2 | 3 + yast2-installation.changes | 6 ++ yast2-installation.spec | 105 +++++++++++++----------------- 4 files changed, 54 insertions(+), 63 deletions(-) delete mode 100644 yast2-installation-2.21.3.tar.bz2 create mode 100644 yast2-installation-2.21.4.tar.bz2 diff --git a/yast2-installation-2.21.3.tar.bz2 b/yast2-installation-2.21.3.tar.bz2 deleted file mode 100644 index fd8c169..0000000 --- a/yast2-installation-2.21.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ab38c1412dcf94a5df2c1e7ca5c818c0b602d079012b495cbb8413bab620c93 -size 298659 diff --git a/yast2-installation-2.21.4.tar.bz2 b/yast2-installation-2.21.4.tar.bz2 new file mode 100644 index 0000000..4b310dc --- /dev/null +++ b/yast2-installation-2.21.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4ff4bdd552ce8d54726c6b0c4f91158390a130482cefb9a2b206ee6210f0816 +size 298902 diff --git a/yast2-installation.changes b/yast2-installation.changes index 7d33efd..1685543 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 19 14:22:10 CEST 2011 - jsuchome@suse.cz + +- enable YaST restart in the 1st stage (bnc#694299) +- 2.21.4 + ------------------------------------------------------------------- Wed Apr 27 15:08:04 CEST 2011 - jsuchome@suse.cz diff --git a/yast2-installation.spec b/yast2-installation.spec index 349101b..540cc62 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,78 +1,65 @@ # -# spec file for package yast2-installation +# spec file for package yast2-installation (Version 2.21.4) # -# 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-installation -Version: 2.21.3 -Release: 1 +Name: yast2-installation +Version: 2.21.4 +Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.21.3.tar.bz2 -Prefix: /usr +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-2.21.4.tar.bz2 -Group: System/YaST -License: GPLv2+ +prefix: /usr + +Group: System/YaST +License: GPL v2 or later BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # FileSystems::possible_root_fs -BuildRequires: yast2-storage >= 2.19.12 +BuildRequires: yast2-storage >= 2.19.12 # xmllint -BuildRequires: libxml2 +BuildRequires: libxml2 # to convert control.rnc o control.rng -BuildRequires: trang +BuildRequires: trang # PackageCallbacks::RegisterEmptyProgressCallbacks() -BuildRequires: yast2 >= 2.16.52 +BuildRequires: yast2 >= 2.16.52 # Pkg::SourceProvideDigestedFile() -BuildRequires: yast2-pkg-bindings >= 2.17.25 +BuildRequires: yast2-pkg-bindings >= 2.17.25 # Unified progress bar (done by visnov) -BuildRequires: yast2-packager >= 2.17.9 +BuildRequires: yast2-packager >= 2.17.9 # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 # ProductControl::DisabledACItems, ::DisabledSubProposals -Requires: yast2 >= 2.18.23 +Requires: yast2 >= 2.18.23 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) -Requires: yast2-country-data >= 2.16.11 +Requires: yast2-country-data >= 2.16.11 # Pkg::SourceProvideDigestedFile() -Conflicts: yast2-pkg-bindings < 2.17.25 +Conflicts: yast2-pkg-bindings < 2.17.25 # Mouse-related scripts moved to yast2-mouse -Conflicts: yast2-mouse < 2.18.0 +Conflicts: yast2-mouse < 2.18.0 # New API for ProductLicense -Requires: yast2-packager >= 2.19.2 +Requires: yast2-packager >= 2.19.2 # FileSystems::possible_root_fs -Requires: yast2-storage >= 2.19.12 +Requires: yast2-storage >= 2.19.12 # use in startup scripts -Requires: initviocons +Requires: initviocons # Only in inst-sys # Requires: yast2-network @@ -81,20 +68,20 @@ Requires: initviocons # Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile # pkg-bindings are not directly required -Conflicts: yast2-pkg-bindings < 2.17.25 +Conflicts: yast2-pkg-bindings < 2.17.25 # InstError -Conflicts: yast2 < 2.18.6 +Conflicts: yast2 < 2.18.6 # Added new function WFM::ClientExists -Conflicts: yast2-core < 2.17.10 +Conflicts: yast2-core < 2.17.10 # ButtonBox widget -Conflicts: yast2-ycp-ui-bindings < 2.17.3 +Conflicts: yast2-ycp-ui-bindings < 2.17.3 # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) -Requires: tar gzip -Requires: coreutils +Requires: tar gzip +Requires: coreutils # for the first/second stage of installation # currently not used @@ -103,31 +90,30 @@ Requires: coreutils #Requires: /usr/bin/pnmtopng # BNC 446533, /sbin/lspci called but not installed -Requires: pciutils +Requires: pciutils -Recommends: yast2-registration -Recommends: yast2-online-update -Recommends: yast2-users -Recommends: yast2-firewall -Recommends: release-notes -Recommends: curl -Recommends: yast2-update -Recommends: yast2-add-on +Recommends: yast2-registration +Recommends: yast2-online-update +Recommends: yast2-users +Recommends: yast2-firewall +Recommends: release-notes +Recommends: curl +Recommends: yast2-update +Recommends: yast2-add-on -PreReq: %fillup_prereq +PreReq: %fillup_prereq -BuildArch: noarch +BuildArchitectures: noarch -Summary: YaST2 - Installation Parts +Summary: YaST2 - Installation Parts %package devel-doc -License: GPLv2+ Group: Documentation/HTML -Requires: yast2-installation >= 2.15.34 +Requires: yast2-installation >= 2.15.34 -PreReq: %fillup_prereq +PreReq: %fillup_prereq -Summary: YaST2 - Installation Parts +Summary: YaST2 - Installation Parts %description System installation code as present on installation media. @@ -136,7 +122,7 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-2.21.3 +%setup -n yast2-installation-2.21.4 %build %{prefix}/bin/y2tool y2autoconf @@ -217,4 +203,3 @@ rm -rf "$RPM_BUILD_ROOT" %doc %{prefix}/share/doc/packages/yast2-installation %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README -%changelog