From e95c5dda53dbb8c4ee9989158f597a8ff2510e07e0d3a14a6017072b254ccac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Thu, 12 Jul 2012 06:12:52 +0000 Subject: [PATCH] 2,8d1 < Wed Jul 11 15:56:38 CEST 2012 - jsuchome@suse.cz < < - create simpler and non translated aliases for update sources < (bnc#768624) < - 2.22.10 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=205 --- yast2-installation-2.22.10.tar.bz2 | 3 + yast2-installation-2.22.9.tar.bz2 | 3 - yast2-installation.changes | 7 ++ yast2-installation.spec | 100 ++++++++++++++++------------- 4 files changed, 65 insertions(+), 48 deletions(-) create mode 100644 yast2-installation-2.22.10.tar.bz2 delete mode 100644 yast2-installation-2.22.9.tar.bz2 diff --git a/yast2-installation-2.22.10.tar.bz2 b/yast2-installation-2.22.10.tar.bz2 new file mode 100644 index 0000000..44bd479 --- /dev/null +++ b/yast2-installation-2.22.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc20a6324c88006d9a499d5ca3122c48cb6439065b9d3de9c15db32a1f23811b +size 284490 diff --git a/yast2-installation-2.22.9.tar.bz2 b/yast2-installation-2.22.9.tar.bz2 deleted file mode 100644 index ce256e2..0000000 --- a/yast2-installation-2.22.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:acf8f15e5910ea75ab0c11804448446fadd149770497114a549ce6a8f1c166be -size 284458 diff --git a/yast2-installation.changes b/yast2-installation.changes index 3a74f2c..dcb673d 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 11 15:56:38 CEST 2012 - jsuchome@suse.cz + +- create simpler and non translated aliases for update sources + (bnc#768624) +- 2.22.10 + ------------------------------------------------------------------- Thu Jun 28 14:36:08 CEST 2012 - jsuchome@suse.cz diff --git a/yast2-installation.spec b/yast2-installation.spec index 0fafb72..90830dc 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,7 +1,7 @@ # # spec file for package yast2-installation # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -17,67 +17,74 @@ Name: yast2-installation -Version: 2.22.9 +Version: 2.22.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-installation-%{version}.tar.bz2 - -Group: System/YaST -License: GPL-2.0 Summary: YaST2 - Installation Parts +License: GPL-2.0 +Group: System/YaST -Source1: YaST2-Second-Stage.service -Source2: YaST2-Firstboot.service +Source1: YaST2-Second-Stage.service +Source2: YaST2-Firstboot.service -BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite +BuildRequires: docbook-xsl-stylesheets +BuildRequires: doxygen +BuildRequires: libxslt +BuildRequires: perl-XML-Writer +BuildRequires: sgml-skel +BuildRequires: update-desktop-files +BuildRequires: yast2-core-devel +BuildRequires: yast2-devtools +BuildRequires: 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::Add/RemoveUpgradeRepo() -BuildRequires: yast2-pkg-bindings >= 2.21.2 +BuildRequires: yast2-pkg-bindings >= 2.21.2 # 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 # Pkg::Add/RemoveUpgradeRepo() -Requires: yast2-pkg-bindings >= 2.21.2 +Requires: yast2-pkg-bindings >= 2.21.2 # 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 # Proxy settings for 2nd stage (bnc#764951) Requires: yast2-proxy @@ -89,23 +96,24 @@ Requires: yast2-proxy # 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: coreutils +Requires: gzip +Requires: tar %if 0%{?suse_version} >= 1210 -BuildRequires: systemd-devel +BuildRequires: systemd-devel %{systemd_requires} %endif @@ -116,28 +124,28 @@ BuildRequires: systemd-devel #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 +BuildArch: noarch %package devel-doc +Requires: yast2-installation >= 2.15.34 + +PreReq: %fillup_prereq + +Summary: YaST2 - Installation Parts Group: Documentation/HTML -Requires: yast2-installation >= 2.15.34 - -PreReq: %fillup_prereq - -Summary: YaST2 - Installation Parts %description System installation code as present on installation media. @@ -246,3 +254,5 @@ 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