From c083e1ab8e2bf3fb78fd28634d3d1c16e83a1d29b80c5586e8f877fa3041ee74 Mon Sep 17 00:00:00 2001 From: Uwe Gansert Date: Mon, 12 Oct 2009 13:29:09 +0000 Subject: [PATCH 1/4] 2.18.12 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=16 --- autoyast2-2.18.11.tar.bz2 | 3 - autoyast2-2.18.12.tar.bz2 | 3 + autoyast2.changes | 11 ++++ autoyast2.spec | 116 ++++++++++++++++++++++---------------- 4 files changed, 80 insertions(+), 53 deletions(-) delete mode 100644 autoyast2-2.18.11.tar.bz2 create mode 100644 autoyast2-2.18.12.tar.bz2 diff --git a/autoyast2-2.18.11.tar.bz2 b/autoyast2-2.18.11.tar.bz2 deleted file mode 100644 index 322fb6e..0000000 --- a/autoyast2-2.18.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af02a84fe089a72574feab7eeede2f8121f59e3af7de7941fa03549a3cd28b71 -size 1207138 diff --git a/autoyast2-2.18.12.tar.bz2 b/autoyast2-2.18.12.tar.bz2 new file mode 100644 index 0000000..2a62038 --- /dev/null +++ b/autoyast2-2.18.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:024ec034367d470e4d223f4376fc88ad8140242f5c4dc0a999dbd5bbceb40fed +size 1206799 diff --git a/autoyast2.changes b/autoyast2.changes index 036e51c..5005524 100644 --- a/autoyast2.changes +++ b/autoyast2.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Oct 12 15:07:07 CEST 2009 - ug@suse.de + +- wrapper call fixed to append a "b" in partition sizes +- 2.18.12 + +------------------------------------------------------------------- +Tue Oct 6 10:27:41 CEST 2009 - ug@suse.de + +- fix for "no filesystem found" when cloning + ------------------------------------------------------------------- Fri Oct 2 12:33:19 CEST 2009 - ug@suse.de diff --git a/autoyast2.spec b/autoyast2.spec index a2a5302..2c312d9 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -1,47 +1,41 @@ # -# spec file for package autoyast2 (Version 2.18.11) +# spec file for package autoyast2 (Version 2.18.12) # -# 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.12 +Release: 0 -Name: autoyast2 -Version: 2.18.11 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.18.11.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.12.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.11 -Release: 1 -Summary: YaST2 - Auto Installation Modules -Group: System/YaST +Version: 2.18.12 +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.11 +%setup -n autoyast2-2.18.12 %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 @@ -225,4 +240,5 @@ rm -rf "$RPM_BUILD_ROOT" %dir /var/adm/autoinstall/cache %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf -%changelog + + From 996884d193fe431962433a85e1e7341e726d413e37a6b254607bdacd2c10ff39 Mon Sep 17 00:00:00 2001 From: Uwe Gansert Date: Wed, 14 Oct 2009 10:30:52 +0000 Subject: [PATCH 2/4] 2.18.13 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=17 --- autoyast2-2.18.12.tar.bz2 | 3 --- autoyast2-2.18.13.tar.bz2 | 3 +++ autoyast2.changes | 16 ++++++++++++++++ autoyast2.spec | 10 +++++----- 4 files changed, 24 insertions(+), 8 deletions(-) delete mode 100644 autoyast2-2.18.12.tar.bz2 create mode 100644 autoyast2-2.18.13.tar.bz2 diff --git a/autoyast2-2.18.12.tar.bz2 b/autoyast2-2.18.12.tar.bz2 deleted file mode 100644 index 2a62038..0000000 --- a/autoyast2-2.18.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:024ec034367d470e4d223f4376fc88ad8140242f5c4dc0a999dbd5bbceb40fed -size 1206799 diff --git a/autoyast2-2.18.13.tar.bz2 b/autoyast2-2.18.13.tar.bz2 new file mode 100644 index 0000000..692ec92 --- /dev/null +++ b/autoyast2-2.18.13.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:303c29774ecde86fb745cdbe4dd3793a5540124071a3d420495c9e2c08c07b04 +size 1207675 diff --git a/autoyast2.changes b/autoyast2.changes index 5005524..bd5770c 100644 --- a/autoyast2.changes +++ b/autoyast2.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Oct 14 12:26:41 CEST 2009 - ug@suse.de + +- 2.18.13 + +------------------------------------------------------------------- +Tue Oct 13 15:35:20 CEST 2009 - ug@suse.de + +- accidently selected too many patterns to install + (bnc#529613) + +------------------------------------------------------------------- +Mon Oct 12 16:14:01 CEST 2009 - ug@suse.de + +- fix for "auto" in partition sizes + ------------------------------------------------------------------- Mon Oct 12 15:07:07 CEST 2009 - ug@suse.de diff --git a/autoyast2.spec b/autoyast2.spec index 2c312d9..00622dd 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -1,15 +1,15 @@ # -# spec file for package autoyast2 (Version 2.18.12) +# spec file for package autoyast2 (Version 2.18.13) # # norootforbuild Name: autoyast2 -Version: 2.18.12 +Version: 2.18.13 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.18.12.tar.bz2 +Source0: autoyast2-2.18.13.tar.bz2 prefix: /usr @@ -48,7 +48,7 @@ This file contains YaST2-independent files needed to create installation sources. %package installation -Version: 2.18.12 +Version: 2.18.13 Summary: YaST2 - Auto Installation Modules Group: System/YaST # API for Disabled Modules (ProductControl) @@ -63,7 +63,7 @@ This package performs auto-installation relying on a control file generated with the autoyast2 package. %prep -%setup -n autoyast2-2.18.12 +%setup -n autoyast2-2.18.13 %build %{prefix}/bin/y2tool y2autoconf From 34a1a60186e269e9cbdb63d1c7e7a370718161eb2c095272b178177a2febafa0 Mon Sep 17 00:00:00 2001 From: Uwe Gansert Date: Fri, 16 Oct 2009 10:31:36 +0000 Subject: [PATCH 3/4] 2.18.14 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=18 --- autoyast2-2.18.13.tar.bz2 | 3 --- autoyast2-2.18.14.tar.bz2 | 3 +++ autoyast2.changes | 15 +++++++++++++++ autoyast2.spec | 10 +++++----- 4 files changed, 23 insertions(+), 8 deletions(-) delete mode 100644 autoyast2-2.18.13.tar.bz2 create mode 100644 autoyast2-2.18.14.tar.bz2 diff --git a/autoyast2-2.18.13.tar.bz2 b/autoyast2-2.18.13.tar.bz2 deleted file mode 100644 index 692ec92..0000000 --- a/autoyast2-2.18.13.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:303c29774ecde86fb745cdbe4dd3793a5540124071a3d420495c9e2c08c07b04 -size 1207675 diff --git a/autoyast2-2.18.14.tar.bz2 b/autoyast2-2.18.14.tar.bz2 new file mode 100644 index 0000000..eac4d61 --- /dev/null +++ b/autoyast2-2.18.14.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94524e5f4d30e24d5be6335037a2827d181bc987066cd0e508d43cac12b6c337 +size 1206996 diff --git a/autoyast2.changes b/autoyast2.changes index bd5770c..643e414 100644 --- a/autoyast2.changes +++ b/autoyast2.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Oct 16 12:27:52 CEST 2009 - ug@suse.de + +- 2.18.14 + +------------------------------------------------------------------- +Thu Oct 15 16:20:07 CEST 2009 - ug@suse.de + +- fixed a blocked stage2 when using autoyast=slp + +------------------------------------------------------------------- +Thu Oct 15 10:36:48 CEST 2009 - ug@suse.de + +- possible endless loop for profiles on USB device fixed + ------------------------------------------------------------------- Wed Oct 14 12:26:41 CEST 2009 - ug@suse.de diff --git a/autoyast2.spec b/autoyast2.spec index 00622dd..f7784ab 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -1,15 +1,15 @@ # -# spec file for package autoyast2 (Version 2.18.13) +# spec file for package autoyast2 (Version 2.18.14) # # norootforbuild Name: autoyast2 -Version: 2.18.13 +Version: 2.18.14 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.18.13.tar.bz2 +Source0: autoyast2-2.18.14.tar.bz2 prefix: /usr @@ -48,7 +48,7 @@ This file contains YaST2-independent files needed to create installation sources. %package installation -Version: 2.18.13 +Version: 2.18.14 Summary: YaST2 - Auto Installation Modules Group: System/YaST # API for Disabled Modules (ProductControl) @@ -63,7 +63,7 @@ This package performs auto-installation relying on a control file generated with the autoyast2 package. %prep -%setup -n autoyast2-2.18.13 +%setup -n autoyast2-2.18.14 %build %{prefix}/bin/y2tool y2autoconf From 8bcc3a062b196edb993d36ff4f3c28246290be0b8e64b163d31de515a57e5b2c Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Oct 2009 21:46:54 +0000 Subject: [PATCH 4/4] checked in OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=19 --- autoyast2.spec | 112 +++++++++++++++++++++---------------------------- 1 file changed, 48 insertions(+), 64 deletions(-) diff --git a/autoyast2.spec b/autoyast2.spec index f7784ab..d74651e 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -1,41 +1,47 @@ # # spec file for package autoyast2 (Version 2.18.14) # +# 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.14 -Release: 0 - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.18.14.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.18.14 +Release: 1 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: autoyast2-2.18.14.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 # 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 - -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 @@ -48,16 +54,19 @@ This file contains YaST2-independent files needed to create installation sources. %package installation -Version: 2.18.14 -Summary: YaST2 - Auto Installation Modules -Group: System/YaST +License: GPL v2 or later +Version: 2.18.14 +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. @@ -69,10 +78,8 @@ generated with the autoyast2 package. %{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) @@ -89,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 @@ -102,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 @@ -117,7 +121,6 @@ rm -rf "$RPM_BUILD_ROOT" %post %{fillup_only -n autoinstall} - %files %defattr(-,root,root) %dir /etc/autoinstall @@ -128,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 @@ -141,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 @@ -151,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 @@ -176,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 @@ -194,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* @@ -215,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 @@ -230,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 @@ -240,5 +225,4 @@ rm -rf "$RPM_BUILD_ROOT" %dir /var/adm/autoinstall/cache %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf - - +%changelog