From 95c6296df81a50ea8a05988e1ff244a7480a63ba757d41dd88c6cc3bb417d8d5 Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Fri, 8 Jan 2010 21:32:29 +0000 Subject: [PATCH 1/4] - updated to latest repo version OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=22 --- autoyast2-2.19.0.tar.bz2 | 4 ++-- autoyast2.changes | 6 ++++++ autoyast2.spec | 8 +++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/autoyast2-2.19.0.tar.bz2 b/autoyast2-2.19.0.tar.bz2 index 4b474dc..1c34b5d 100644 --- a/autoyast2-2.19.0.tar.bz2 +++ b/autoyast2-2.19.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51439ed3d049af6b06515e1a131274491280a40cc27dc57d3a0f2f048b2ea290 -size 1240632 +oid sha256:0d0eb8c9ca9e066ef6b59f47e2f95d151b1be3d68a169f9e6612e725860c9709 +size 1240485 diff --git a/autoyast2.changes b/autoyast2.changes index b029a0a..961a71c 100644 --- a/autoyast2.changes +++ b/autoyast2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 23 11:30:12 CET 2009 - ug@suse.de + +- merged the code for autoyast=device and autoyast=usb to reduce + redundancy and fix the "already mounted" bug for USB (bnc#565558) + ------------------------------------------------------------------- Wed Dec 16 18:44:20 CET 2009 - aschnell@suse.de diff --git a/autoyast2.spec b/autoyast2.spec index 53e8d06..f0b8511 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -1,7 +1,7 @@ # # spec file for package autoyast2 (Version 2.19.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -20,7 +20,7 @@ Name: autoyast2 Version: 2.19.0 -Release: 1 +Release: 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: autoyast2-2.19.0.tar.bz2 Prefix: /usr @@ -31,10 +31,12 @@ BuildRequires: docbook-xsl-stylesheets java2-devel-packages libxslt perl-XML-Wr BuildRequires: yast2 >= 2.16.36 # After API cleanup BuildRequires: yast2-update >= 2.18.3 +BuildRequires: yast2-storage >= 2.19.2 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.2 Provides: yast2-module-autoinst yast2-config-autoinst Obsoletes: yast2-module-autoinst yast2-config-autoinst Provides: yast2-lib-autoinst @@ -56,7 +58,7 @@ installation sources. %package installation License: GPLv2+ Version: 2.19.0 -Release: 1 +Release: 2 Summary: YaST2 - Auto Installation Modules Group: System/YaST # API for Disabled Modules (ProductControl) From 3799c744c35d9f0ddaa983b0a32f9c2dea0b0dbd5e2f503ef317b980ef0b935e Mon Sep 17 00:00:00 2001 From: Uwe Gansert Date: Thu, 14 Jan 2010 14:48:48 +0000 Subject: [PATCH 2/4] 2.19.1 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=23 --- autoyast2-2.19.0.tar.bz2 | 3 - autoyast2-2.19.1.tar.bz2 | 3 + autoyast2.changes | 6 ++ autoyast2.spec | 120 ++++++++++++++++++++++----------------- 4 files changed, 77 insertions(+), 55 deletions(-) delete mode 100644 autoyast2-2.19.0.tar.bz2 create mode 100644 autoyast2-2.19.1.tar.bz2 diff --git a/autoyast2-2.19.0.tar.bz2 b/autoyast2-2.19.0.tar.bz2 deleted file mode 100644 index 1c34b5d..0000000 --- a/autoyast2-2.19.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d0eb8c9ca9e066ef6b59f47e2f95d151b1be3d68a169f9e6612e725860c9709 -size 1240485 diff --git a/autoyast2-2.19.1.tar.bz2 b/autoyast2-2.19.1.tar.bz2 new file mode 100644 index 0000000..792d901 --- /dev/null +++ b/autoyast2-2.19.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7c722ae978e979750b9f4a7c71da8c57a89c6ff0406f318648d7745b5b7b68c +size 1220865 diff --git a/autoyast2.changes b/autoyast2.changes index 961a71c..8913637 100644 --- a/autoyast2.changes +++ b/autoyast2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 14 15:05:16 CET 2010 - ug@suse.de + +- autoyast=label://LABEL/PATH implemented (fate#308525) +- 2.19.1 + ------------------------------------------------------------------- Wed Dec 23 11:30:12 CET 2009 - ug@suse.de diff --git a/autoyast2.spec b/autoyast2.spec index f0b8511..fd3e7d9 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -1,49 +1,43 @@ # -# spec file for package autoyast2 (Version 2.19.0) +# spec file for package autoyast2 (Version 2.19.1) # -# Copyright (c) 2010 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.19.1 +Release: 0 -Name: autoyast2 -Version: 2.19.0 -Release: 2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.19.0.tar.bz2 -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 + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: autoyast2-2.19.1.tar.bz2 + +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 # 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.2 -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.2 -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 -BuildArch: noarch -Summary: YaST2 - Automated Installation +BuildRequires: yast2-update >= 2.18.3 +BuildRequires: yast2-storage >= 2.19.2 + +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.2 + +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 + +BuildArchitectures: noarch + +Summary: YaST2 - Automated Installation %description This package is intended for management of the control files and the @@ -56,32 +50,31 @@ This file contains YaST2-independent files needed to create installation sources. %package installation -License: GPLv2+ -Version: 2.19.0 -Release: 2 -Summary: YaST2 - Auto Installation Modules -Group: System/YaST +Version: 2.19.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. %prep -%setup -n autoyast2-2.19.0 +%setup -n autoyast2-2.19.1 %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) @@ -98,9 +91,11 @@ for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desk d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done + for d in `ls $RPM_BUILD_ROOT/usr/share/autoinstall/modules/*.desktop`; do %suse_update_desktop_file $d done + # Class conf install -d -m 700 $RPM_BUILD_ROOT/etc/autoinstall # Installation files @@ -109,6 +104,7 @@ install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/init.d install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/logs install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/files install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/cache + # Repository install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository/templates @@ -123,6 +119,7 @@ rm -rf "$RPM_BUILD_ROOT" %post %{fillup_only -n autoinstall} + %files %defattr(-,root,root) %dir /etc/autoinstall @@ -133,6 +130,8 @@ rm -rf "$RPM_BUILD_ROOT" %dir /var/lib/autoinstall/repository/classes %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 @@ -144,6 +143,7 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/include/autoinstall/wizards.ycp /usr/share/YaST2/include/autoinstall/helps.ycp /usr/share/YaST2/schema/autoyast/rnc/*.rnc + /usr/share/YaST2/clients/general_auto.ycp /usr/share/YaST2/clients/report_auto.ycp /usr/share/YaST2/clients/classes_auto.ycp @@ -153,13 +153,21 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/clients/autoyast.ycp /usr/share/YaST2/clients/clone_system.ycp /usr/share/YaST2/clients/ayast_setup.ycp + /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 @@ -170,9 +178,11 @@ rm -rf "$RPM_BUILD_ROOT" %dir /usr/share/autoinstall/modules #/usr/share/autoinstall/dtd/* /etc/init.d/autoyast + %dir /usr/share/autoinstall/xslt /usr/share/autoinstall/xslt/merge.xslt # config file + /usr/share/YaST2/modules/AutoinstClone.y* %dir /usr/share/YaST2/include/autoinstall /usr/share/YaST2/include/autoinstall/autopart.ycp @@ -186,7 +196,9 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/include/autoinstall/common.ycp /usr/share/YaST2/include/autoinstall/tree.ycp /usr/share/YaST2/include/autoinstall/types.ycp + /usr/share/YaST2/control/*.xml + /usr/share/YaST2/modules/AutoInstall.y* /usr/share/YaST2/modules/AutoinstScripts.y* /usr/share/YaST2/modules/AutoinstGeneral.y* @@ -205,6 +217,7 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/modules/AutoinstDrive.y* /usr/share/YaST2/modules/AutoinstPartPlan.y* /usr/share/YaST2/modules/AutoinstPartition.y* + #clients /usr/share/YaST2/clients/inst_autoinit.ycp /usr/share/YaST2/clients/inst_autoimage.ycp @@ -219,6 +232,8 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/clients/ayast_probe.ycp /usr/share/YaST2/include/autoinstall/xml.ycp /usr/share/YaST2/include/autoinstall/ask.ycp + + %dir /var/adm/autoinstall/ %dir /var/adm/autoinstall/scripts %dir /var/adm/autoinstall/init.d @@ -227,4 +242,5 @@ rm -rf "$RPM_BUILD_ROOT" %dir /var/adm/autoinstall/cache %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf -%changelog + + From 4dedd672316e62f13036f6cd541232cc23cde2ed1f2a7e548beb1fff40ea8235 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 14 Jan 2010 21:30:13 +0000 Subject: [PATCH 3/4] checked in (request 29584) OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=24 --- autoyast2-2.19.0.tar.bz2 | 3 + autoyast2-2.19.1.tar.bz2 | 3 - autoyast2.changes | 12 ---- autoyast2.spec | 118 +++++++++++++++++---------------------- 4 files changed, 53 insertions(+), 83 deletions(-) create mode 100644 autoyast2-2.19.0.tar.bz2 delete mode 100644 autoyast2-2.19.1.tar.bz2 diff --git a/autoyast2-2.19.0.tar.bz2 b/autoyast2-2.19.0.tar.bz2 new file mode 100644 index 0000000..4b474dc --- /dev/null +++ b/autoyast2-2.19.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51439ed3d049af6b06515e1a131274491280a40cc27dc57d3a0f2f048b2ea290 +size 1240632 diff --git a/autoyast2-2.19.1.tar.bz2 b/autoyast2-2.19.1.tar.bz2 deleted file mode 100644 index 792d901..0000000 --- a/autoyast2-2.19.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7c722ae978e979750b9f4a7c71da8c57a89c6ff0406f318648d7745b5b7b68c -size 1220865 diff --git a/autoyast2.changes b/autoyast2.changes index 8913637..b029a0a 100644 --- a/autoyast2.changes +++ b/autoyast2.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -Thu Jan 14 15:05:16 CET 2010 - ug@suse.de - -- autoyast=label://LABEL/PATH implemented (fate#308525) -- 2.19.1 - -------------------------------------------------------------------- -Wed Dec 23 11:30:12 CET 2009 - ug@suse.de - -- merged the code for autoyast=device and autoyast=usb to reduce - redundancy and fix the "already mounted" bug for USB (bnc#565558) - ------------------------------------------------------------------- Wed Dec 16 18:44:20 CET 2009 - aschnell@suse.de diff --git a/autoyast2.spec b/autoyast2.spec index fd3e7d9..53e8d06 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -1,43 +1,47 @@ # -# spec file for package autoyast2 (Version 2.19.1) +# spec file for package autoyast2 (Version 2.19.0) # +# 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: autoyast2 -Version: 2.19.1 -Release: 0 - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.19.1.tar.bz2 - -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 +Name: autoyast2 +Version: 2.19.0 +Release: 1 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: autoyast2-2.19.0.tar.bz2 +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 # 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.2 - -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.2 - -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 - -BuildArchitectures: noarch - -Summary: YaST2 - Automated Installation +BuildRequires: yast2-update >= 2.18.3 +Requires: yast2 >= 2.16.36 +Requires: yast2-core yast2-xml libxslt +Requires: autoyast2-installation = %{version} +Requires: yast2-schema yast2 yast2-country yast2-storage +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 +BuildArch: noarch +Summary: YaST2 - Automated Installation %description This package is intended for management of the control files and the @@ -50,31 +54,32 @@ This file contains YaST2-independent files needed to create installation sources. %package installation -Version: 2.19.1 -Summary: YaST2 - Auto Installation Modules -Group: System/YaST +License: GPLv2+ +Version: 2.19.0 +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. %prep -%setup -n autoyast2-2.19.1 +%setup -n autoyast2-2.19.0 %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) @@ -91,11 +96,9 @@ for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desk d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done - for d in `ls $RPM_BUILD_ROOT/usr/share/autoinstall/modules/*.desktop`; do %suse_update_desktop_file $d done - # Class conf install -d -m 700 $RPM_BUILD_ROOT/etc/autoinstall # Installation files @@ -104,7 +107,6 @@ install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/init.d install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/logs install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/files install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/cache - # Repository install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository/templates @@ -119,7 +121,6 @@ rm -rf "$RPM_BUILD_ROOT" %post %{fillup_only -n autoinstall} - %files %defattr(-,root,root) %dir /etc/autoinstall @@ -130,8 +131,6 @@ rm -rf "$RPM_BUILD_ROOT" %dir /var/lib/autoinstall/repository/classes %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 @@ -143,7 +142,6 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/include/autoinstall/wizards.ycp /usr/share/YaST2/include/autoinstall/helps.ycp /usr/share/YaST2/schema/autoyast/rnc/*.rnc - /usr/share/YaST2/clients/general_auto.ycp /usr/share/YaST2/clients/report_auto.ycp /usr/share/YaST2/clients/classes_auto.ycp @@ -153,21 +151,13 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/clients/autoyast.ycp /usr/share/YaST2/clients/clone_system.ycp /usr/share/YaST2/clients/ayast_setup.ycp - /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 @@ -178,11 +168,9 @@ rm -rf "$RPM_BUILD_ROOT" %dir /usr/share/autoinstall/modules #/usr/share/autoinstall/dtd/* /etc/init.d/autoyast - %dir /usr/share/autoinstall/xslt /usr/share/autoinstall/xslt/merge.xslt # config file - /usr/share/YaST2/modules/AutoinstClone.y* %dir /usr/share/YaST2/include/autoinstall /usr/share/YaST2/include/autoinstall/autopart.ycp @@ -196,9 +184,7 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/include/autoinstall/common.ycp /usr/share/YaST2/include/autoinstall/tree.ycp /usr/share/YaST2/include/autoinstall/types.ycp - /usr/share/YaST2/control/*.xml - /usr/share/YaST2/modules/AutoInstall.y* /usr/share/YaST2/modules/AutoinstScripts.y* /usr/share/YaST2/modules/AutoinstGeneral.y* @@ -217,7 +203,6 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/modules/AutoinstDrive.y* /usr/share/YaST2/modules/AutoinstPartPlan.y* /usr/share/YaST2/modules/AutoinstPartition.y* - #clients /usr/share/YaST2/clients/inst_autoinit.ycp /usr/share/YaST2/clients/inst_autoimage.ycp @@ -232,8 +217,6 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/clients/ayast_probe.ycp /usr/share/YaST2/include/autoinstall/xml.ycp /usr/share/YaST2/include/autoinstall/ask.ycp - - %dir /var/adm/autoinstall/ %dir /var/adm/autoinstall/scripts %dir /var/adm/autoinstall/init.d @@ -242,5 +225,4 @@ rm -rf "$RPM_BUILD_ROOT" %dir /var/adm/autoinstall/cache %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf - - +%changelog From 1dd19948cf8a3412f77df21d70d4b4cd00137b562f8b9a5d621149ffa9665bdb Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 14 Jan 2010 21:30:14 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/autoyast2 revision 75.0 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=f2335d3d639ee9084a1e92eb8258397f --- autoyast2-2.19.0.tar.bz2 | 3 --- autoyast2-2.19.1.tar.bz2 | 3 +++ autoyast2.changes | 12 ++++++++++++ autoyast2.spec | 14 ++++++++------ 4 files changed, 23 insertions(+), 9 deletions(-) delete mode 100644 autoyast2-2.19.0.tar.bz2 create mode 100644 autoyast2-2.19.1.tar.bz2 diff --git a/autoyast2-2.19.0.tar.bz2 b/autoyast2-2.19.0.tar.bz2 deleted file mode 100644 index 4b474dc..0000000 --- a/autoyast2-2.19.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51439ed3d049af6b06515e1a131274491280a40cc27dc57d3a0f2f048b2ea290 -size 1240632 diff --git a/autoyast2-2.19.1.tar.bz2 b/autoyast2-2.19.1.tar.bz2 new file mode 100644 index 0000000..792d901 --- /dev/null +++ b/autoyast2-2.19.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7c722ae978e979750b9f4a7c71da8c57a89c6ff0406f318648d7745b5b7b68c +size 1220865 diff --git a/autoyast2.changes b/autoyast2.changes index b029a0a..8913637 100644 --- a/autoyast2.changes +++ b/autoyast2.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jan 14 15:05:16 CET 2010 - ug@suse.de + +- autoyast=label://LABEL/PATH implemented (fate#308525) +- 2.19.1 + +------------------------------------------------------------------- +Wed Dec 23 11:30:12 CET 2009 - ug@suse.de + +- merged the code for autoyast=device and autoyast=usb to reduce + redundancy and fix the "already mounted" bug for USB (bnc#565558) + ------------------------------------------------------------------- Wed Dec 16 18:44:20 CET 2009 - aschnell@suse.de diff --git a/autoyast2.spec b/autoyast2.spec index 53e8d06..6a4fb44 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -1,7 +1,7 @@ # -# spec file for package autoyast2 (Version 2.19.0) +# spec file for package autoyast2 (Version 2.19.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,10 +19,10 @@ Name: autoyast2 -Version: 2.19.0 +Version: 2.19.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.19.0.tar.bz2 +Source0: autoyast2-2.19.1.tar.bz2 Prefix: /usr Group: System/YaST License: GPLv2+ @@ -31,10 +31,12 @@ BuildRequires: docbook-xsl-stylesheets java2-devel-packages libxslt perl-XML-Wr BuildRequires: yast2 >= 2.16.36 # After API cleanup BuildRequires: yast2-update >= 2.18.3 +BuildRequires: yast2-storage >= 2.19.2 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.2 Provides: yast2-module-autoinst yast2-config-autoinst Obsoletes: yast2-module-autoinst yast2-config-autoinst Provides: yast2-lib-autoinst @@ -55,7 +57,7 @@ installation sources. %package installation License: GPLv2+ -Version: 2.19.0 +Version: 2.19.1 Release: 1 Summary: YaST2 - Auto Installation Modules Group: System/YaST @@ -72,7 +74,7 @@ This package performs auto-installation relying on a control file generated with the autoyast2 package. %prep -%setup -n autoyast2-2.19.0 +%setup -n autoyast2-2.19.1 %build %{prefix}/bin/y2tool y2autoconf