diff --git a/autoyast2-2.18.10.tar.bz2 b/autoyast2-2.18.10.tar.bz2 deleted file mode 100644 index e8539f8..0000000 --- a/autoyast2-2.18.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d33c9657e6213aed812e8515c52bd4b7e438e9c5b864a6c62ed56f35dfa65eef -size 1207395 diff --git a/autoyast2-2.18.11.tar.bz2 b/autoyast2-2.18.11.tar.bz2 new file mode 100644 index 0000000..322fb6e --- /dev/null +++ b/autoyast2-2.18.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af02a84fe089a72574feab7eeede2f8121f59e3af7de7941fa03549a3cd28b71 +size 1207138 diff --git a/autoyast2.changes b/autoyast2.changes index 6e08f69..036e51c 100644 --- a/autoyast2.changes +++ b/autoyast2.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Oct 2 12:33:19 CEST 2009 - ug@suse.de + +- false alert about missing device fixed +- 2.18.11 + +------------------------------------------------------------------- +Thu Oct 1 13:38:25 CEST 2009 - ug@suse.de + +- clone the mountoptions of partitions too + (bnc#542330) + +------------------------------------------------------------------- +Thu Oct 1 12:44:01 CEST 2009 - ug@suse.de + +- don't format partitions that have unknown FS during cloning + (bnc#542331) + ------------------------------------------------------------------- Mon Aug 31 13:15:19 CEST 2009 - ug@suse.de diff --git a/autoyast2.spec b/autoyast2.spec index f03043f..c40d30f 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -1,47 +1,41 @@ # -# spec file for package autoyast2 (Version 2.18.10) +# spec file for package autoyast2 (Version 2.18.11) # -# 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.18.11 +Release: 0 -Name: autoyast2 -Version: 2.18.10 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.18.10.tar.bz2 -Prefix: /usr -Group: System/YaST -License: GPL v2 or later -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.18.11.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 -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 +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 + +BuildArchitectures: noarch + +Summary: YaST2 - Automated Installation %description This package is intended for management of the control files and the @@ -54,32 +48,31 @@ This file contains YaST2-independent files needed to create installation sources. %package installation -License: GPL v2 or later -Version: 2.18.10 -Release: 1 -Summary: YaST2 - Auto Installation Modules -Group: System/YaST +Version: 2.18.11 +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.18.10 +%setup -n autoyast2-2.18.11 %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) @@ -96,9 +89,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 @@ -107,6 +102,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 @@ -121,6 +117,7 @@ rm -rf "$RPM_BUILD_ROOT" %post %{fillup_only -n autoinstall} + %files %defattr(-,root,root) %dir /etc/autoinstall @@ -131,6 +128,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 @@ -142,6 +141,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 @@ -151,13 +151,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 @@ -168,9 +176,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 @@ -184,7 +194,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* @@ -203,6 +215,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 @@ -217,6 +230,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 @@ -226,4 +241,4 @@ rm -rf "$RPM_BUILD_ROOT" %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf -%changelog +