- Add metainfo (fate#319035)

- Revamp spec
- Replace GenericName with Comment
- 4.2.1

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=835
This commit is contained in:
YaST Team Bot 2019-06-03 15:12:26 +00:00 committed by Git OBS Bridge
parent 0ba592a8c7
commit cb3d8e909e
4 changed files with 79 additions and 72 deletions

View File

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

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

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

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
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>

View File

@ -18,19 +18,22 @@
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: autoyast2
Version: 4.2.0
Version: 4.2.1
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
Source1: autoyast_en_html.tar.bz2
BuildRequires: update-desktop-files
BuildRequires: yast2-devtools >= 3.1.15
BuildRequires: yast2-devtools >= 4.2.2
# control.rng
BuildRequires: yast2-installation-control
# xmllint
@ -50,7 +53,6 @@ BuildRequires: yast2-update >= 3.3.0
BuildRequires: yast2-xml
# AutoinstIssues::NoProposal
BuildRequires: yast2-storage-ng >= 4.0.160
# %%{_unitdir} macro definition is in a separate package since 13.1
%if 0%{?suse_version} >= 1310
BuildRequires: systemd-rpm-macros
@ -72,24 +74,21 @@ Requires: yast2-security >= 4.1.1
Requires: yast2-transfer >= 2.21.0
Requires: yast2-xml
# AutoinstIssues::NoProposal
Requires: yast2-ruby-bindings >= 1.0.0
Requires: yast2-storage-ng >= 4.0.160
Conflicts: yast2-installation < 3.1.166
Provides: yast2-config-autoinst
Provides: yast2-module-autoinst
Obsoletes: yast2-config-autoinst
Obsoletes: yast2-module-autoinst
Provides: yast2-lib-autoinst
Provides: yast2-module-autoinst
Obsoletes: yast2-config-autoinst
Obsoletes: yast2-lib-autoinst
Obsoletes: yast2-module-autoinst
BuildArch: noarch
Requires: yast2-ruby-bindings >= 1.0.0
Summary: YaST2 - Automated Installation
License: GPL-2.0-only
Group: System/YaST
%description
This package is intended for management of the control files and the
AutoYaST2 configurations. This system should only be used by
@ -101,11 +100,13 @@ 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
# API for Disabled Modules (ProductControl)
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
# After API cleanup
Requires: yast2
@ -124,8 +125,8 @@ Requires: yast2-update >= 3.3.0
Requires: yast2-xml
# "transact_by" key in PkgPropertiesAll()
Requires: yast2-pkg-bindings >= 4.0.7
# Y2Storage::AutoinstIssues containing section information
BuildRequires: yast2-storage-ng >= 4.0.15
Requires: yast2-ruby-bindings >= 1.0.0
Provides: yast2-trans-autoinst
Obsoletes: yast2-trans-autoinst
@ -134,65 +135,64 @@ This package performs auto-installation relying on a control file
generated with the autoyast2 package.
%prep
%setup -n autoyast2-%{version}
%setup -q
%build
%yast_build
%install
%yast_install
%yast_metainfo
# Do not *blindly* remove the suse_update_desktop_file calls here. It is
# 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
done
# Class conf
install -d -m 700 $RPM_BUILD_ROOT/etc/autoinstall
install -d -m 700 %{buildroot}%{_sysconfdir}/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
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 $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
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 $RPM_BUILD_ROOT/%{_unitdir}/
install -m 644 scripts/autoyast-initscripts.service $RPM_BUILD_ROOT/%{_unitdir}/
mkdir -p %{buildroot}%{_unitdir}/
install -m 644 scripts/autoyast-initscripts.service %{buildroot}%{_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
install -d -m 755 %{buildroot}%{yast_docdir}/html
tar xvpfC %{SOURCE1} %{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}
%files
%defattr(-,root,root)
%dir /etc/autoinstall
%dir %{_sysconfdir}/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
%dir %{_localstatedir}/lib/autoinstall/repository
%dir %{_localstatedir}/lib/autoinstall/repository/templates
%dir %{_localstatedir}/lib/autoinstall/repository/rules
%dir %{_localstatedir}/lib/autoinstall/repository/classes
%dir %{_localstatedir}/lib/autoinstall/tmp
%doc %{yast_docdir}
%dir %yast_desktopdir
%{yast_desktopdir}/autoyast.desktop
%{yast_desktopdir}/clone_system.desktop
/usr/share/autoinstall/modules/*.desktop
%{yast_desktopdir}
%{yast_metainfodir}
%{_datadir}/autoinstall/modules/*.desktop
%dir %{yast_yncludedir}
%{yast_yncludedir}/autoinstall/classes.rb
%{yast_yncludedir}/autoinstall/conftree.rb
@ -226,21 +226,20 @@ rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast
%{_fillupdir}/sysconfig.autoinstall
%files installation
%defattr(-,root,root)
%dir %{yast_scrconfdir}
%{yast_scrconfdir}/autoinstall.scr
%{yast_scrconfdir}/cfg_autoinstall.scr
# DTD files
%dir /usr/share/autoinstall
#%dir /usr/share/autoinstall/dtd
%dir /usr/share/autoinstall/modules
#/usr/share/autoinstall/dtd/*
%dir %{_datadir}/autoinstall
#%dir %{_datadir}/autoinstall/dtd
%dir %{_datadir}/autoinstall/modules
#%{_datadir}/autoinstall/dtd/*
# systemd service file
%{_unitdir}/autoyast-initscripts.service
%dir /usr/share/autoinstall/xslt
/usr/share/autoinstall/xslt/merge.xslt
%dir %{_datadir}/autoinstall/xslt
%{_datadir}/autoinstall/xslt/merge.xslt
# config file
%dir %{yast_moduledir}
@ -310,18 +309,18 @@ rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast
%{yast_libdir}/autoinstall/autoinst_issues/*.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
%license COPYING
%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
%dir %{_localstatedir}/adm/autoinstall/
%dir %{_localstatedir}/adm/autoinstall/scripts
%dir %{_localstatedir}/adm/autoinstall/init.d
%dir %{_localstatedir}/adm/autoinstall/logs
%dir %{_localstatedir}/adm/autoinstall/files
%dir %{_localstatedir}/adm/autoinstall/cache
%dir %{_localstatedir}/lib/autoinstall
%dir %{_localstatedir}/lib/autoinstall/autoconf
%changelog