From e8dd6d30c8f85dfa7a63394b3e15f6ce08f51c5b44d0a7fc84d9e898c92a0519 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 7 Jan 2011 11:20:20 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/autoyast2 revision 88.0 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=6c99f55c44ee84f71f164f0c91748d39 --- autoyast2.spec | 91 +++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 41 deletions(-) diff --git a/autoyast2.spec b/autoyast2.spec index 332b515..97bae84 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -1,43 +1,57 @@ # # spec file for package autoyast2 (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: autoyast2 -Version: 2.20.3 -Release: 0 +Name: autoyast2 +Version: 2.20.3 +Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.20.3.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: autoyast2-2.20.3.tar.bz2 -prefix: /usr +Prefix: /usr -Group: System/YaST -License: GPL v2 or later -BuildRequires: java2-devel-packages yast2-mouse yast2-transfer yast2-bootloader xorg-x11-libs yast2-devtools pkg-config libxslt perl-XML-Writer docbook-xsl-stylesheets sgml-skel yast2-testsuite update-desktop-files yast2-country yast2-slp +Group: System/YaST +License: GPLv2+ +BuildRequires: docbook-xsl-stylesheets java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-slp yast2-testsuite yast2-transfer # API for Disabled Modules (ProductControl) -BuildRequires: yast2 >= 2.16.36 +BuildRequires: yast2 >= 2.16.36 # After API cleanup -BuildRequires: yast2-update >= 2.18.3 -BuildRequires: yast2-storage >= 2.19.8 +BuildRequires: yast2-update >= 2.18.3 +BuildRequires: yast2-storage >= 2.19.8 -Requires: yast2 >= 2.16.36 -Requires: yast2-core yast2-xml libxslt -Requires: autoyast2-installation = %{version} -Requires: yast2-schema yast2 yast2-country yast2-storage -Requires: yast2-storage >= 2.19.13 +Requires: yast2 >= 2.16.36 +Requires: yast2-core yast2-xml libxslt +Requires: autoyast2-installation = %{version} +Requires: yast2-schema yast2 yast2-country yast2-storage +Requires: yast2-storage >= 2.19.13 -Provides: yast2-module-autoinst yast2-config-autoinst -Obsoletes: yast2-module-autoinst yast2-config-autoinst -Provides: yast2-lib-autoinst -Obsoletes: yast2-lib-autoinst +Provides: yast2-module-autoinst yast2-config-autoinst +Obsoletes: yast2-module-autoinst yast2-config-autoinst +Provides: yast2-lib-autoinst +Obsoletes: yast2-lib-autoinst -PreReq: %insserv_prereq %fillup_prereq +PreReq: %insserv_prereq %fillup_prereq -BuildArchitectures: noarch +BuildArch: noarch -Summary: YaST2 - Automated Installation +Summary: YaST2 - Automated Installation %description This package is intended for management of the control files and the @@ -50,16 +64,19 @@ This file contains YaST2-independent files needed to create installation sources. %package installation -Version: 2.20.3 -Summary: YaST2 - Auto Installation Modules -Group: System/YaST +License: GPLv2+ +Version: 2.20.3 +Release: 1 +Summary: YaST2 - Auto Installation Modules +Group: System/YaST # API for Disabled Modules (ProductControl) -Requires: yast2 >= 2.16.36 +Requires: yast2 >= 2.16.36 # After API cleanup -Requires: yast2-update >= 2.18.3 -Requires: yast2-xml yast2-core yast2 yast2-country yast2-mouse yast2-packager yast2-storage yast2-transfer yast2-slp -Provides: yast2-trans-autoinst -Obsoletes: yast2-trans-autoinst +Requires: yast2-update >= 2.18.3 +Requires: yast2-xml yast2-core yast2 yast2-country yast2-mouse yast2-packager yast2-storage yast2-transfer yast2-slp +Provides: yast2-trans-autoinst +Obsoletes: yast2-trans-autoinst + %description installation This package performs auto-installation relying on a control file generated with the autoyast2 package. @@ -119,7 +136,6 @@ rm -rf "$RPM_BUILD_ROOT" %post %{fillup_only -n autoinstall} - %files %defattr(-,root,root) %dir /etc/autoinstall @@ -131,7 +147,6 @@ rm -rf "$RPM_BUILD_ROOT" %dir /var/lib/autoinstall/tmp %doc %{prefix}/share/doc/packages/autoyast2 - %{prefix}/share/applications/YaST2/autoyast.desktop /usr/share/autoinstall/modules/*.desktop /usr/share/YaST2/include/autoinstall/classes.ycp @@ -156,18 +171,14 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/scrconf/ksimport.scr - /usr/share/YaST2/modules/AutoinstClass.y* /usr/share/YaST2/modules/Kickstart.y* /usr/lib/YaST2/servers_non_y2/ag_ksimport - - # additional files /var/adm/fillup-templates/sysconfig.autoinstall - %files installation %defattr(-,root,root) /usr/share/YaST2/scrconf/autoinstall.scr @@ -236,7 +247,6 @@ rm -rf "$RPM_BUILD_ROOT" # scripts %{prefix}/lib/YaST2/bin/fetch_image.sh - %dir /var/adm/autoinstall/ %dir /var/adm/autoinstall/scripts %dir /var/adm/autoinstall/init.d @@ -245,5 +255,4 @@ rm -rf "$RPM_BUILD_ROOT" %dir /var/adm/autoinstall/cache %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf - - +%changelog From 6a3059b3153a499e9886cddf6845d1ccf89a63fc3837afcf2c314b4a5968504b Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Wed, 19 Jan 2011 14:22:44 +0000 Subject: [PATCH 2/2] 2,7d1 < Wed Jan 19 15:15:20 CET 2011 - jsrain@suse.cz < < - adaptations for unattended migration (fate#310481) < - 2.20.4 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=46 --- autoyast2-2.20.3.tar.bz2 | 3 -- autoyast2-2.20.4.tar.bz2 | 3 ++ autoyast2.changes | 6 +++ autoyast2.spec | 98 +++++++++++++++++++--------------------- 4 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 autoyast2-2.20.3.tar.bz2 create mode 100644 autoyast2-2.20.4.tar.bz2 diff --git a/autoyast2-2.20.3.tar.bz2 b/autoyast2-2.20.3.tar.bz2 deleted file mode 100644 index 9a4bce1..0000000 --- a/autoyast2-2.20.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05e28c6e1cbb314d94d4d4b331db4c0fd839fa73c3d98c2c3647dcee34e7aaf0 -size 1233014 diff --git a/autoyast2-2.20.4.tar.bz2 b/autoyast2-2.20.4.tar.bz2 new file mode 100644 index 0000000..940d982 --- /dev/null +++ b/autoyast2-2.20.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee62383f371e58baa55d59ca0608f469e216ed869e1578def7fb88efea0703b9 +size 1242364 diff --git a/autoyast2.changes b/autoyast2.changes index 76bfece..9e52e07 100644 --- a/autoyast2.changes +++ b/autoyast2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 19 15:15:20 CET 2011 - jsrain@suse.cz + +- adaptations for unattended migration (fate#310481) +- 2.20.4 + ------------------------------------------------------------------- Tue Jan 4 11:04:33 UTC 2011 - lslezak@suse.cz diff --git a/autoyast2.spec b/autoyast2.spec index 97bae84..6901253 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -1,57 +1,43 @@ # -# spec file for package autoyast2 (Version 2.20.3) +# spec file for package autoyast2 (Version 2.20.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: autoyast2 +Version: 2.20.4 +Release: 0 -Name: autoyast2 -Version: 2.20.3 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.20.3.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: autoyast2-2.20.4.tar.bz2 -Prefix: /usr +prefix: /usr -Group: System/YaST -License: GPLv2+ -BuildRequires: docbook-xsl-stylesheets java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-slp yast2-testsuite yast2-transfer +Group: System/YaST +License: GPL v2 or later +BuildRequires: java2-devel-packages yast2-mouse yast2-transfer yast2-bootloader xorg-x11-libs yast2-devtools pkg-config libxslt perl-XML-Writer docbook-xsl-stylesheets sgml-skel yast2-testsuite update-desktop-files yast2-country yast2-slp # API for Disabled Modules (ProductControl) -BuildRequires: yast2 >= 2.16.36 +BuildRequires: yast2 >= 2.16.36 # After API cleanup -BuildRequires: yast2-update >= 2.18.3 -BuildRequires: yast2-storage >= 2.19.8 +BuildRequires: yast2-update >= 2.18.3 +BuildRequires: yast2-storage >= 2.19.8 -Requires: yast2 >= 2.16.36 -Requires: yast2-core yast2-xml libxslt -Requires: autoyast2-installation = %{version} -Requires: yast2-schema yast2 yast2-country yast2-storage -Requires: yast2-storage >= 2.19.13 +Requires: yast2 >= 2.16.36 +Requires: yast2-core yast2-xml libxslt +Requires: autoyast2-installation = %{version} +Requires: yast2-schema yast2 yast2-country yast2-storage +Requires: yast2-storage >= 2.19.13 -Provides: yast2-module-autoinst yast2-config-autoinst -Obsoletes: yast2-module-autoinst yast2-config-autoinst -Provides: yast2-lib-autoinst -Obsoletes: yast2-lib-autoinst +Provides: yast2-module-autoinst yast2-config-autoinst +Obsoletes: yast2-module-autoinst yast2-config-autoinst +Provides: yast2-lib-autoinst +Obsoletes: yast2-lib-autoinst -PreReq: %insserv_prereq %fillup_prereq +PreReq: %insserv_prereq %fillup_prereq -BuildArch: noarch +BuildArchitectures: noarch -Summary: YaST2 - Automated Installation +Summary: YaST2 - Automated Installation %description This package is intended for management of the control files and the @@ -64,25 +50,22 @@ This file contains YaST2-independent files needed to create installation sources. %package installation -License: GPLv2+ -Version: 2.20.3 -Release: 1 -Summary: YaST2 - Auto Installation Modules -Group: System/YaST +Version: 2.20.4 +Summary: YaST2 - Auto Installation Modules +Group: System/YaST # API for Disabled Modules (ProductControl) -Requires: yast2 >= 2.16.36 +Requires: yast2 >= 2.16.36 # After API cleanup -Requires: yast2-update >= 2.18.3 -Requires: yast2-xml yast2-core yast2 yast2-country yast2-mouse yast2-packager yast2-storage yast2-transfer yast2-slp -Provides: yast2-trans-autoinst -Obsoletes: yast2-trans-autoinst - +Requires: yast2-update >= 2.18.3 +Requires: yast2-xml yast2-core yast2 yast2-country yast2-mouse yast2-packager yast2-storage yast2-transfer yast2-slp +Provides: yast2-trans-autoinst +Obsoletes: yast2-trans-autoinst %description installation This package performs auto-installation relying on a control file generated with the autoyast2 package. %prep -%setup -n autoyast2-2.20.3 +%setup -n autoyast2-2.20.4 %build %{prefix}/bin/y2tool y2autoconf @@ -136,6 +119,7 @@ rm -rf "$RPM_BUILD_ROOT" %post %{fillup_only -n autoinstall} + %files %defattr(-,root,root) %dir /etc/autoinstall @@ -147,6 +131,7 @@ rm -rf "$RPM_BUILD_ROOT" %dir /var/lib/autoinstall/tmp %doc %{prefix}/share/doc/packages/autoyast2 + %{prefix}/share/applications/YaST2/autoyast.desktop /usr/share/autoinstall/modules/*.desktop /usr/share/YaST2/include/autoinstall/classes.ycp @@ -171,14 +156,18 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/scrconf/ksimport.scr + /usr/share/YaST2/modules/AutoinstClass.y* /usr/share/YaST2/modules/Kickstart.y* /usr/lib/YaST2/servers_non_y2/ag_ksimport + + # additional files /var/adm/fillup-templates/sysconfig.autoinstall + %files installation %defattr(-,root,root) /usr/share/YaST2/scrconf/autoinstall.scr @@ -241,12 +230,16 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/clients/autoinst_scripts1_finish.ycp /usr/share/YaST2/clients/autoinst_scripts2_finish.ycp /usr/share/YaST2/clients/ayast_probe.ycp +/usr/share/YaST2/clients/inst_autosetup_upgrade.ycp +/usr/share/YaST2/clients/inst_store_upgrade_software.ycp + /usr/share/YaST2/include/autoinstall/xml.ycp /usr/share/YaST2/include/autoinstall/ask.ycp # scripts %{prefix}/lib/YaST2/bin/fetch_image.sh + %dir /var/adm/autoinstall/ %dir /var/adm/autoinstall/scripts %dir /var/adm/autoinstall/init.d @@ -255,4 +248,5 @@ rm -rf "$RPM_BUILD_ROOT" %dir /var/adm/autoinstall/cache %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf -%changelog + +