diff --git a/yast2-installation.spec b/yast2-installation.spec index c76714b..90d8148 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,34 +1,20 @@ # -# spec file for package yast2-installation +# spec file for package yast2-installation (Version 2.21.22) # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - # norootforbuild +Name: yast2-installation +Version: 2.21.22 +Release: 0 -Name: yast2-installation -Version: 2.21.21 -Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-2.21.22.tar.bz2 -Prefix: /usr +prefix: /usr Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Source1: YaST2-Second-Stage.service Source2: YaST2-Firstboot.service @@ -147,7 +133,7 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-%{version} +%setup -n yast2-installation-2.21.22 %build %{prefix}/bin/y2tool y2autoconf @@ -187,15 +173,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