From 37df043153c295f17cbb4b5034c9cc242e90928ff52e5d052da201cdd8292669 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 16 Oct 2013 09:03:10 +0000 Subject: [PATCH] trigger service run OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=473 --- autoyast2-3.0.7.tar.bz2 | 3 - autoyast2-3.1.0.tar.bz2 | 3 + autoyast2.changes | 7 ++ autoyast2.spec | 187 ++++++++++++++++++---------------------- 4 files changed, 94 insertions(+), 106 deletions(-) delete mode 100644 autoyast2-3.0.7.tar.bz2 create mode 100644 autoyast2-3.1.0.tar.bz2 diff --git a/autoyast2-3.0.7.tar.bz2 b/autoyast2-3.0.7.tar.bz2 deleted file mode 100644 index aed2e70..0000000 --- a/autoyast2-3.0.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21617099c95089da432b8fdef942b548159820953467dc278c69e00c41f24a8c -size 222871 diff --git a/autoyast2-3.1.0.tar.bz2 b/autoyast2-3.1.0.tar.bz2 new file mode 100644 index 0000000..ca9fb0d --- /dev/null +++ b/autoyast2-3.1.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f1c6205a28baadf86f62351fd4084d2a1077cfa740ad0d8dc491785b65b7d92 +size 522446 diff --git a/autoyast2.changes b/autoyast2.changes index 4c083d2..44cfdbb 100644 --- a/autoyast2.changes +++ b/autoyast2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 2 11:20:50 UTC 2013 - lslezak@suse.cz + +- do not use *.spec.in template, use *.spec file with RPM macros + instead +- 3.1.0 + ------------------------------------------------------------------- Tue Oct 1 15:42:21 CEST 2013 - fehr@suse.de diff --git a/autoyast2.spec b/autoyast2.spec index 39e27db..803ce79 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -17,15 +17,15 @@ Name: autoyast2 -Version: 3.0.7 +Version: 3.1.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 Source1: autoyast_en_html.tar.bz2 BuildRequires: update-desktop-files -BuildRequires: yast2-devtools +BuildRequires: yast2-devtools >= 3.0.6 # /usr/share/YaST2/control/control.rng BuildRequires: yast2-installation # xmllint @@ -38,7 +38,7 @@ Requires: yast2 >= 2.16.36 Requires: yast2-core Requires: yast2-country Requires: yast2-schema -Requires: yast2-storage >= 3.0.5 +Requires: yast2-storage >= 3.0.2 Requires: yast2-transfer >= 2.21.0 Requires: yast2-xml @@ -96,28 +96,13 @@ This package performs auto-installation relying on a control file generated with the autoyast2 package. %prep -%setup -n autoyast2-%{version} +%setup -n %{name}-%{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 +%yast_install for d in `ls $RPM_BUILD_ROOT/usr/share/autoinstall/modules/*.desktop`; do %suse_update_desktop_file $d @@ -145,13 +130,10 @@ 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/%{_prefix}/share/doc/packages/autoyast2/html -tar xvpfC %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html -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" +install -d -m 755 $RPM_BUILD_ROOT/%{yast_docdir}/html +tar xvpfC %{SOURCE1} $RPM_BUILD_ROOT/%{yast_docdir}/html +mv $RPM_BUILD_ROOT/%{yast_docdir}/html/autoyast/* $RPM_BUILD_ROOT/%{yast_docdir}/html/ +rmdir $RPM_BUILD_ROOT/%{yast_docdir}/html/autoyast %post %{fillup_only -n autoinstall} @@ -159,49 +141,48 @@ rm -rf "$RPM_BUILD_ROOT" %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 %dir /var/lib/autoinstall/repository/classes %dir /var/lib/autoinstall/tmp -%doc %{_prefix}/share/doc/packages/autoyast2 +%doc %{yast_docdir} -%{_prefix}/share/applications/YaST2/autoyast.desktop +%{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 +%{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 /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 +%{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 -/usr/share/YaST2/scrconf/ksimport.scr +%{yast_scrconfdir}/ksimport.scr -/usr/share/YaST2/modules/AutoinstClass.rb -/usr/share/YaST2/modules/Kickstart.rb -/usr/lib/YaST2/servers_non_y2/ag_ksimport +%{yast_moduledir}/AutoinstClass.rb +%{yast_moduledir}/Kickstart.rb +%{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 +%{yast_scrconfdir}/autoinstall.scr +%{yast_scrconfdir}/cfg_autoinstall.scr # DTD files %dir /usr/share/autoinstall #%dir /usr/share/autoinstall/dtd @@ -215,62 +196,62 @@ rm -rf "$RPM_BUILD_ROOT" /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 +%{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 /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 +%{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 -%{_prefix}/lib/YaST2/bin/autoyast-initscripts.sh +%{yast_ybindir}/fetch_image.sh +%{yast_ybindir}/autoyast-initscripts.sh %dir /var/adm/autoinstall/ %dir /var/adm/autoinstall/scripts