1
0

Accepting request 80396 from YaST:Head

- fix build for older distributions
- 2.21.16

OBS-URL: https://build.opensuse.org/request/show/80396
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-installation?expand=0&rev=213
This commit is contained in:
Sascha Peilicke 2011-09-02 11:19:38 +00:00 committed by Git OBS Bridge
commit 679e0c6994
4 changed files with 67 additions and 73 deletions

View File

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

View File

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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 31 14:33:50 CEST 2011 - jsuchome@suse.cz
- fix build for older distributions
- 2.21.16
-------------------------------------------------------------------
Mon Aug 29 12:12:55 CEST 2011 - jsuchome@suse.cz

View File

@ -1,89 +1,76 @@
#
# spec file for package yast2-installation
# spec file for package yast2-installation (Version 2.21.16)
#
# 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.16
Release: 0
Name: yast2-installation
Version: 2.21.15
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-installation-2.21.15.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-installation-2.21.16.tar.bz2
Prefix: /usr
prefix: /usr
Group: System/YaST
License: GPL v2 or later
Group: System/YaST
License: GPL v2 or later
Source1: YaST2-Second-Stage.service
Source2: YaST2-Firstboot.service
Source1: YaST2-Second-Stage.service
Source2: YaST2-Firstboot.service
%if 0%{?suse_version} >= 1210
BuildRequires: systemd-devel
BuildRequires: systemd-devel
%{systemd_requires}
%endif
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# FileSystems::possible_root_fs
BuildRequires: yast2-storage >= 2.19.12
BuildRequires: yast2-storage >= 2.19.12
# xmllint
BuildRequires: libxml2
BuildRequires: libxml2
# to convert control.rnc o control.rng
BuildRequires: trang
BuildRequires: trang
# PackageCallbacks::RegisterEmptyProgressCallbacks()
BuildRequires: yast2 >= 2.16.52
BuildRequires: yast2 >= 2.16.52
# Pkg::Add/RemoveUpgradeRepo()
BuildRequires: yast2-pkg-bindings >= 2.21.2
BuildRequires: yast2-pkg-bindings >= 2.21.2
# Unified progress bar (done by visnov)
BuildRequires: yast2-packager >= 2.17.9
BuildRequires: yast2-packager >= 2.17.9
# AutoinstConfig::getProposalList
Requires: autoyast2-installation >= 2.17.1
# ProductControl::DisabledACItems, ::DisabledSubProposals
Requires: yast2 >= 2.18.23
Requires: yast2 >= 2.18.23
# Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions)
Requires: yast2-country-data >= 2.16.11
Requires: yast2-country-data >= 2.16.11
# Pkg::SourceProvideDigestedFile()
Conflicts: yast2-pkg-bindings < 2.17.25
Conflicts: yast2-pkg-bindings < 2.17.25
# Pkg::Add/RemoveUpgradeRepo()
Requires: yast2-pkg-bindings >= 2.21.2
Requires: yast2-pkg-bindings >= 2.21.2
# Mouse-related scripts moved to yast2-mouse
Conflicts: yast2-mouse < 2.18.0
Conflicts: yast2-mouse < 2.18.0
# New API for ProductLicense
Requires: yast2-packager >= 2.19.2
Requires: yast2-packager >= 2.19.2
# FileSystems::possible_root_fs
Requires: yast2-storage >= 2.19.12
Requires: yast2-storage >= 2.19.12
# use in startup scripts
Requires: initviocons
Requires: initviocons
# Only in inst-sys
# Requires: yast2-network
@ -92,20 +79,20 @@ Requires: initviocons
# Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile
# pkg-bindings are not directly required
Conflicts: yast2-pkg-bindings < 2.17.25
Conflicts: yast2-pkg-bindings < 2.17.25
# InstError
Conflicts: yast2 < 2.18.6
Conflicts: yast2 < 2.18.6
# Added new function WFM::ClientExists
Conflicts: yast2-core < 2.17.10
Conflicts: yast2-core < 2.17.10
# ButtonBox widget
Conflicts: yast2-ycp-ui-bindings < 2.17.3
Conflicts: yast2-ycp-ui-bindings < 2.17.3
# tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103)
Requires: tar gzip
Requires: coreutils
Requires: tar gzip
Requires: coreutils
# for the first/second stage of installation
# currently not used
@ -114,32 +101,30 @@ Requires: coreutils
#Requires: /usr/bin/pnmtopng
# BNC 446533, /sbin/lspci called but not installed
Requires: pciutils
Requires: pciutils
Recommends: yast2-registration
Recommends: yast2-online-update
Recommends: yast2-users
Recommends: yast2-firewall
Recommends: release-notes
Recommends: curl
Recommends: yast2-update
Recommends: yast2-add-on
Recommends: yast2-registration
Recommends: yast2-online-update
Recommends: yast2-users
Recommends: yast2-firewall
Recommends: release-notes
Recommends: curl
Recommends: yast2-update
Recommends: yast2-add-on
PreReq: %fillup_prereq
%{?systemd_requires}
PreReq: %fillup_prereq
BuildArch: noarch
BuildArchitectures: noarch
Summary: YaST2 - Installation Parts
Summary: YaST2 - Installation Parts
%package devel-doc
Group: Documentation/HTML
Requires: yast2-installation >= 2.15.34
Requires: yast2-installation >= 2.15.34
PreReq: %fillup_prereq
PreReq: %fillup_prereq
Summary: YaST2 - Installation Parts
Summary: YaST2 - Installation Parts
%description
System installation code as present on installation media.
@ -148,7 +133,7 @@ System installation code as present on installation media.
System installation code as present on installation media.
%prep
%setup -n yast2-installation-2.21.15
%setup -n yast2-installation-2.21.16
%build
%{prefix}/bin/y2tool y2autoconf
@ -176,9 +161,9 @@ for f in `find %{buildroot}%{_datadir}/autoinstall/modules -name "*.desktop"`; d
%suse_update_desktop_file $f
done
mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}
mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/lib/systemd/system/
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/lib/systemd/system/
%clean
rm -rf "$RPM_BUILD_ROOT"
@ -186,6 +171,8 @@ rm -rf "$RPM_BUILD_ROOT"
%post
%{fillup_only -ns security checksig}
%if 0%{suse_version} > 1140
%service_add YaST2-Second-Stage.service YaST2-Firstboot.service
/bin/systemctl enable YaST2-Second-Stage.service > /dev/null 2>&1 || :
@ -200,6 +187,8 @@ fi
%postun
%service_del_postun YaST2-Second-Stage.service YaST2-Firstboot.service
%endif #suse_version
%files
%defattr(-,root,root)
%dir /usr/share/YaST2/control
@ -209,8 +198,8 @@ fi
/usr/share/YaST2/control/*.rnc
# systemd service files
%_unitdir/YaST2-Second-Stage.service
%_unitdir/YaST2-Firstboot.service
/lib/systemd/system/YaST2-Second-Stage.service
/lib/systemd/system/YaST2-Firstboot.service
/usr/share/YaST2/clients/*.ycp
/usr/share/YaST2/modules/*.ycp
@ -251,4 +240,3 @@ fi
%doc %{prefix}/share/doc/packages/yast2-installation
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog