From 6fee45fec48b7e9b44e4ef93887108fa9b90ecfa137c4b3d9c51d65e340ca0b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Wed, 3 Aug 2011 08:58:08 +0000 Subject: [PATCH] 2,8d1 < Wed Aug 3 08:53:14 UTC 2011 - lslezak@suse.cz < < - use term "Software manager" instead of "Package manager" < (bnc#585679) < - 2.21.10 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=104 --- yast2-installation-2.21.10.tar.bz2 | 3 + yast2-installation-2.21.9.tar.bz2 | 3 - yast2-installation.changes | 7 ++ yast2-installation.spec | 105 +++++++++++++---------------- 4 files changed, 55 insertions(+), 63 deletions(-) create mode 100644 yast2-installation-2.21.10.tar.bz2 delete mode 100644 yast2-installation-2.21.9.tar.bz2 diff --git a/yast2-installation-2.21.10.tar.bz2 b/yast2-installation-2.21.10.tar.bz2 new file mode 100644 index 0000000..3780a38 --- /dev/null +++ b/yast2-installation-2.21.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fe4445dab30fced406b9bcb03be57ac5d4c9ff5021dd4024b016182cea45c96 +size 283770 diff --git a/yast2-installation-2.21.9.tar.bz2 b/yast2-installation-2.21.9.tar.bz2 deleted file mode 100644 index 5ec62c7..0000000 --- a/yast2-installation-2.21.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee6d6fa15b42e14b9656ea7b61bd4f02d6f70f19b7d384d644a44b5600d16b8b -size 296704 diff --git a/yast2-installation.changes b/yast2-installation.changes index a655466..2aa0085 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 3 08:53:14 UTC 2011 - lslezak@suse.cz + +- use term "Software manager" instead of "Package manager" + (bnc#585679) +- 2.21.10 + ------------------------------------------------------------------- Tue Aug 2 13:37:03 CEST 2011 - locilka@suse.cz diff --git a/yast2-installation.spec b/yast2-installation.spec index d254c3e..ea49a6a 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.10) # -# 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.9 -Release: 1 +Name: yast2-installation +Version: 2.21.10 +Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.21.9.tar.bz2 -Prefix: /usr +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-2.21.10.tar.bz2 -Group: System/YaST -License: GPL v2 or later +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 - 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.9 +%setup -n yast2-installation-2.21.10 %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