From 327316d47154b3a309fc9b813a7da93b6ebbf9226d5b1db2bac611cbbc959f58 Mon Sep 17 00:00:00 2001 From: YaST Team Bot Date: Thu, 17 Oct 2019 14:16:40 +0000 Subject: [PATCH] Updated to git ref d5aab0ac OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=849 --- autoyast2-4.2.11.tar.bz2 | 4 ++-- autoyast2.spec | 36 +++++------------------------------- 2 files changed, 7 insertions(+), 33 deletions(-) diff --git a/autoyast2-4.2.11.tar.bz2 b/autoyast2-4.2.11.tar.bz2 index 3df2644..6438d46 100644 --- a/autoyast2-4.2.11.tar.bz2 +++ b/autoyast2-4.2.11.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c583fe3bdc14452c97cca1b41c7917ecfbcbbade558128d8af2217c59a3c8865 -size 687080 +oid sha256:22adea19b71d61a9e83b29b710dc9fe0e26e43084f4bf33ed79d2bafcbeca2fd +size 685717 diff --git a/autoyast2.spec b/autoyast2.spec index 944dd20..ce5818f 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -59,6 +59,7 @@ BuildRequires: systemd-rpm-macros %else BuildRequires: systemd %endif +BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake) Requires: autoyast2-installation = %{version} Requires: libxslt @@ -140,8 +141,10 @@ generated with the autoyast2 package. %prep %setup -q +%check +%yast_check + %build -%yast_build %install %yast_install @@ -153,33 +156,6 @@ for d in %{buildroot}%{_datadir}/autoinstall/modules/*.desktop ; do %suse_update_desktop_file $d done -# Class conf -install -d -m 700 %{buildroot}%{_sysconfdir}/autoinstall -# Installation files -install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/scripts -install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/init.d -install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/logs -install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/files -install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/cache - -# Repository -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/templates -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/rules -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/classes -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/autoconf -install -d %{buildroot}%{_localstatedir}/lib/autoinstall/tmp - -# Systemd Stuff -mkdir -p %{buildroot}%{_unitdir}/ -install -m 644 scripts/autoyast-initscripts.service %{buildroot}%{_unitdir}/ - -# Documentation -install -d -m 755 %{buildroot}%{yast_docdir}/html -tar -xvpf %{SOURCE1} -C %{buildroot}%{yast_docdir}/html -mv %{buildroot}%{yast_docdir}/html/autoyast/* %{buildroot}%{yast_docdir}/html/ -rmdir %{buildroot}%{yast_docdir}/html/autoyast - %post %{fillup_only -n autoinstall} @@ -232,11 +208,9 @@ rmdir %{buildroot}%{yast_docdir}/html/autoyast %dir %{yast_scrconfdir} %{yast_scrconfdir}/autoinstall.scr %{yast_scrconfdir}/cfg_autoinstall.scr -# DTD files +# autoinstall modules %dir %{_datadir}/autoinstall -#%dir %{_datadir}/autoinstall/dtd %dir %{_datadir}/autoinstall/modules -#%{_datadir}/autoinstall/dtd/* # systemd service file %{_unitdir}/autoyast-initscripts.service