From ceb47e12f57e7d467f133b7661427b3c4d41ccfa0f2b4eaaef86f84da7a641e1 Mon Sep 17 00:00:00 2001 From: Lukas Ocilka Date: Fri, 16 Oct 2009 12:45:45 +0000 Subject: [PATCH 1/5] Fixing repos handling during upgrade OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=44 --- yast2-installation-2.18.31.tar.bz2 | 3 - yast2-installation-2.18.32.tar.bz2 | 3 + yast2-installation.changes | 6 ++ yast2-installation.spec | 141 +++++++++++++++++------------ 4 files changed, 91 insertions(+), 62 deletions(-) delete mode 100644 yast2-installation-2.18.31.tar.bz2 create mode 100644 yast2-installation-2.18.32.tar.bz2 diff --git a/yast2-installation-2.18.31.tar.bz2 b/yast2-installation-2.18.31.tar.bz2 deleted file mode 100644 index 706846d..0000000 --- a/yast2-installation-2.18.31.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5627b15236b54a363340edef2d3d3674d40ec8db05dca96aa62ad568aa7402a -size 283599 diff --git a/yast2-installation-2.18.32.tar.bz2 b/yast2-installation-2.18.32.tar.bz2 new file mode 100644 index 0000000..8830c33 --- /dev/null +++ b/yast2-installation-2.18.32.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:156ff89e347507e938b66224f2dee6262f2627c5f8c48f89ef6e19ee85f702e9 +size 298812 diff --git a/yast2-installation.changes b/yast2-installation.changes index e2eeb52..a9de4fc 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 16 14:36:11 CEST 2009 - locilka@suse.cz + +- Fixed handling repositories during upgrade (bnc #543468). +- 2.18.32 + ------------------------------------------------------------------- Wed Oct 7 15:36:44 CEST 2009 - jsuchome@suse.cz diff --git a/yast2-installation.spec b/yast2-installation.spec index ffa849e..64b6cea 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,100 +1,116 @@ # -# spec file for package yast2-installation (Version 2.18.31) +# spec file for package yast2-installation (Version 2.18.32) # -# 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-installation -Version: 2.18.31 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.18.31.tar.bz2 -Prefix: /usr -Group: System/YaST -License: GPL v2 or later +Name: yast2-installation +Version: 2.18.32 +Release: 0 + + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-2.18.32.tar.bz2 + +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 + # 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 + # BNC #449818: "description_id" in DefaultDesktop -Requires: yast2-packager >= 2.17.49 +Requires: yast2-packager >= 2.17.49 + # Storage::GetCommitInfos() call in include/misc.ycp -Requires: yast2-storage >= 2.18.0 +Requires: yast2-storage >= 2.18.0 + # use in startup scripts -Requires: initviocons +Requires: initviocons + # Only in inst-sys # Requires: yast2-network # Requires: yast2-add-on # Requires: yast2-update + # 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 # bugzilla #208307 #Requires: /usr/bin/jpegtopnm #Requires: /usr/bin/pnmtopng + # BNC 446533, /sbin/lspci called but not installed -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 -PreReq: %fillup_prereq -BuildArch: noarch -Summary: YaST2 - Installation Parts +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 + +PreReq: %fillup_prereq + +BuildArchitectures: noarch + +Summary: YaST2 - Installation Parts %package devel-doc -License: GPL v2 or later Group: Documentation/HTML -Requires: yast2-installation >= 2.15.34 -PreReq: %fillup_prereq -Summary: YaST2 - Installation Parts +Requires: yast2-installation >= 2.15.34 + +PreReq: %fillup_prereq + +Summary: YaST2 - Installation Parts %description System installation code as present on installation media. @@ -103,14 +119,16 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-2.18.31 +%setup -n yast2-installation-2.18.32 %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) @@ -125,6 +143,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" @@ -138,6 +157,7 @@ rm -rf "$RPM_BUILD_ROOT" # Fixme: move to another package (to make build of other packages faster) /usr/share/YaST2/control/*.rng /usr/share/YaST2/control/*.rnc + /usr/share/YaST2/clients/*.ycp /usr/share/YaST2/modules/*.ycp /usr/share/YaST2/modules/*.ybc @@ -148,6 +168,7 @@ rm -rf "$RPM_BUILD_ROOT" %dir /usr/share/autoinstall/modules %dir /usr/share/YaST2/include/installation /usr/share/YaST2/include/installation/* + # agents /usr/share/YaST2/scrconf/etc_passwd.scr /usr/share/YaST2/scrconf/cfg_windowmanager.scr @@ -159,10 +180,13 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/scrconf/run_df.scr # fillup /var/adm/fillup-templates/sysconfig.security-checksig + # programs and scripts %{prefix}/lib/YaST2/startup + # icewm /etc/icewm + %dir %{prefix}/share/doc/packages/yast2-installation %{prefix}/share/doc/packages/yast2-installation/COPYING %readme %{prefix}/share/doc/packages/yast2-installation/README @@ -172,4 +196,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 From df6bd3f0c833052df08741d54ef87531ec2a95aaf230f472ba83bd44978262f5 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 21 Oct 2009 00:08:44 +0000 Subject: [PATCH 2/5] checked in OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=45 --- yast2-installation-2.18.31.tar.bz2 | 3 + yast2-installation-2.18.32.tar.bz2 | 3 - yast2-installation.changes | 6 -- yast2-installation.spec | 141 ++++++++++++----------------- 4 files changed, 62 insertions(+), 91 deletions(-) create mode 100644 yast2-installation-2.18.31.tar.bz2 delete mode 100644 yast2-installation-2.18.32.tar.bz2 diff --git a/yast2-installation-2.18.31.tar.bz2 b/yast2-installation-2.18.31.tar.bz2 new file mode 100644 index 0000000..706846d --- /dev/null +++ b/yast2-installation-2.18.31.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5627b15236b54a363340edef2d3d3674d40ec8db05dca96aa62ad568aa7402a +size 283599 diff --git a/yast2-installation-2.18.32.tar.bz2 b/yast2-installation-2.18.32.tar.bz2 deleted file mode 100644 index 8830c33..0000000 --- a/yast2-installation-2.18.32.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:156ff89e347507e938b66224f2dee6262f2627c5f8c48f89ef6e19ee85f702e9 -size 298812 diff --git a/yast2-installation.changes b/yast2-installation.changes index a9de4fc..e2eeb52 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri Oct 16 14:36:11 CEST 2009 - locilka@suse.cz - -- Fixed handling repositories during upgrade (bnc #543468). -- 2.18.32 - ------------------------------------------------------------------- Wed Oct 7 15:36:44 CEST 2009 - jsuchome@suse.cz diff --git a/yast2-installation.spec b/yast2-installation.spec index 64b6cea..ffa849e 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,116 +1,100 @@ # -# spec file for package yast2-installation (Version 2.18.32) +# spec file for package yast2-installation (Version 2.18.31) # +# 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-installation -Version: 2.18.32 -Release: 0 - - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.18.32.tar.bz2 - -prefix: /usr - -Group: System/YaST -License: GPL v2 or later +Name: yast2-installation +Version: 2.18.31 +Release: 1 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-2.18.31.tar.bz2 +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 - # 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 # BNC #449818: "description_id" in DefaultDesktop -Requires: yast2-packager >= 2.17.49 - +Requires: yast2-packager >= 2.17.49 # Storage::GetCommitInfos() call in include/misc.ycp -Requires: yast2-storage >= 2.18.0 - +Requires: yast2-storage >= 2.18.0 # use in startup scripts -Requires: initviocons - +Requires: initviocons # Only in inst-sys # Requires: yast2-network # Requires: yast2-add-on # Requires: yast2-update - # 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 # bugzilla #208307 #Requires: /usr/bin/jpegtopnm #Requires: /usr/bin/pnmtopng - # BNC 446533, /sbin/lspci called but not installed -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 - -PreReq: %fillup_prereq - -BuildArchitectures: noarch - -Summary: YaST2 - Installation Parts +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 +PreReq: %fillup_prereq +BuildArch: noarch +Summary: YaST2 - Installation Parts %package devel-doc +License: GPL v2 or later Group: Documentation/HTML -Requires: yast2-installation >= 2.15.34 - -PreReq: %fillup_prereq - -Summary: YaST2 - Installation Parts +Requires: yast2-installation >= 2.15.34 +PreReq: %fillup_prereq +Summary: YaST2 - Installation Parts %description System installation code as present on installation media. @@ -119,16 +103,14 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-2.18.32 +%setup -n yast2-installation-2.18.31 %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) @@ -143,7 +125,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" @@ -157,7 +138,6 @@ rm -rf "$RPM_BUILD_ROOT" # Fixme: move to another package (to make build of other packages faster) /usr/share/YaST2/control/*.rng /usr/share/YaST2/control/*.rnc - /usr/share/YaST2/clients/*.ycp /usr/share/YaST2/modules/*.ycp /usr/share/YaST2/modules/*.ybc @@ -168,7 +148,6 @@ rm -rf "$RPM_BUILD_ROOT" %dir /usr/share/autoinstall/modules %dir /usr/share/YaST2/include/installation /usr/share/YaST2/include/installation/* - # agents /usr/share/YaST2/scrconf/etc_passwd.scr /usr/share/YaST2/scrconf/cfg_windowmanager.scr @@ -180,13 +159,10 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/scrconf/run_df.scr # fillup /var/adm/fillup-templates/sysconfig.security-checksig - # programs and scripts %{prefix}/lib/YaST2/startup - # icewm /etc/icewm - %dir %{prefix}/share/doc/packages/yast2-installation %{prefix}/share/doc/packages/yast2-installation/COPYING %readme %{prefix}/share/doc/packages/yast2-installation/README @@ -196,3 +172,4 @@ 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 From 36251e7a8cca437ac020a7dc4b75df66192ef5b4e83408ba3575023ffe31d37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Fri, 23 Oct 2009 05:52:10 +0000 Subject: [PATCH 3/5] 2,8d1 < Fri Oct 23 07:40:56 CEST 2009 - jsuchome@suse.cz < < - during update, do not save timezone and console settings < (bnc#547587) < - 2.18.33 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=46 --- ready | 0 yast2-installation-2.18.31.tar.bz2 | 3 - yast2-installation-2.18.33.tar.bz2 | 3 + yast2-installation.changes | 13 +++ yast2-installation.spec | 141 +++++++++++++++++------------ 5 files changed, 98 insertions(+), 62 deletions(-) delete mode 100644 ready delete mode 100644 yast2-installation-2.18.31.tar.bz2 create mode 100644 yast2-installation-2.18.33.tar.bz2 diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/yast2-installation-2.18.31.tar.bz2 b/yast2-installation-2.18.31.tar.bz2 deleted file mode 100644 index 706846d..0000000 --- a/yast2-installation-2.18.31.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5627b15236b54a363340edef2d3d3674d40ec8db05dca96aa62ad568aa7402a -size 283599 diff --git a/yast2-installation-2.18.33.tar.bz2 b/yast2-installation-2.18.33.tar.bz2 new file mode 100644 index 0000000..3251733 --- /dev/null +++ b/yast2-installation-2.18.33.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da3c8a69e17cc6e4c77477c56cf429c72314b14a414b61924fc78ffe3779da05 +size 295245 diff --git a/yast2-installation.changes b/yast2-installation.changes index e2eeb52..09c18ec 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Oct 23 07:40:56 CEST 2009 - jsuchome@suse.cz + +- during update, do not save timezone and console settings + (bnc#547587) +- 2.18.33 + +------------------------------------------------------------------- +Fri Oct 16 14:36:11 CEST 2009 - locilka@suse.cz + +- Fixed handling repositories during upgrade (bnc #543468). +- 2.18.32 + ------------------------------------------------------------------- Wed Oct 7 15:36:44 CEST 2009 - jsuchome@suse.cz diff --git a/yast2-installation.spec b/yast2-installation.spec index ffa849e..b975f06 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,100 +1,116 @@ # -# spec file for package yast2-installation (Version 2.18.31) +# spec file for package yast2-installation (Version 2.18.33) # -# 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-installation -Version: 2.18.31 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.18.31.tar.bz2 -Prefix: /usr -Group: System/YaST -License: GPL v2 or later +Name: yast2-installation +Version: 2.18.33 +Release: 0 + + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-2.18.33.tar.bz2 + +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 + # 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 + # BNC #449818: "description_id" in DefaultDesktop -Requires: yast2-packager >= 2.17.49 +Requires: yast2-packager >= 2.17.49 + # Storage::GetCommitInfos() call in include/misc.ycp -Requires: yast2-storage >= 2.18.0 +Requires: yast2-storage >= 2.18.0 + # use in startup scripts -Requires: initviocons +Requires: initviocons + # Only in inst-sys # Requires: yast2-network # Requires: yast2-add-on # Requires: yast2-update + # 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 # bugzilla #208307 #Requires: /usr/bin/jpegtopnm #Requires: /usr/bin/pnmtopng + # BNC 446533, /sbin/lspci called but not installed -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 -PreReq: %fillup_prereq -BuildArch: noarch -Summary: YaST2 - Installation Parts +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 + +PreReq: %fillup_prereq + +BuildArchitectures: noarch + +Summary: YaST2 - Installation Parts %package devel-doc -License: GPL v2 or later Group: Documentation/HTML -Requires: yast2-installation >= 2.15.34 -PreReq: %fillup_prereq -Summary: YaST2 - Installation Parts +Requires: yast2-installation >= 2.15.34 + +PreReq: %fillup_prereq + +Summary: YaST2 - Installation Parts %description System installation code as present on installation media. @@ -103,14 +119,16 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-2.18.31 +%setup -n yast2-installation-2.18.33 %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) @@ -125,6 +143,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" @@ -138,6 +157,7 @@ rm -rf "$RPM_BUILD_ROOT" # Fixme: move to another package (to make build of other packages faster) /usr/share/YaST2/control/*.rng /usr/share/YaST2/control/*.rnc + /usr/share/YaST2/clients/*.ycp /usr/share/YaST2/modules/*.ycp /usr/share/YaST2/modules/*.ybc @@ -148,6 +168,7 @@ rm -rf "$RPM_BUILD_ROOT" %dir /usr/share/autoinstall/modules %dir /usr/share/YaST2/include/installation /usr/share/YaST2/include/installation/* + # agents /usr/share/YaST2/scrconf/etc_passwd.scr /usr/share/YaST2/scrconf/cfg_windowmanager.scr @@ -159,10 +180,13 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/scrconf/run_df.scr # fillup /var/adm/fillup-templates/sysconfig.security-checksig + # programs and scripts %{prefix}/lib/YaST2/startup + # icewm /etc/icewm + %dir %{prefix}/share/doc/packages/yast2-installation %{prefix}/share/doc/packages/yast2-installation/COPYING %readme %{prefix}/share/doc/packages/yast2-installation/README @@ -172,4 +196,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 From d9a9283372652913453109cd86338b56b14bfc1930df7fd06856d6e7b3ef63e1 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 23 Oct 2009 13:21:01 +0000 Subject: [PATCH 4/5] checked in OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=47 --- ready | 0 yast2-installation-2.18.32.tar.bz2 | 3 + yast2-installation-2.18.33.tar.bz2 | 3 - yast2-installation.changes | 7 -- yast2-installation.spec | 141 ++++++++++++----------------- 5 files changed, 62 insertions(+), 92 deletions(-) create mode 100644 ready create mode 100644 yast2-installation-2.18.32.tar.bz2 delete mode 100644 yast2-installation-2.18.33.tar.bz2 diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 diff --git a/yast2-installation-2.18.32.tar.bz2 b/yast2-installation-2.18.32.tar.bz2 new file mode 100644 index 0000000..8830c33 --- /dev/null +++ b/yast2-installation-2.18.32.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:156ff89e347507e938b66224f2dee6262f2627c5f8c48f89ef6e19ee85f702e9 +size 298812 diff --git a/yast2-installation-2.18.33.tar.bz2 b/yast2-installation-2.18.33.tar.bz2 deleted file mode 100644 index 3251733..0000000 --- a/yast2-installation-2.18.33.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da3c8a69e17cc6e4c77477c56cf429c72314b14a414b61924fc78ffe3779da05 -size 295245 diff --git a/yast2-installation.changes b/yast2-installation.changes index 09c18ec..a9de4fc 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Fri Oct 23 07:40:56 CEST 2009 - jsuchome@suse.cz - -- during update, do not save timezone and console settings - (bnc#547587) -- 2.18.33 - ------------------------------------------------------------------- Fri Oct 16 14:36:11 CEST 2009 - locilka@suse.cz diff --git a/yast2-installation.spec b/yast2-installation.spec index b975f06..73141b6 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,116 +1,100 @@ # -# spec file for package yast2-installation (Version 2.18.33) +# spec file for package yast2-installation (Version 2.18.32) # +# 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-installation -Version: 2.18.33 -Release: 0 - - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.18.33.tar.bz2 - -prefix: /usr - -Group: System/YaST -License: GPL v2 or later +Name: yast2-installation +Version: 2.18.32 +Release: 1 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-2.18.32.tar.bz2 +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 - # 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 # BNC #449818: "description_id" in DefaultDesktop -Requires: yast2-packager >= 2.17.49 - +Requires: yast2-packager >= 2.17.49 # Storage::GetCommitInfos() call in include/misc.ycp -Requires: yast2-storage >= 2.18.0 - +Requires: yast2-storage >= 2.18.0 # use in startup scripts -Requires: initviocons - +Requires: initviocons # Only in inst-sys # Requires: yast2-network # Requires: yast2-add-on # Requires: yast2-update - # 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 # bugzilla #208307 #Requires: /usr/bin/jpegtopnm #Requires: /usr/bin/pnmtopng - # BNC 446533, /sbin/lspci called but not installed -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 - -PreReq: %fillup_prereq - -BuildArchitectures: noarch - -Summary: YaST2 - Installation Parts +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 +PreReq: %fillup_prereq +BuildArch: noarch +Summary: YaST2 - Installation Parts %package devel-doc +License: GPL v2 or later Group: Documentation/HTML -Requires: yast2-installation >= 2.15.34 - -PreReq: %fillup_prereq - -Summary: YaST2 - Installation Parts +Requires: yast2-installation >= 2.15.34 +PreReq: %fillup_prereq +Summary: YaST2 - Installation Parts %description System installation code as present on installation media. @@ -119,16 +103,14 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-2.18.33 +%setup -n yast2-installation-2.18.32 %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) @@ -143,7 +125,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" @@ -157,7 +138,6 @@ rm -rf "$RPM_BUILD_ROOT" # Fixme: move to another package (to make build of other packages faster) /usr/share/YaST2/control/*.rng /usr/share/YaST2/control/*.rnc - /usr/share/YaST2/clients/*.ycp /usr/share/YaST2/modules/*.ycp /usr/share/YaST2/modules/*.ybc @@ -168,7 +148,6 @@ rm -rf "$RPM_BUILD_ROOT" %dir /usr/share/autoinstall/modules %dir /usr/share/YaST2/include/installation /usr/share/YaST2/include/installation/* - # agents /usr/share/YaST2/scrconf/etc_passwd.scr /usr/share/YaST2/scrconf/cfg_windowmanager.scr @@ -180,13 +159,10 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/scrconf/run_df.scr # fillup /var/adm/fillup-templates/sysconfig.security-checksig - # programs and scripts %{prefix}/lib/YaST2/startup - # icewm /etc/icewm - %dir %{prefix}/share/doc/packages/yast2-installation %{prefix}/share/doc/packages/yast2-installation/COPYING %readme %{prefix}/share/doc/packages/yast2-installation/README @@ -196,3 +172,4 @@ 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 From 77d514f156e7a231f469e4e271cbd67108a5b596266e82dc7a727536a1d27abc Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 23 Oct 2009 13:21:02 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/yast2-installation revision 166.0 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=b5f196e70f6e759f575bc38b1f595723 --- yast2-installation-2.18.32.tar.bz2 | 3 --- yast2-installation-2.18.33.tar.bz2 | 3 +++ yast2-installation.changes | 7 +++++++ yast2-installation.spec | 8 ++++---- 4 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 yast2-installation-2.18.32.tar.bz2 create mode 100644 yast2-installation-2.18.33.tar.bz2 diff --git a/yast2-installation-2.18.32.tar.bz2 b/yast2-installation-2.18.32.tar.bz2 deleted file mode 100644 index 8830c33..0000000 --- a/yast2-installation-2.18.32.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:156ff89e347507e938b66224f2dee6262f2627c5f8c48f89ef6e19ee85f702e9 -size 298812 diff --git a/yast2-installation-2.18.33.tar.bz2 b/yast2-installation-2.18.33.tar.bz2 new file mode 100644 index 0000000..3251733 --- /dev/null +++ b/yast2-installation-2.18.33.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da3c8a69e17cc6e4c77477c56cf429c72314b14a414b61924fc78ffe3779da05 +size 295245 diff --git a/yast2-installation.changes b/yast2-installation.changes index a9de4fc..09c18ec 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 23 07:40:56 CEST 2009 - jsuchome@suse.cz + +- during update, do not save timezone and console settings + (bnc#547587) +- 2.18.33 + ------------------------------------------------------------------- Fri Oct 16 14:36:11 CEST 2009 - locilka@suse.cz diff --git a/yast2-installation.spec b/yast2-installation.spec index 73141b6..24d9968 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.18.32) +# spec file for package yast2-installation (Version 2.18.33) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-installation -Version: 2.18.32 +Version: 2.18.33 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.18.32.tar.bz2 +Source0: yast2-installation-2.18.33.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later @@ -103,7 +103,7 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-2.18.32 +%setup -n yast2-installation-2.18.33 %build %{prefix}/bin/y2tool y2autoconf