Accepting request 87346 from YaST:Head
OBS-URL: https://build.opensuse.org/request/show/87346 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-installation?expand=0&rev=221
This commit is contained in:
Lars Vogdt
Git OBS Bridge
commit
7f0010a489
@ -2,15 +2,12 @@
|
||||
Description=YaST2 Firstboot
|
||||
After=apparmor.service local-fs.target YaST2-Second-Stage.service
|
||||
Before=getty@tty1.service xdm.service
|
||||
ConditionPathExists=|/var/lib/YaST2/reconfig_system
|
||||
ConditionPathExists=|/run/systemd/keep_running
|
||||
ConditionPathExists=/var/lib/YaST2/reconfig_system
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStartPre=/bin/touch /run/systemd/keep_running
|
||||
ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot
|
||||
ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system
|
||||
ExecStartPost=/bin/rm -f /run/systemd/keep_running
|
||||
TimeoutSec=0
|
||||
RemainAfterExit=true
|
||||
|
||||
|
||||
@ -2,17 +2,14 @@
|
||||
Description=YaST2 Second Stage
|
||||
After=apparmor.service local-fs.target
|
||||
Before=getty@tty1.service xdm.service
|
||||
ConditionPathExists=|/var/lib/YaST2/runme_at_boot
|
||||
ConditionPathExists=|/run/systemd/keep_running
|
||||
ConditionPathExists=/var/lib/YaST2/runme_at_boot
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/bin/touch /run/systemd/keep_running
|
||||
ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
|
||||
RemainAfterExit=yes
|
||||
TimeoutSec=0
|
||||
ExecStartPost=/bin/rm -f /var/lib/YaST2/runme_at_boot
|
||||
ExecStartPost=/bin/rm -f /run/systemd/keep_running
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:94f7ab24b9b8eb198af2375b2f5c0aa427f12762c9c715befe96ea40004a6337
|
||||
size 301490
|
||||
3
yast2-installation-2.21.23.tar.bz2
Normal file
3
yast2-installation-2.21.23.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:04b88bc90944d75eb3b9af5f07c0a28f98f8055e08714eada7edc316acf7c72b
|
||||
size 284390
|
||||
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 11 08:52:43 CEST 2011 - jsuchome@suse.cz
|
||||
|
||||
- compress the log file from 1st stage of installation (bnc#716938)
|
||||
- 2.21.23
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 7 11:38:39 UTC 2011 - fcrozat@suse.com
|
||||
|
||||
- Use latest macros for systemd
|
||||
- Drop workaround for bnc#719221, systemd is fixed now.
|
||||
- 2.21.22
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 7 11:30:21 UTC 2011 - jsrain@suse.cz
|
||||
|
||||
- change the URL for congratulation dialog (bnc#720481)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 26 10:41:38 CEST 2011 - jsuchome@suse.cz
|
||||
|
||||
|
||||
@ -19,16 +19,15 @@
|
||||
|
||||
|
||||
Name: yast2-installation
|
||||
Version: 2.21.21
|
||||
Release: 1
|
||||
Version: 2.21.23
|
||||
Release: 0
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Source0: yast2-installation-%{version}.tar.bz2
|
||||
|
||||
Prefix: /usr
|
||||
|
||||
Group: System/YaST
|
||||
License: GPL v2 or later
|
||||
License: GPL-2.0+
|
||||
|
||||
Source1: YaST2-Second-Stage.service
|
||||
Source2: YaST2-Firstboot.service
|
||||
@ -128,12 +127,11 @@ Recommends: yast2-add-on
|
||||
|
||||
PreReq: %fillup_prereq
|
||||
|
||||
BuildArch: noarch
|
||||
BuildArchitectures: noarch
|
||||
|
||||
Summary: YaST2 - Installation Parts
|
||||
|
||||
%package devel-doc
|
||||
|
||||
Group: Documentation/HTML
|
||||
Requires: yast2-installation >= 2.15.34
|
||||
|
||||
@ -151,23 +149,23 @@ System installation code as present on installation media.
|
||||
%setup -n yast2-installation-%{version}
|
||||
|
||||
%build
|
||||
%{prefix}/bin/y2tool y2autoconf
|
||||
%{prefix}/bin/y2tool y2automake
|
||||
%{_prefix}/bin/y2tool y2autoconf
|
||||
%{_prefix}/bin/y2tool y2automake
|
||||
autoreconf --force --install
|
||||
|
||||
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
|
||||
|
||||
%{?suse_update_config:%{suse_update_config -f}}
|
||||
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
|
||||
./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
|
||||
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
|
||||
[ -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
|
||||
@ -188,15 +186,12 @@ rm -rf "$RPM_BUILD_ROOT"
|
||||
|
||||
%if 0%{suse_version} > 1140
|
||||
|
||||
%service_add YaST2-Second-Stage.service YaST2-Firstboot.service
|
||||
%service_add_post YaST2-Second-Stage.service YaST2-Firstboot.service
|
||||
|
||||
/bin/systemctl enable YaST2-Second-Stage.service > /dev/null 2>&1 || :
|
||||
/bin/systemctl enable YaST2-Firstboot.service > /dev/null 2>&1 || :
|
||||
%pre
|
||||
%service_add_pre YaST2-Second-Stage.service YaST2-Firstboot.service
|
||||
|
||||
%preun
|
||||
if [ $1 -eq 0 ]; then
|
||||
/bin/systemctl disable YaST2-Second-Stage.service YaST2-Firstboot.service > /dev/null 2>&1 || :
|
||||
fi
|
||||
%service_del_preun YaST2-Second-Stage.service YaST2-Firstboot.service
|
||||
|
||||
%postun
|
||||
@ -219,7 +214,7 @@ fi
|
||||
/usr/share/YaST2/clients/*.ycp
|
||||
/usr/share/YaST2/modules/*.ycp
|
||||
/usr/share/YaST2/modules/*.ybc
|
||||
%{prefix}/share/applications/YaST2/*.desktop
|
||||
%{_prefix}/share/applications/YaST2/*.desktop
|
||||
/usr/share/autoinstall/modules/*.desktop
|
||||
/usr/share/YaST2/schema/autoyast/rnc/deploy_image.rnc
|
||||
%dir /usr/share/autoinstall
|
||||
@ -241,18 +236,17 @@ fi
|
||||
/var/adm/fillup-templates/sysconfig.security-checksig
|
||||
|
||||
# programs and scripts
|
||||
%{prefix}/lib/YaST2/startup
|
||||
%{_prefix}/lib/YaST2/startup
|
||||
|
||||
# icewm
|
||||
/etc/icewm
|
||||
|
||||
%dir %{prefix}/share/doc/packages/yast2-installation
|
||||
%{prefix}/share/doc/packages/yast2-installation/COPYING
|
||||
%readme %{prefix}/share/doc/packages/yast2-installation/README
|
||||
%dir %{_prefix}/share/doc/packages/yast2-installation
|
||||
%{_prefix}/share/doc/packages/yast2-installation/COPYING
|
||||
%readme %{_prefix}/share/doc/packages/yast2-installation/README
|
||||
|
||||
%files devel-doc
|
||||
%defattr(-,root,root)
|
||||
%doc %{prefix}/share/doc/packages/yast2-installation
|
||||
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
|
||||
%exclude %{prefix}/share/doc/packages/yast2-installation/README
|
||||
%changelog
|
||||
%doc %{_prefix}/share/doc/packages/yast2-installation
|
||||
%exclude %{_prefix}/share/doc/packages/yast2-installation/COPYING
|
||||
%exclude %{_prefix}/share/doc/packages/yast2-installation/README
|
||||
|
||||
Loading…
Reference in New Issue
Block a user