Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2013-12-23 19:31:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2" Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2013-12-17 10:00:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2013-12-23 19:31:15.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Dec 18 15:05:02 UTC 2013 - [email protected] + +- control.rng has been moved to yast2-installation-control package +- 3.1.4 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.3.tar.bz2 New: ---- autoyast2-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.oJvhC1/_old 2013-12-23 19:31:15.000000000 +0100 +++ /var/tmp/diff_new_pack.oJvhC1/_new 2013-12-23 19:31:15.000000000 +0100 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -25,9 +25,9 @@ Source1: autoyast_en_html.tar.bz2 BuildRequires: update-desktop-files -BuildRequires: yast2-devtools >= 3.1.10 -# /usr/share/YaST2/control/control.rng -BuildRequires: yast2-installation +BuildRequires: yast2-devtools >= 3.1.15 +# control.rng +BuildRequires: yast2-installation-control # xmllint BuildRequires: libxml2-tools @@ -100,29 +100,10 @@ %setup -n autoyast2-%{version} %build -%{_prefix}/bin/y2tool y2autoconf -%{_prefix}/bin/y2tool y2automake -autoreconf --force --install - -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" - -./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} -# V=1: verbose build in case we used AM_SILENT_RULES(yes) -# so that RPM_OPT_FLAGS check works -make %{?jobs:-j%jobs} V=1 +%yast_build %install -make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do - 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 +%yast_install # Class conf install -d -m 700 $RPM_BUILD_ROOT/etc/autoinstall @@ -151,16 +132,13 @@ mv $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast/* $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/ rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast -%clean -rm -rf "$RPM_BUILD_ROOT" - %post %{fillup_only -n autoinstall} %files %defattr(-,root,root) %dir /etc/autoinstall -%dir /usr/share/YaST2/include/autoinstall +%dir %{yast_yncludedir}/autoinstall %dir /var/lib/autoinstall/repository %dir /var/lib/autoinstall/repository/templates %dir /var/lib/autoinstall/repository/rules @@ -168,32 +146,41 @@ %dir /var/lib/autoinstall/tmp %doc %{_prefix}/share/doc/packages/autoyast2 -%{_prefix}/share/applications/YaST2/autoyast.desktop +%dir %yast_desktopdir +%{yast_desktopdir}/autoyast.desktop /usr/share/autoinstall/modules/*.desktop -/usr/share/YaST2/include/autoinstall/classes.rb -/usr/share/YaST2/include/autoinstall/conftree.rb -/usr/share/YaST2/include/autoinstall/dialogs.rb -/usr/share/YaST2/include/autoinstall/script_dialogs.rb -/usr/share/YaST2/include/autoinstall/general_dialogs.rb -/usr/share/YaST2/include/autoinstall/wizards.rb -/usr/share/YaST2/include/autoinstall/helps.rb -/usr/share/YaST2/schema/autoyast/rnc/*.rnc - -/usr/share/YaST2/clients/general_auto.rb -/usr/share/YaST2/clients/report_auto.rb -/usr/share/YaST2/clients/classes_auto.rb -/usr/share/YaST2/clients/scripts_auto.rb -/usr/share/YaST2/clients/software_auto.rb -/usr/share/YaST2/clients/storage_auto.rb -/usr/share/YaST2/clients/autoyast.rb -/usr/share/YaST2/clients/clone_system.rb -/usr/share/YaST2/clients/ayast_setup.rb - -/usr/share/YaST2/scrconf/ksimport.scr - -/usr/share/YaST2/modules/AutoinstClass.rb -/usr/share/YaST2/modules/Kickstart.rb -/usr/lib/YaST2/servers_non_y2/ag_ksimport +%dir %{yast_yncludedir} +%{yast_yncludedir}/autoinstall/classes.rb +%{yast_yncludedir}/autoinstall/conftree.rb +%{yast_yncludedir}/autoinstall/dialogs.rb +%{yast_yncludedir}/autoinstall/script_dialogs.rb +%{yast_yncludedir}/autoinstall/general_dialogs.rb +%{yast_yncludedir}/autoinstall/wizards.rb +%{yast_yncludedir}/autoinstall/helps.rb +%dir %{yast_schemadir} +%dir %{yast_schemadir}/autoyast +%dir %{yast_schemadir}/autoyast/rnc +%{yast_schemadir}/autoyast/rnc/*.rnc + +%dir %{yast_clientdir} +%{yast_clientdir}/general_auto.rb +%{yast_clientdir}/report_auto.rb +%{yast_clientdir}/classes_auto.rb +%{yast_clientdir}/scripts_auto.rb +%{yast_clientdir}/software_auto.rb +%{yast_clientdir}/storage_auto.rb +%{yast_clientdir}/autoyast.rb +%{yast_clientdir}/clone_system.rb +%{yast_clientdir}/ayast_setup.rb + +%dir %{yast_scrconfdir} +%{yast_scrconfdir}/ksimport.scr + +%dir %{yast_moduledir} +%{yast_moduledir}/AutoinstClass.rb +%{yast_moduledir}/Kickstart.rb +%dir %{yast_agentdir} +%{yast_agentdir}/ag_ksimport # additional files @@ -201,8 +188,9 @@ %files installation %defattr(-,root,root) -/usr/share/YaST2/scrconf/autoinstall.scr -/usr/share/YaST2/scrconf/cfg_autoinstall.scr +%dir %{yast_scrconfdir} +%{yast_scrconfdir}/autoinstall.scr +%{yast_scrconfdir}/cfg_autoinstall.scr # DTD files %dir /usr/share/autoinstall #%dir /usr/share/autoinstall/dtd @@ -216,58 +204,59 @@ /usr/share/autoinstall/xslt/merge.xslt # config file -/usr/share/YaST2/modules/AutoinstClone.rb -%dir /usr/share/YaST2/include/autoinstall -/usr/share/YaST2/include/autoinstall/autopart.rb -/usr/share/YaST2/include/autoinstall/io.rb -/usr/share/YaST2/include/autoinstall/autoinst_dialogs.rb -/usr/share/YaST2/include/autoinstall/AdvancedPartitionDialog.rb -/usr/share/YaST2/include/autoinstall/DriveDialog.rb -/usr/share/YaST2/include/autoinstall/PartitionDialog.rb -/usr/share/YaST2/include/autoinstall/StorageDialog.rb -/usr/share/YaST2/include/autoinstall/VolgroupDialog.rb -/usr/share/YaST2/include/autoinstall/common.rb -/usr/share/YaST2/include/autoinstall/tree.rb -/usr/share/YaST2/include/autoinstall/types.rb - -/usr/share/YaST2/control/*.xml - -/usr/share/YaST2/modules/AutoInstall.rb -/usr/share/YaST2/modules/AutoinstScripts.rb -/usr/share/YaST2/modules/AutoinstGeneral.rb -/usr/share/YaST2/modules/AutoinstImage.rb -/usr/share/YaST2/modules/Y2ModuleConfig.rb -/usr/share/YaST2/modules/Profile.rb -/usr/share/YaST2/modules/AutoinstFile.rb -/usr/share/YaST2/modules/AutoinstConfig.rb -/usr/share/YaST2/modules/AutoinstSoftware.rb -/usr/share/YaST2/modules/AutoinstLVM.rb -/usr/share/YaST2/modules/AutoinstRAID.rb -/usr/share/YaST2/modules/AutoinstStorage.rb -/usr/share/YaST2/modules/AutoInstallRules.rb -/usr/share/YaST2/modules/ProfileLocation.rb -/usr/share/YaST2/modules/AutoinstCommon.rb -/usr/share/YaST2/modules/AutoinstDrive.rb -/usr/share/YaST2/modules/AutoinstPartPlan.rb -/usr/share/YaST2/modules/AutoinstPartition.rb +%dir %{yast_moduledir} +%{yast_moduledir}/AutoinstClone.rb +%dir %{yast_yncludedir}/autoinstall +%{yast_yncludedir}/autoinstall/autopart.rb +%{yast_yncludedir}/autoinstall/io.rb +%{yast_yncludedir}/autoinstall/autoinst_dialogs.rb +%{yast_yncludedir}/autoinstall/AdvancedPartitionDialog.rb +%{yast_yncludedir}/autoinstall/DriveDialog.rb +%{yast_yncludedir}/autoinstall/PartitionDialog.rb +%{yast_yncludedir}/autoinstall/StorageDialog.rb +%{yast_yncludedir}/autoinstall/VolgroupDialog.rb +%{yast_yncludedir}/autoinstall/common.rb +%{yast_yncludedir}/autoinstall/tree.rb +%{yast_yncludedir}/autoinstall/types.rb + +%{yast_controldir}/*.xml + +%{yast_moduledir}/AutoInstall.rb +%{yast_moduledir}/AutoinstScripts.rb +%{yast_moduledir}/AutoinstGeneral.rb +%{yast_moduledir}/AutoinstImage.rb +%{yast_moduledir}/Y2ModuleConfig.rb +%{yast_moduledir}/Profile.rb +%{yast_moduledir}/AutoinstFile.rb +%{yast_moduledir}/AutoinstConfig.rb +%{yast_moduledir}/AutoinstSoftware.rb +%{yast_moduledir}/AutoinstLVM.rb +%{yast_moduledir}/AutoinstRAID.rb +%{yast_moduledir}/AutoinstStorage.rb +%{yast_moduledir}/AutoInstallRules.rb +%{yast_moduledir}/ProfileLocation.rb +%{yast_moduledir}/AutoinstCommon.rb +%{yast_moduledir}/AutoinstDrive.rb +%{yast_moduledir}/AutoinstPartPlan.rb +%{yast_moduledir}/AutoinstPartition.rb #clients -/usr/share/YaST2/clients/inst_autoinit.rb -/usr/share/YaST2/clients/inst_autoimage.rb -/usr/share/YaST2/clients/inst_autosetup.rb -/usr/share/YaST2/clients/inst_autoconfigure.rb -/usr/share/YaST2/clients/inst_autopost.rb -/usr/share/YaST2/clients/files_auto.rb -/usr/share/YaST2/clients/autoinst_test_clone.rb -/usr/share/YaST2/clients/autoinst_test_stage.rb -/usr/share/YaST2/clients/autoinst_scripts1_finish.rb -/usr/share/YaST2/clients/autoinst_scripts2_finish.rb -/usr/share/YaST2/clients/ayast_probe.rb -/usr/share/YaST2/clients/inst_autosetup_upgrade.rb -/usr/share/YaST2/clients/inst_store_upgrade_software.rb +%{yast_clientdir}/inst_autoinit.rb +%{yast_clientdir}/inst_autoimage.rb +%{yast_clientdir}/inst_autosetup.rb +%{yast_clientdir}/inst_autoconfigure.rb +%{yast_clientdir}/inst_autopost.rb +%{yast_clientdir}/files_auto.rb +%{yast_clientdir}/autoinst_test_clone.rb +%{yast_clientdir}/autoinst_test_stage.rb +%{yast_clientdir}/autoinst_scripts1_finish.rb +%{yast_clientdir}/autoinst_scripts2_finish.rb +%{yast_clientdir}/ayast_probe.rb +%{yast_clientdir}/inst_autosetup_upgrade.rb +%{yast_clientdir}/inst_store_upgrade_software.rb -/usr/share/YaST2/include/autoinstall/xml.rb -/usr/share/YaST2/include/autoinstall/ask.rb +%{yast_yncludedir}/autoinstall/xml.rb +%{yast_yncludedir}/autoinstall/ask.rb # scripts %{_prefix}/lib/YaST2/bin/fetch_image.sh ++++++ autoyast2-3.1.3.tar.bz2 -> autoyast2-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.3/autoyast2.spec.in new/autoyast2-3.1.4/autoyast2.spec.in --- old/autoyast2-3.1.3/autoyast2.spec.in 2013-12-13 15:39:53.000000000 +0100 +++ new/autoyast2-3.1.4/autoyast2.spec.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,239 +0,0 @@ -@HEADER-COMMENT@ - -@HEADER@ -Group: System/YaST -License: GPL-2.0 -Source1: autoyast_en_html.tar.bz2 -BuildRequires: yast2-devtools update-desktop-files -# /usr/share/YaST2/control/control.rng -BuildRequires: yast2-installation -# xmllint -BuildRequires: libxml2-tools - -Requires: yast2 >= 2.16.36 -Requires: yast2-core yast2-xml libxslt -Requires: autoyast2-installation = %{version} -Requires: yast2-schema yast2 yast2-country -Requires: yast2-storage >= 3.0.5 -Requires: yast2-transfer >= 2.21.0 - -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 - -Requires: yast2-ruby-bindings >= 1.0.0 - -Summary: YaST2 - Automated Installation - -%description -This package is intended for management of the control files and the -AutoYaST2 configurations. This system should only be used by -experienced system administrators. Warning: AutoYaST2 performs the -installation without any user intervention, warnings, or confirmations -(unless specified otherwise in the control file). - -This file contains YaST2-independent files needed to create -installation sources. - -%package installation -Requires: yast2-ruby-bindings >= 1.0.0 - -Summary: YaST2 - Auto Installation Modules -Group: System/YaST -# API for Disabled Modules (ProductControl) -Requires: yast2 >= 2.16.36 -# After API cleanup -Requires: yast2-update >= 2.18.3 -Requires: yast2-xml yast2-core yast2 yast2-country yast2-packager yast2-storage yast2-slp yast2-bootloader yast2-ncurses -Requires: yast2-transfer >= 2.21.0 -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@ - -@BUILD@ - -@INSTALL@ -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 -install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/scripts -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 -install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository/rules -install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository/classes -install -d $RPM_BUILD_ROOT/var/lib/autoinstall/autoconf -install -d $RPM_BUILD_ROOT/var/lib/autoinstall/tmp - -# Systemd Stuff -mkdir -p $RPM_BUILD_ROOT/%{_unitdir}/ -install -m 644 scripts/autoyast-initscripts.service $RPM_BUILD_ROOT/%{_unitdir}/ - -# Documentation -install -d -m 755 $RPM_BUILD_ROOT/@docdir@/html -tar xvpfC %{SOURCE1} $RPM_BUILD_ROOT/@docdir@/html -mv $RPM_BUILD_ROOT/@docdir@/html/autoyast/* $RPM_BUILD_ROOT/@docdir@/html/ -rmdir $RPM_BUILD_ROOT/@docdir@/html/autoyast - -@CLEAN@ - -%post -%{fillup_only -n autoinstall} - - -%files -%defattr(-,root,root) -%dir /etc/autoinstall -%dir @yncludedir@/autoinstall -%dir /var/lib/autoinstall/repository -%dir /var/lib/autoinstall/repository/templates -%dir /var/lib/autoinstall/repository/rules -%dir /var/lib/autoinstall/repository/classes -%dir /var/lib/autoinstall/tmp -%doc @docdir@ - - -@desktopdir@/autoyast.desktop -/usr/share/autoinstall/modules/*.desktop -@yncludedir@/autoinstall/classes.rb -@yncludedir@/autoinstall/conftree.rb -@yncludedir@/autoinstall/dialogs.rb -@yncludedir@/autoinstall/script_dialogs.rb -@yncludedir@/autoinstall/general_dialogs.rb -@yncludedir@/autoinstall/wizards.rb -@yncludedir@/autoinstall/helps.rb -/usr/share/YaST2/schema/autoyast/rnc/*.rnc - -@clientdir@/general_auto.rb -@clientdir@/report_auto.rb -@clientdir@/classes_auto.rb -@clientdir@/scripts_auto.rb -@clientdir@/software_auto.rb -@clientdir@/storage_auto.rb -@clientdir@/autoyast.rb -@clientdir@/clone_system.rb -@clientdir@/ayast_setup.rb - -@scrconfdir@/ksimport.scr - - -@moduledir@/AutoinstClass.rb -@moduledir@/Kickstart.rb -@agentdir@/ag_ksimport - - - -# additional files - -@fillupdir@/sysconfig.autoinstall - -############################################################################ -############################################################################ -#### -#### installation -#### -############################################################################ -############################################################################ - -%files installation -%defattr(-,root,root) -@scrconfdir@/autoinstall.scr -@scrconfdir@/cfg_autoinstall.scr -# DTD files -%dir /usr/share/autoinstall -#%dir /usr/share/autoinstall/dtd -%dir /usr/share/autoinstall/modules -#/usr/share/autoinstall/dtd/* - -# systemd service file -%{_unitdir}/autoyast-initscripts.service - -%dir /usr/share/autoinstall/xslt -/usr/share/autoinstall/xslt/merge.xslt -# config file - -@moduledir@/AutoinstClone.rb -%dir @yncludedir@/autoinstall -@yncludedir@/autoinstall/autopart.rb -@yncludedir@/autoinstall/io.rb -@yncludedir@/autoinstall/autoinst_dialogs.rb -@yncludedir@/autoinstall/AdvancedPartitionDialog.rb -@yncludedir@/autoinstall/DriveDialog.rb -@yncludedir@/autoinstall/PartitionDialog.rb -@yncludedir@/autoinstall/StorageDialog.rb -@yncludedir@/autoinstall/VolgroupDialog.rb -@yncludedir@/autoinstall/common.rb -@yncludedir@/autoinstall/tree.rb -@yncludedir@/autoinstall/types.rb - -/usr/share/YaST2/control/*.xml - -@moduledir@/AutoInstall.rb -@moduledir@/AutoinstScripts.rb -@moduledir@/AutoinstGeneral.rb -@moduledir@/AutoinstImage.rb -@moduledir@/Y2ModuleConfig.rb -@moduledir@/Profile.rb -@moduledir@/AutoinstFile.rb -@moduledir@/AutoinstConfig.rb -@moduledir@/AutoinstSoftware.rb -@moduledir@/AutoinstLVM.rb -@moduledir@/AutoinstRAID.rb -@moduledir@/AutoinstStorage.rb -@moduledir@/AutoInstallRules.rb -@moduledir@/ProfileLocation.rb -@moduledir@/AutoinstCommon.rb -@moduledir@/AutoinstDrive.rb -@moduledir@/AutoinstPartPlan.rb -@moduledir@/AutoinstPartition.rb - -#clients -@clientdir@/inst_autoinit.rb -@clientdir@/inst_autoimage.rb -@clientdir@/inst_autosetup.rb -@clientdir@/inst_autoconfigure.rb -@clientdir@/inst_autopost.rb -@clientdir@/files_auto.rb -@clientdir@/autoinst_test_clone.rb -@clientdir@/autoinst_test_stage.rb -@clientdir@/autoinst_scripts1_finish.rb -@clientdir@/autoinst_scripts2_finish.rb -@clientdir@/ayast_probe.rb -@clientdir@/inst_autosetup_upgrade.rb -@clientdir@/inst_store_upgrade_software.rb - -@yncludedir@/autoinstall/xml.rb -@yncludedir@/autoinstall/ask.rb - -# scripts -@ybindir@/fetch_image.sh -@ybindir@/autoyast-initscripts.sh - -%dir /var/adm/autoinstall/ -%dir /var/adm/autoinstall/scripts -%dir /var/adm/autoinstall/init.d -%dir /var/adm/autoinstall/logs -%dir /var/adm/autoinstall/files -%dir /var/adm/autoinstall/cache -%dir /var/lib/autoinstall -%dir /var/lib/autoinstall/autoconf - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.3/package/autoyast2.changes new/autoyast2-3.1.4/package/autoyast2.changes --- old/autoyast2-3.1.3/package/autoyast2.changes 2013-12-13 15:39:53.000000000 +0100 +++ new/autoyast2-3.1.4/package/autoyast2.changes 2013-12-19 10:44:42.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 18 15:05:02 UTC 2013 - [email protected] + +- control.rng has been moved to yast2-installation-control package +- 3.1.4 + +------------------------------------------------------------------- Mon Dec 9 17:55:21 CET 2013 - [email protected] - Fix problem with reusing existing partitions (bnc#854439) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.3/package/autoyast2.spec new/autoyast2-3.1.4/package/autoyast2.spec --- old/autoyast2-3.1.3/package/autoyast2.spec 2013-12-13 15:39:53.000000000 +0100 +++ new/autoyast2-3.1.4/package/autoyast2.spec 2013-12-19 10:44:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package autoyast2 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -17,42 +17,47 @@ Name: autoyast2 -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: autoyast2-%{version}.tar.bz2 - -Group: System/YaST -License: GPL-2.0 Source1: autoyast_en_html.tar.bz2 -BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: update-desktop-files -# /usr/share/YaST2/control/control.rng -BuildRequires: yast2-installation +BuildRequires: yast2-devtools >= 3.1.15 +# control.rng +BuildRequires: yast2-installation-control # xmllint BuildRequires: libxml2-tools -Requires: yast2 >= 2.16.36 -Requires: yast2-core yast2-xml libxslt -Requires: autoyast2-installation = %{version} -Requires: yast2-schema yast2 yast2-country -Requires: yast2-storage >= 3.0.5 -Requires: yast2-transfer >= 2.21.0 - -Provides: yast2-module-autoinst yast2-config-autoinst -Obsoletes: yast2-module-autoinst yast2-config-autoinst -Provides: yast2-lib-autoinst -Obsoletes: yast2-lib-autoinst +Requires: autoyast2-installation = %{version} +Requires: libxslt +Requires: yast2 +Requires: yast2 >= 2.16.36 +Requires: yast2-core +Requires: yast2-country +Requires: yast2-schema +Requires: yast2-storage >= 3.0.5 +Requires: yast2-transfer >= 2.21.0 +Requires: yast2-xml + +Provides: yast2-config-autoinst +Provides: yast2-module-autoinst +Obsoletes: yast2-config-autoinst +Obsoletes: yast2-module-autoinst +Provides: yast2-lib-autoinst +Obsoletes: yast2-lib-autoinst -PreReq: %insserv_prereq %fillup_prereq +PreReq: %insserv_prereq %fillup_prereq -BuildArchitectures: noarch +BuildArch: noarch Requires: yast2-ruby-bindings >= 1.0.0 -Summary: YaST2 - Automated Installation +Summary: YaST2 - Automated Installation +License: GPL-2.0 +Group: System/YaST %description This package is intended for management of the control files and the @@ -67,17 +72,26 @@ %package installation Requires: yast2-ruby-bindings >= 1.0.0 -Summary: YaST2 - Auto Installation Modules -Group: System/YaST +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-packager yast2-storage yast2-slp yast2-bootloader yast2-ncurses -Requires: yast2-services-manager -Requires: yast2-transfer >= 2.21.0 -Provides: yast2-trans-autoinst -Obsoletes: yast2-trans-autoinst +Requires: yast2 +Requires: yast2-bootloader +Requires: yast2-core +Requires: yast2-country +Requires: yast2-ncurses +Requires: yast2-packager +Requires: yast2-services-manager +Requires: yast2-slp +Requires: yast2-storage +Requires: yast2-transfer >= 2.21.0 +Requires: yast2-update >= 2.18.3 +Requires: yast2-xml +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. @@ -86,29 +100,10 @@ %setup -n autoyast2-%{version} %build -%{_prefix}/bin/y2tool y2autoconf -%{_prefix}/bin/y2tool y2automake -autoreconf --force --install - -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" - -./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} -# V=1: verbose build in case we used AM_SILENT_RULES(yes) -# so that RPM_OPT_FLAGS check works -make %{?jobs:-j%jobs} V=1 +%yast_build %install -make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do - 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 +%yast_install # Class conf install -d -m 700 $RPM_BUILD_ROOT/etc/autoinstall @@ -137,17 +132,13 @@ mv $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast/* $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/ rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast -%clean -rm -rf "$RPM_BUILD_ROOT" - %post %{fillup_only -n autoinstall} - %files %defattr(-,root,root) %dir /etc/autoinstall -%dir /usr/share/YaST2/include/autoinstall +%dir %{yast_yncludedir}/autoinstall %dir /var/lib/autoinstall/repository %dir /var/lib/autoinstall/repository/templates %dir /var/lib/autoinstall/repository/rules @@ -155,46 +146,51 @@ %dir /var/lib/autoinstall/tmp %doc %{_prefix}/share/doc/packages/autoyast2 - -%{_prefix}/share/applications/YaST2/autoyast.desktop +%dir %yast_desktopdir +%{yast_desktopdir}/autoyast.desktop /usr/share/autoinstall/modules/*.desktop -/usr/share/YaST2/include/autoinstall/classes.rb -/usr/share/YaST2/include/autoinstall/conftree.rb -/usr/share/YaST2/include/autoinstall/dialogs.rb -/usr/share/YaST2/include/autoinstall/script_dialogs.rb -/usr/share/YaST2/include/autoinstall/general_dialogs.rb -/usr/share/YaST2/include/autoinstall/wizards.rb -/usr/share/YaST2/include/autoinstall/helps.rb -/usr/share/YaST2/schema/autoyast/rnc/*.rnc - -/usr/share/YaST2/clients/general_auto.rb -/usr/share/YaST2/clients/report_auto.rb -/usr/share/YaST2/clients/classes_auto.rb -/usr/share/YaST2/clients/scripts_auto.rb -/usr/share/YaST2/clients/software_auto.rb -/usr/share/YaST2/clients/storage_auto.rb -/usr/share/YaST2/clients/autoyast.rb -/usr/share/YaST2/clients/clone_system.rb -/usr/share/YaST2/clients/ayast_setup.rb - -/usr/share/YaST2/scrconf/ksimport.scr - - -/usr/share/YaST2/modules/AutoinstClass.rb -/usr/share/YaST2/modules/Kickstart.rb -/usr/lib/YaST2/servers_non_y2/ag_ksimport - - +%dir %{yast_yncludedir} +%{yast_yncludedir}/autoinstall/classes.rb +%{yast_yncludedir}/autoinstall/conftree.rb +%{yast_yncludedir}/autoinstall/dialogs.rb +%{yast_yncludedir}/autoinstall/script_dialogs.rb +%{yast_yncludedir}/autoinstall/general_dialogs.rb +%{yast_yncludedir}/autoinstall/wizards.rb +%{yast_yncludedir}/autoinstall/helps.rb +%dir %{yast_schemadir} +%dir %{yast_schemadir}/autoyast +%dir %{yast_schemadir}/autoyast/rnc +%{yast_schemadir}/autoyast/rnc/*.rnc + +%dir %{yast_clientdir} +%{yast_clientdir}/general_auto.rb +%{yast_clientdir}/report_auto.rb +%{yast_clientdir}/classes_auto.rb +%{yast_clientdir}/scripts_auto.rb +%{yast_clientdir}/software_auto.rb +%{yast_clientdir}/storage_auto.rb +%{yast_clientdir}/autoyast.rb +%{yast_clientdir}/clone_system.rb +%{yast_clientdir}/ayast_setup.rb + +%dir %{yast_scrconfdir} +%{yast_scrconfdir}/ksimport.scr + +%dir %{yast_moduledir} +%{yast_moduledir}/AutoinstClass.rb +%{yast_moduledir}/Kickstart.rb +%dir %{yast_agentdir} +%{yast_agentdir}/ag_ksimport # additional files /var/adm/fillup-templates/sysconfig.autoinstall - %files installation %defattr(-,root,root) -/usr/share/YaST2/scrconf/autoinstall.scr -/usr/share/YaST2/scrconf/cfg_autoinstall.scr +%dir %{yast_scrconfdir} +%{yast_scrconfdir}/autoinstall.scr +%{yast_scrconfdir}/cfg_autoinstall.scr # DTD files %dir /usr/share/autoinstall #%dir /usr/share/autoinstall/dtd @@ -208,58 +204,59 @@ /usr/share/autoinstall/xslt/merge.xslt # config file -/usr/share/YaST2/modules/AutoinstClone.rb -%dir /usr/share/YaST2/include/autoinstall -/usr/share/YaST2/include/autoinstall/autopart.rb -/usr/share/YaST2/include/autoinstall/io.rb -/usr/share/YaST2/include/autoinstall/autoinst_dialogs.rb -/usr/share/YaST2/include/autoinstall/AdvancedPartitionDialog.rb -/usr/share/YaST2/include/autoinstall/DriveDialog.rb -/usr/share/YaST2/include/autoinstall/PartitionDialog.rb -/usr/share/YaST2/include/autoinstall/StorageDialog.rb -/usr/share/YaST2/include/autoinstall/VolgroupDialog.rb -/usr/share/YaST2/include/autoinstall/common.rb -/usr/share/YaST2/include/autoinstall/tree.rb -/usr/share/YaST2/include/autoinstall/types.rb - -/usr/share/YaST2/control/*.xml - -/usr/share/YaST2/modules/AutoInstall.rb -/usr/share/YaST2/modules/AutoinstScripts.rb -/usr/share/YaST2/modules/AutoinstGeneral.rb -/usr/share/YaST2/modules/AutoinstImage.rb -/usr/share/YaST2/modules/Y2ModuleConfig.rb -/usr/share/YaST2/modules/Profile.rb -/usr/share/YaST2/modules/AutoinstFile.rb -/usr/share/YaST2/modules/AutoinstConfig.rb -/usr/share/YaST2/modules/AutoinstSoftware.rb -/usr/share/YaST2/modules/AutoinstLVM.rb -/usr/share/YaST2/modules/AutoinstRAID.rb -/usr/share/YaST2/modules/AutoinstStorage.rb -/usr/share/YaST2/modules/AutoInstallRules.rb -/usr/share/YaST2/modules/ProfileLocation.rb -/usr/share/YaST2/modules/AutoinstCommon.rb -/usr/share/YaST2/modules/AutoinstDrive.rb -/usr/share/YaST2/modules/AutoinstPartPlan.rb -/usr/share/YaST2/modules/AutoinstPartition.rb +%dir %{yast_moduledir} +%{yast_moduledir}/AutoinstClone.rb +%dir %{yast_yncludedir}/autoinstall +%{yast_yncludedir}/autoinstall/autopart.rb +%{yast_yncludedir}/autoinstall/io.rb +%{yast_yncludedir}/autoinstall/autoinst_dialogs.rb +%{yast_yncludedir}/autoinstall/AdvancedPartitionDialog.rb +%{yast_yncludedir}/autoinstall/DriveDialog.rb +%{yast_yncludedir}/autoinstall/PartitionDialog.rb +%{yast_yncludedir}/autoinstall/StorageDialog.rb +%{yast_yncludedir}/autoinstall/VolgroupDialog.rb +%{yast_yncludedir}/autoinstall/common.rb +%{yast_yncludedir}/autoinstall/tree.rb +%{yast_yncludedir}/autoinstall/types.rb + +%{yast_controldir}/*.xml + +%{yast_moduledir}/AutoInstall.rb +%{yast_moduledir}/AutoinstScripts.rb +%{yast_moduledir}/AutoinstGeneral.rb +%{yast_moduledir}/AutoinstImage.rb +%{yast_moduledir}/Y2ModuleConfig.rb +%{yast_moduledir}/Profile.rb +%{yast_moduledir}/AutoinstFile.rb +%{yast_moduledir}/AutoinstConfig.rb +%{yast_moduledir}/AutoinstSoftware.rb +%{yast_moduledir}/AutoinstLVM.rb +%{yast_moduledir}/AutoinstRAID.rb +%{yast_moduledir}/AutoinstStorage.rb +%{yast_moduledir}/AutoInstallRules.rb +%{yast_moduledir}/ProfileLocation.rb +%{yast_moduledir}/AutoinstCommon.rb +%{yast_moduledir}/AutoinstDrive.rb +%{yast_moduledir}/AutoinstPartPlan.rb +%{yast_moduledir}/AutoinstPartition.rb #clients -/usr/share/YaST2/clients/inst_autoinit.rb -/usr/share/YaST2/clients/inst_autoimage.rb -/usr/share/YaST2/clients/inst_autosetup.rb -/usr/share/YaST2/clients/inst_autoconfigure.rb -/usr/share/YaST2/clients/inst_autopost.rb -/usr/share/YaST2/clients/files_auto.rb -/usr/share/YaST2/clients/autoinst_test_clone.rb -/usr/share/YaST2/clients/autoinst_test_stage.rb -/usr/share/YaST2/clients/autoinst_scripts1_finish.rb -/usr/share/YaST2/clients/autoinst_scripts2_finish.rb -/usr/share/YaST2/clients/ayast_probe.rb -/usr/share/YaST2/clients/inst_autosetup_upgrade.rb -/usr/share/YaST2/clients/inst_store_upgrade_software.rb +%{yast_clientdir}/inst_autoinit.rb +%{yast_clientdir}/inst_autoimage.rb +%{yast_clientdir}/inst_autosetup.rb +%{yast_clientdir}/inst_autoconfigure.rb +%{yast_clientdir}/inst_autopost.rb +%{yast_clientdir}/files_auto.rb +%{yast_clientdir}/autoinst_test_clone.rb +%{yast_clientdir}/autoinst_test_stage.rb +%{yast_clientdir}/autoinst_scripts1_finish.rb +%{yast_clientdir}/autoinst_scripts2_finish.rb +%{yast_clientdir}/ayast_probe.rb +%{yast_clientdir}/inst_autosetup_upgrade.rb +%{yast_clientdir}/inst_store_upgrade_software.rb -/usr/share/YaST2/include/autoinstall/xml.rb -/usr/share/YaST2/include/autoinstall/ask.rb +%{yast_yncludedir}/autoinstall/xml.rb +%{yast_yncludedir}/autoinstall/ask.rb # scripts %{_prefix}/lib/YaST2/bin/fetch_image.sh @@ -274,4 +271,4 @@ %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf - +%changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
