Accepting request 718460 from YaST:Head

submit new version 4.2.5

OBS-URL: https://build.opensuse.org/request/show/718460
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/autoyast2?expand=0&rev=259
This commit is contained in:
Dominique Leuenberger 2019-07-31 12:25:21 +00:00 committed by Git OBS Bridge
commit 3812da28cf
4 changed files with 113 additions and 71 deletions

View File

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

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9784dd0f9bea40a992b35c3e62e5b8128e2f10809d25acd85dd5bd3e98b76a9a
size 685074

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Thu Jul 18 15:05:10 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Use modern tar syntax
- Require fillup because it's executed in %post
-------------------------------------------------------------------
Thu Jul 18 14:49:00 UTC 2019 - Martin Vidner <mvidner@suse.com>
- Fixed an Internal Error when AutoYaST is importing users and
groups configuration (bsc#1140339).
- 4.2.5
-------------------------------------------------------------------
Wed Jul 3 09:55:40 CEST 2019 - schubi@suse.de
- Fixed new desktop file name (bsc#1138144).
- 4.2.4
-------------------------------------------------------------------
Mon Jun 17 13:33:11 UTC 2019 - José Iván López González <jlopez@suse.com>
- Always perform a storage re-probe after executing pre-scripts.
- Related to bsc#1133045
- 4.2.3
-------------------------------------------------------------------
Mon Jun 10 14:11:02 UTC 2019 - José Iván López González <jlopez@suse.com>
- Add multi-device Btrfs related elements to the partitioning
schema (part of jsc#SLE-3877).
- 4.2.2
-------------------------------------------------------------------
Fri May 31 12:26:24 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org>
- Add metainfo (fate#319035)
- Revamp spec
- Replace GenericName with Comment
- 4.2.1
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 29 11:34:37 UTC 2019 - Ladislav Slezák <lslezak@suse.cz> Mon Apr 29 11:34:37 UTC 2019 - Ladislav Slezák <lslezak@suse.cz>

View File

@ -18,19 +18,22 @@
#Compat macro for new _fillupdir macro introduced in Nov 2017 #Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir} %if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates %define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif %endif
Name: autoyast2 Name: autoyast2
Version: 4.2.0 Version: 4.2.5
Release: 0 Release: 0
Summary: YaST2 - Automated Installation
License: GPL-2.0-only
Group: System/YaST
Url: https://github.com/yast/yast-autoinstallation
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: autoyast2-%{version}.tar.bz2 Source0: autoyast2-%{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 >= 3.1.15 BuildRequires: yast2-devtools >= 4.2.2
# control.rng # control.rng
BuildRequires: yast2-installation-control BuildRequires: yast2-installation-control
# xmllint # xmllint
@ -50,7 +53,6 @@ BuildRequires: yast2-update >= 3.3.0
BuildRequires: yast2-xml BuildRequires: yast2-xml
# AutoinstIssues::NoProposal # AutoinstIssues::NoProposal
BuildRequires: yast2-storage-ng >= 4.0.160 BuildRequires: yast2-storage-ng >= 4.0.160
# %%{_unitdir} macro definition is in a separate package since 13.1 # %%{_unitdir} macro definition is in a separate package since 13.1
%if 0%{?suse_version} >= 1310 %if 0%{?suse_version} >= 1310
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
@ -72,23 +74,22 @@ Requires: yast2-security >= 4.1.1
Requires: yast2-transfer >= 2.21.0 Requires: yast2-transfer >= 2.21.0
Requires: yast2-xml Requires: yast2-xml
# AutoinstIssues::NoProposal # AutoinstIssues::NoProposal
Requires: yast2-ruby-bindings >= 1.0.0
Requires: yast2-storage-ng >= 4.0.160 Requires: yast2-storage-ng >= 4.0.160
Conflicts: yast2-installation < 3.1.166 Conflicts: yast2-installation < 3.1.166
Provides: yast2-config-autoinst Provides: yast2-config-autoinst
Provides: yast2-module-autoinst
Obsoletes: yast2-config-autoinst
Obsoletes: yast2-module-autoinst
Provides: yast2-lib-autoinst Provides: yast2-lib-autoinst
Provides: yast2-module-autoinst
Obsoletes: yast2-config-autoinst
Obsoletes: yast2-lib-autoinst Obsoletes: yast2-lib-autoinst
Obsoletes: yast2-module-autoinst
BuildArch: noarch BuildArch: noarch
Requires: yast2-ruby-bindings >= 1.0.0 Requires(post): %fillup_prereq
Summary: YaST2 - Automated Installation
License: GPL-2.0-only
Group: System/YaST
%description %description
This package is intended for management of the control files and the This package is intended for management of the control files and the
@ -101,11 +102,13 @@ This file contains YaST2-independent files needed to create
installation sources. installation sources.
%package installation %package installation
Requires: yast2-ruby-bindings >= 1.0.0
Summary: YaST2 - Auto Installation Modules Summary: YaST2 - Auto Installation Modules
# API for Disabled Modules (ProductControl)
Group: System/YaST Group: System/YaST
# Y2Storage::AutoinstIssues containing section information
BuildRequires: yast2-storage-ng >= 4.0.15
# API for Disabled Modules (ProductControl)
Requires: yast2 >= 2.16.36 Requires: yast2 >= 2.16.36
# After API cleanup # After API cleanup
Requires: yast2 Requires: yast2
@ -124,8 +127,8 @@ Requires: yast2-update >= 3.3.0
Requires: yast2-xml Requires: yast2-xml
# "transact_by" key in PkgPropertiesAll() # "transact_by" key in PkgPropertiesAll()
Requires: yast2-pkg-bindings >= 4.0.7 Requires: yast2-pkg-bindings >= 4.0.7
# Y2Storage::AutoinstIssues containing section information Requires: yast2-ruby-bindings >= 1.0.0
BuildRequires: yast2-storage-ng >= 4.0.15
Provides: yast2-trans-autoinst Provides: yast2-trans-autoinst
Obsoletes: yast2-trans-autoinst Obsoletes: yast2-trans-autoinst
@ -134,65 +137,64 @@ 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 -q
%build %build
%yast_build %yast_build
%install %install
%yast_install %yast_install
%yast_metainfo
# Do not *blindly* remove the suse_update_desktop_file calls here. It is # Do not *blindly* remove the suse_update_desktop_file calls here. It is
# different from the code in the yast_install macro. # different from the code in the yast_install macro.
for d in $RPM_BUILD_ROOT/usr/share/autoinstall/modules/*.desktop ; do for d in %{buildroot}%{_datadir}/autoinstall/modules/*.desktop ; do
%suse_update_desktop_file $d %suse_update_desktop_file $d
done done
# Class conf # Class conf
install -d -m 700 $RPM_BUILD_ROOT/etc/autoinstall install -d -m 700 %{buildroot}%{_sysconfdir}/autoinstall
# Installation files # Installation files
install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/scripts install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/scripts
install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/init.d install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/init.d
install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/logs install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/logs
install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/files install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/files
install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/cache install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/cache
# Repository # Repository
install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository
install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository/templates install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/templates
install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository/rules install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/rules
install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository/classes install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/classes
install -d $RPM_BUILD_ROOT/var/lib/autoinstall/autoconf install -d %{buildroot}%{_localstatedir}/lib/autoinstall/autoconf
install -d $RPM_BUILD_ROOT/var/lib/autoinstall/tmp install -d %{buildroot}%{_localstatedir}/lib/autoinstall/tmp
# Systemd Stuff # Systemd Stuff
mkdir -p $RPM_BUILD_ROOT/%{_unitdir}/ mkdir -p %{buildroot}%{_unitdir}/
install -m 644 scripts/autoyast-initscripts.service $RPM_BUILD_ROOT/%{_unitdir}/ install -m 644 scripts/autoyast-initscripts.service %{buildroot}%{_unitdir}/
# Documentation # Documentation
install -d -m 755 $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html install -d -m 755 %{buildroot}%{yast_docdir}/html
tar xvpfC %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html tar -xvpf %{SOURCE1} -C %{buildroot}%{yast_docdir}/html
mv $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast/* $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/ mv %{buildroot}%{yast_docdir}/html/autoyast/* %{buildroot}%{yast_docdir}/html/
rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast rmdir %{buildroot}%{yast_docdir}/html/autoyast
%post %post
%{fillup_only -n autoinstall} %{fillup_only -n autoinstall}
%files %files
%defattr(-,root,root) %dir %{_sysconfdir}/autoinstall
%dir /etc/autoinstall
%dir %{yast_yncludedir}/autoinstall %dir %{yast_yncludedir}/autoinstall
%dir /var/lib/autoinstall/repository %dir %{_localstatedir}/lib/autoinstall/repository
%dir /var/lib/autoinstall/repository/templates %dir %{_localstatedir}/lib/autoinstall/repository/templates
%dir /var/lib/autoinstall/repository/rules %dir %{_localstatedir}/lib/autoinstall/repository/rules
%dir /var/lib/autoinstall/repository/classes %dir %{_localstatedir}/lib/autoinstall/repository/classes
%dir /var/lib/autoinstall/tmp %dir %{_localstatedir}/lib/autoinstall/tmp
%doc %{_prefix}/share/doc/packages/autoyast2 %doc %{yast_docdir}
%dir %yast_desktopdir %{yast_desktopdir}
%{yast_desktopdir}/autoyast.desktop %{yast_metainfodir}
%{yast_desktopdir}/clone_system.desktop %{_datadir}/autoinstall/modules/*.desktop
/usr/share/autoinstall/modules/*.desktop
%dir %{yast_yncludedir} %dir %{yast_yncludedir}
%{yast_yncludedir}/autoinstall/classes.rb %{yast_yncludedir}/autoinstall/classes.rb
%{yast_yncludedir}/autoinstall/conftree.rb %{yast_yncludedir}/autoinstall/conftree.rb
@ -226,21 +228,20 @@ rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast
%{_fillupdir}/sysconfig.autoinstall %{_fillupdir}/sysconfig.autoinstall
%files installation %files installation
%defattr(-,root,root)
%dir %{yast_scrconfdir} %dir %{yast_scrconfdir}
%{yast_scrconfdir}/autoinstall.scr %{yast_scrconfdir}/autoinstall.scr
%{yast_scrconfdir}/cfg_autoinstall.scr %{yast_scrconfdir}/cfg_autoinstall.scr
# DTD files # DTD files
%dir /usr/share/autoinstall %dir %{_datadir}/autoinstall
#%dir /usr/share/autoinstall/dtd #%dir %{_datadir}/autoinstall/dtd
%dir /usr/share/autoinstall/modules %dir %{_datadir}/autoinstall/modules
#/usr/share/autoinstall/dtd/* #%{_datadir}/autoinstall/dtd/*
# systemd service file # systemd service file
%{_unitdir}/autoyast-initscripts.service %{_unitdir}/autoyast-initscripts.service
%dir /usr/share/autoinstall/xslt %dir %{_datadir}/autoinstall/xslt
/usr/share/autoinstall/xslt/merge.xslt %{_datadir}/autoinstall/xslt/merge.xslt
# config file # config file
%dir %{yast_moduledir} %dir %{yast_moduledir}
@ -310,18 +311,18 @@ rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast
%{yast_libdir}/autoinstall/autoinst_issues/*.rb %{yast_libdir}/autoinstall/autoinst_issues/*.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
%license COPYING %license COPYING
%dir /var/adm/autoinstall/ %dir %{_localstatedir}/adm/autoinstall/
%dir /var/adm/autoinstall/scripts %dir %{_localstatedir}/adm/autoinstall/scripts
%dir /var/adm/autoinstall/init.d %dir %{_localstatedir}/adm/autoinstall/init.d
%dir /var/adm/autoinstall/logs %dir %{_localstatedir}/adm/autoinstall/logs
%dir /var/adm/autoinstall/files %dir %{_localstatedir}/adm/autoinstall/files
%dir /var/adm/autoinstall/cache %dir %{_localstatedir}/adm/autoinstall/cache
%dir /var/lib/autoinstall %dir %{_localstatedir}/lib/autoinstall
%dir /var/lib/autoinstall/autoconf %dir %{_localstatedir}/lib/autoinstall/autoconf
%changelog %changelog