trigger service run

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=473
This commit is contained in:
Josef Reidinger 2013-10-16 09:03:10 +00:00 committed by Git OBS Bridge
parent 5f7d5332cb
commit 37df043153
4 changed files with 94 additions and 106 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21617099c95089da432b8fdef942b548159820953467dc278c69e00c41f24a8c
size 222871

3
autoyast2-3.1.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8f1c6205a28baadf86f62351fd4084d2a1077cfa740ad0d8dc491785b65b7d92
size 522446

View File

@ -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 Tue Oct 1 15:42:21 CEST 2013 - fehr@suse.de

View File

@ -17,15 +17,15 @@
Name: autoyast2 Name: autoyast2
Version: 3.0.7 Version: 3.1.0
Release: 0 Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: autoyast2-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Source1: autoyast_en_html.tar.bz2 Source1: autoyast_en_html.tar.bz2
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: yast2-devtools BuildRequires: yast2-devtools >= 3.0.6
# /usr/share/YaST2/control/control.rng # /usr/share/YaST2/control/control.rng
BuildRequires: yast2-installation BuildRequires: yast2-installation
# xmllint # xmllint
@ -38,7 +38,7 @@ Requires: yast2 >= 2.16.36
Requires: yast2-core Requires: yast2-core
Requires: yast2-country Requires: yast2-country
Requires: yast2-schema Requires: yast2-schema
Requires: yast2-storage >= 3.0.5 Requires: yast2-storage >= 3.0.2
Requires: yast2-transfer >= 2.21.0 Requires: yast2-transfer >= 2.21.0
Requires: yast2-xml Requires: yast2-xml
@ -96,28 +96,13 @@ This package performs auto-installation relying on a control file
generated with the autoyast2 package. generated with the autoyast2 package.
%prep %prep
%setup -n autoyast2-%{version} %setup -n %{name}-%{version}
%build %build
%{_prefix}/bin/y2tool y2autoconf %yast_build
%{_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
%install %install
make install DESTDIR="$RPM_BUILD_ROOT" %yast_install
[ -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 for d in `ls $RPM_BUILD_ROOT/usr/share/autoinstall/modules/*.desktop`; do
%suse_update_desktop_file $d %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}/ install -m 644 scripts/autoyast-initscripts.service $RPM_BUILD_ROOT/%{_unitdir}/
# Documentation # Documentation
install -d -m 755 $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html install -d -m 755 $RPM_BUILD_ROOT/%{yast_docdir}/html
tar xvpfC %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html tar xvpfC %{SOURCE1} $RPM_BUILD_ROOT/%{yast_docdir}/html
mv $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast/* $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/ mv $RPM_BUILD_ROOT/%{yast_docdir}/html/autoyast/* $RPM_BUILD_ROOT/%{yast_docdir}/html/
rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast rmdir $RPM_BUILD_ROOT/%{yast_docdir}/html/autoyast
%clean
rm -rf "$RPM_BUILD_ROOT"
%post %post
%{fillup_only -n autoinstall} %{fillup_only -n autoinstall}
@ -159,49 +141,48 @@ rm -rf "$RPM_BUILD_ROOT"
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%dir /etc/autoinstall %dir /etc/autoinstall
%dir /usr/share/YaST2/include/autoinstall %dir %{yast_yncludedir}/autoinstall
%dir /var/lib/autoinstall/repository %dir /var/lib/autoinstall/repository
%dir /var/lib/autoinstall/repository/templates %dir /var/lib/autoinstall/repository/templates
%dir /var/lib/autoinstall/repository/rules %dir /var/lib/autoinstall/repository/rules
%dir /var/lib/autoinstall/repository/classes %dir /var/lib/autoinstall/repository/classes
%dir /var/lib/autoinstall/tmp %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/autoinstall/modules/*.desktop
/usr/share/YaST2/include/autoinstall/classes.rb %{yast_yncludedir}/autoinstall/classes.rb
/usr/share/YaST2/include/autoinstall/conftree.rb %{yast_yncludedir}/autoinstall/conftree.rb
/usr/share/YaST2/include/autoinstall/dialogs.rb %{yast_yncludedir}/autoinstall/dialogs.rb
/usr/share/YaST2/include/autoinstall/script_dialogs.rb %{yast_yncludedir}/autoinstall/script_dialogs.rb
/usr/share/YaST2/include/autoinstall/general_dialogs.rb %{yast_yncludedir}/autoinstall/general_dialogs.rb
/usr/share/YaST2/include/autoinstall/wizards.rb %{yast_yncludedir}/autoinstall/wizards.rb
/usr/share/YaST2/include/autoinstall/helps.rb %{yast_yncludedir}/autoinstall/helps.rb
/usr/share/YaST2/schema/autoyast/rnc/*.rnc /usr/share/YaST2/schema/autoyast/rnc/*.rnc
/usr/share/YaST2/clients/general_auto.rb %{yast_clientdir}/general_auto.rb
/usr/share/YaST2/clients/report_auto.rb %{yast_clientdir}/report_auto.rb
/usr/share/YaST2/clients/classes_auto.rb %{yast_clientdir}/classes_auto.rb
/usr/share/YaST2/clients/scripts_auto.rb %{yast_clientdir}/scripts_auto.rb
/usr/share/YaST2/clients/software_auto.rb %{yast_clientdir}/software_auto.rb
/usr/share/YaST2/clients/storage_auto.rb %{yast_clientdir}/storage_auto.rb
/usr/share/YaST2/clients/autoyast.rb %{yast_clientdir}/autoyast.rb
/usr/share/YaST2/clients/clone_system.rb %{yast_clientdir}/clone_system.rb
/usr/share/YaST2/clients/ayast_setup.rb %{yast_clientdir}/ayast_setup.rb
/usr/share/YaST2/scrconf/ksimport.scr %{yast_scrconfdir}/ksimport.scr
/usr/share/YaST2/modules/AutoinstClass.rb %{yast_moduledir}/AutoinstClass.rb
/usr/share/YaST2/modules/Kickstart.rb %{yast_moduledir}/Kickstart.rb
/usr/lib/YaST2/servers_non_y2/ag_ksimport %{yast_agentdir}/ag_ksimport
# additional files # additional files
/var/adm/fillup-templates/sysconfig.autoinstall /var/adm/fillup-templates/sysconfig.autoinstall
%files installation %files installation
%defattr(-,root,root) %defattr(-,root,root)
/usr/share/YaST2/scrconf/autoinstall.scr %{yast_scrconfdir}/autoinstall.scr
/usr/share/YaST2/scrconf/cfg_autoinstall.scr %{yast_scrconfdir}/cfg_autoinstall.scr
# DTD files # DTD files
%dir /usr/share/autoinstall %dir /usr/share/autoinstall
#%dir /usr/share/autoinstall/dtd #%dir /usr/share/autoinstall/dtd
@ -215,62 +196,62 @@ rm -rf "$RPM_BUILD_ROOT"
/usr/share/autoinstall/xslt/merge.xslt /usr/share/autoinstall/xslt/merge.xslt
# config file # config file
/usr/share/YaST2/modules/AutoinstClone.rb %{yast_moduledir}/AutoinstClone.rb
%dir /usr/share/YaST2/include/autoinstall %dir %{yast_yncludedir}/autoinstall
/usr/share/YaST2/include/autoinstall/autopart.rb %{yast_yncludedir}/autoinstall/autopart.rb
/usr/share/YaST2/include/autoinstall/io.rb %{yast_yncludedir}/autoinstall/io.rb
/usr/share/YaST2/include/autoinstall/autoinst_dialogs.rb %{yast_yncludedir}/autoinstall/autoinst_dialogs.rb
/usr/share/YaST2/include/autoinstall/AdvancedPartitionDialog.rb %{yast_yncludedir}/autoinstall/AdvancedPartitionDialog.rb
/usr/share/YaST2/include/autoinstall/DriveDialog.rb %{yast_yncludedir}/autoinstall/DriveDialog.rb
/usr/share/YaST2/include/autoinstall/PartitionDialog.rb %{yast_yncludedir}/autoinstall/PartitionDialog.rb
/usr/share/YaST2/include/autoinstall/StorageDialog.rb %{yast_yncludedir}/autoinstall/StorageDialog.rb
/usr/share/YaST2/include/autoinstall/VolgroupDialog.rb %{yast_yncludedir}/autoinstall/VolgroupDialog.rb
/usr/share/YaST2/include/autoinstall/common.rb %{yast_yncludedir}/autoinstall/common.rb
/usr/share/YaST2/include/autoinstall/tree.rb %{yast_yncludedir}/autoinstall/tree.rb
/usr/share/YaST2/include/autoinstall/types.rb %{yast_yncludedir}/autoinstall/types.rb
/usr/share/YaST2/control/*.xml /usr/share/YaST2/control/*.xml
/usr/share/YaST2/modules/AutoInstall.rb %{yast_moduledir}/AutoInstall.rb
/usr/share/YaST2/modules/AutoinstScripts.rb %{yast_moduledir}/AutoinstScripts.rb
/usr/share/YaST2/modules/AutoinstGeneral.rb %{yast_moduledir}/AutoinstGeneral.rb
/usr/share/YaST2/modules/AutoinstImage.rb %{yast_moduledir}/AutoinstImage.rb
/usr/share/YaST2/modules/Y2ModuleConfig.rb %{yast_moduledir}/Y2ModuleConfig.rb
/usr/share/YaST2/modules/Profile.rb %{yast_moduledir}/Profile.rb
/usr/share/YaST2/modules/AutoinstFile.rb %{yast_moduledir}/AutoinstFile.rb
/usr/share/YaST2/modules/AutoinstConfig.rb %{yast_moduledir}/AutoinstConfig.rb
/usr/share/YaST2/modules/AutoinstSoftware.rb %{yast_moduledir}/AutoinstSoftware.rb
/usr/share/YaST2/modules/AutoinstLVM.rb %{yast_moduledir}/AutoinstLVM.rb
/usr/share/YaST2/modules/AutoinstRAID.rb %{yast_moduledir}/AutoinstRAID.rb
/usr/share/YaST2/modules/AutoinstStorage.rb %{yast_moduledir}/AutoinstStorage.rb
/usr/share/YaST2/modules/AutoInstallRules.rb %{yast_moduledir}/AutoInstallRules.rb
/usr/share/YaST2/modules/ProfileLocation.rb %{yast_moduledir}/ProfileLocation.rb
/usr/share/YaST2/modules/AutoinstCommon.rb %{yast_moduledir}/AutoinstCommon.rb
/usr/share/YaST2/modules/AutoinstDrive.rb %{yast_moduledir}/AutoinstDrive.rb
/usr/share/YaST2/modules/AutoinstPartPlan.rb %{yast_moduledir}/AutoinstPartPlan.rb
/usr/share/YaST2/modules/AutoinstPartition.rb %{yast_moduledir}/AutoinstPartition.rb
#clients #clients
/usr/share/YaST2/clients/inst_autoinit.rb %{yast_clientdir}/inst_autoinit.rb
/usr/share/YaST2/clients/inst_autoimage.rb %{yast_clientdir}/inst_autoimage.rb
/usr/share/YaST2/clients/inst_autosetup.rb %{yast_clientdir}/inst_autosetup.rb
/usr/share/YaST2/clients/inst_autoconfigure.rb %{yast_clientdir}/inst_autoconfigure.rb
/usr/share/YaST2/clients/inst_autopost.rb %{yast_clientdir}/inst_autopost.rb
/usr/share/YaST2/clients/files_auto.rb %{yast_clientdir}/files_auto.rb
/usr/share/YaST2/clients/autoinst_test_clone.rb %{yast_clientdir}/autoinst_test_clone.rb
/usr/share/YaST2/clients/autoinst_test_stage.rb %{yast_clientdir}/autoinst_test_stage.rb
/usr/share/YaST2/clients/autoinst_scripts1_finish.rb %{yast_clientdir}/autoinst_scripts1_finish.rb
/usr/share/YaST2/clients/autoinst_scripts2_finish.rb %{yast_clientdir}/autoinst_scripts2_finish.rb
/usr/share/YaST2/clients/ayast_probe.rb %{yast_clientdir}/ayast_probe.rb
/usr/share/YaST2/clients/inst_autosetup_upgrade.rb %{yast_clientdir}/inst_autosetup_upgrade.rb
/usr/share/YaST2/clients/inst_store_upgrade_software.rb %{yast_clientdir}/inst_store_upgrade_software.rb
/usr/share/YaST2/include/autoinstall/xml.rb %{yast_yncludedir}/autoinstall/xml.rb
/usr/share/YaST2/include/autoinstall/ask.rb %{yast_yncludedir}/autoinstall/ask.rb
# scripts # scripts
%{_prefix}/lib/YaST2/bin/fetch_image.sh %{yast_ybindir}/fetch_image.sh
%{_prefix}/lib/YaST2/bin/autoyast-initscripts.sh %{yast_ybindir}/autoyast-initscripts.sh
%dir /var/adm/autoinstall/ %dir /var/adm/autoinstall/
%dir /var/adm/autoinstall/scripts %dir /var/adm/autoinstall/scripts