1
0

- Fix text mode handled in systemd (bnc#724115)

- 2.21.24

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=147
This commit is contained in:
Stephan Kulow 2011-10-14 11:46:54 +00:00 committed by Git OBS Bridge
parent 965c83c40d
commit 55417ca0b4
6 changed files with 74 additions and 64 deletions

View File

@ -10,6 +10,7 @@ ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot
ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system
TimeoutSec=0 TimeoutSec=0
RemainAfterExit=true RemainAfterExit=true
StandardInput=tty
[Install] [Install]
WantedBy=default.target WantedBy=default.target

View File

@ -10,6 +10,7 @@ ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
RemainAfterExit=yes RemainAfterExit=yes
TimeoutSec=0 TimeoutSec=0
ExecStartPost=/bin/rm -f /var/lib/YaST2/runme_at_boot ExecStartPost=/bin/rm -f /var/lib/YaST2/runme_at_boot
StandardInput=tty
[Install] [Install]
WantedBy=default.target WantedBy=default.target

View File

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

View File

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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Oct 14 11:27:58 CEST 2011 - fcrozat@suse.com
- Fix text mode handled in systemd (bnc#724115)
- 2.21.24
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 11 08:52:43 CEST 2011 - jsuchome@suse.cz Tue Oct 11 08:52:43 CEST 2011 - jsuchome@suse.cz

View File

@ -19,71 +19,68 @@
Name: yast2-installation Name: yast2-installation
Version: 2.21.23 Version: 2.21.24
Release: 0 Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-installation-%{version}.tar.bz2 Source0: yast2-installation-2.21.24.tar.bz2
Prefix: /usr
Group: System/YaST Group: System/YaST
License: GPL-2.0+ License: GPL-2.0+
Summary: YaST2 - Installation Parts
Source1: YaST2-Second-Stage.service Source1: YaST2-Second-Stage.service
Source2: YaST2-Firstboot.service Source2: YaST2-Firstboot.service
%if 0%{?suse_version} >= 1210
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 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 # FileSystems::possible_root_fs
BuildRequires: yast2-storage >= 2.19.12 BuildRequires: yast2-storage >= 2.19.12
# xmllint # xmllint
BuildRequires: libxml2 BuildRequires: libxml2
# to convert control.rnc o control.rng # to convert control.rnc o control.rng
BuildRequires: trang BuildRequires: trang
# PackageCallbacks::RegisterEmptyProgressCallbacks() # PackageCallbacks::RegisterEmptyProgressCallbacks()
BuildRequires: yast2 >= 2.16.52 BuildRequires: yast2 >= 2.16.52
# Pkg::Add/RemoveUpgradeRepo() # Pkg::Add/RemoveUpgradeRepo()
BuildRequires: yast2-pkg-bindings >= 2.21.2 BuildRequires: yast2-pkg-bindings >= 2.21.2
# Unified progress bar (done by visnov) # Unified progress bar (done by visnov)
BuildRequires: yast2-packager >= 2.17.9 BuildRequires: yast2-packager >= 2.17.9
# AutoinstConfig::getProposalList # AutoinstConfig::getProposalList
Requires: autoyast2-installation >= 2.17.1 Requires: autoyast2-installation >= 2.17.1
# ProductControl::DisabledACItems, ::DisabledSubProposals # ProductControl::DisabledACItems, ::DisabledSubProposals
Requires: yast2 >= 2.18.23 Requires: yast2 >= 2.18.23
# Language::GetLanguageItems and other API # Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions) # Language::Set (handles downloading the translation extensions)
Requires: yast2-country-data >= 2.16.11 Requires: yast2-country-data >= 2.16.11
# Pkg::SourceProvideDigestedFile() # Pkg::SourceProvideDigestedFile()
Conflicts: yast2-pkg-bindings < 2.17.25 Conflicts: yast2-pkg-bindings < 2.17.25
# Pkg::Add/RemoveUpgradeRepo() # Pkg::Add/RemoveUpgradeRepo()
Requires: yast2-pkg-bindings >= 2.21.2 Requires: yast2-pkg-bindings >= 2.21.2
# Mouse-related scripts moved to yast2-mouse # Mouse-related scripts moved to yast2-mouse
Conflicts: yast2-mouse < 2.18.0 Conflicts: yast2-mouse < 2.18.0
# New API for ProductLicense # New API for ProductLicense
Requires: yast2-packager >= 2.19.2 Requires: yast2-packager >= 2.19.2
# FileSystems::possible_root_fs # FileSystems::possible_root_fs
Requires: yast2-storage >= 2.19.12 Requires: yast2-storage >= 2.19.12
# use in startup scripts # use in startup scripts
Requires: initviocons Requires: initviocons
# Only in inst-sys # Only in inst-sys
# Requires: yast2-network # Requires: yast2-network
@ -92,20 +89,25 @@ Requires: initviocons
# Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile # Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile
# pkg-bindings are not directly required # pkg-bindings are not directly required
Conflicts: yast2-pkg-bindings < 2.17.25 Conflicts: yast2-pkg-bindings < 2.17.25
# InstError # InstError
Conflicts: yast2 < 2.18.6 Conflicts: yast2 < 2.18.6
# Added new function WFM::ClientExists # Added new function WFM::ClientExists
Conflicts: yast2-core < 2.17.10 Conflicts: yast2-core < 2.17.10
# ButtonBox widget # 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) # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103)
Requires: tar gzip Requires: tar gzip
Requires: coreutils Requires: coreutils
%if 0%{?suse_version} >= 1210
BuildRequires: systemd-devel
%{systemd_requires}
%endif
# for the first/second stage of installation # for the first/second stage of installation
# currently not used # currently not used
@ -114,30 +116,28 @@ Requires: coreutils
#Requires: /usr/bin/pnmtopng #Requires: /usr/bin/pnmtopng
# BNC 446533, /sbin/lspci called but not installed # BNC 446533, /sbin/lspci called but not installed
Requires: pciutils Requires: pciutils
Recommends: yast2-registration Recommends: yast2-registration
Recommends: yast2-online-update Recommends: yast2-online-update
Recommends: yast2-users Recommends: yast2-users
Recommends: yast2-firewall Recommends: yast2-firewall
Recommends: release-notes Recommends: release-notes
Recommends: curl Recommends: curl
Recommends: yast2-update Recommends: yast2-update
Recommends: yast2-add-on Recommends: yast2-add-on
PreReq: %fillup_prereq PreReq: %fillup_prereq
BuildArchitectures: noarch BuildArch: noarch
Summary: YaST2 - Installation Parts
%package devel-doc %package devel-doc
Group: Documentation/HTML 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 %description
System installation code as present on installation media. System installation code as present on installation media.
@ -146,26 +146,26 @@ System installation code as present on installation media.
System installation code as present on installation media. System installation code as present on installation media.
%prep %prep
%setup -n yast2-installation-%{version} %setup -n yast2-installation-2.21.24
%build %build
%{_prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2autoconf
%{_prefix}/bin/y2tool y2automake %{prefix}/bin/y2tool y2automake
autoreconf --force --install autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}} %{?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) # V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works # so that RPM_OPT_FLAGS check works
make %{?jobs:-j%jobs} V=1 make %{?jobs:-j%jobs} V=1
%install %install
make install DESTDIR="$RPM_BUILD_ROOT" 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" [ -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 for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
d=${f##*/} d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done done
@ -214,7 +214,7 @@ rm -rf "$RPM_BUILD_ROOT"
/usr/share/YaST2/clients/*.ycp /usr/share/YaST2/clients/*.ycp
/usr/share/YaST2/modules/*.ycp /usr/share/YaST2/modules/*.ycp
/usr/share/YaST2/modules/*.ybc /usr/share/YaST2/modules/*.ybc
%{_prefix}/share/applications/YaST2/*.desktop %{prefix}/share/applications/YaST2/*.desktop
/usr/share/autoinstall/modules/*.desktop /usr/share/autoinstall/modules/*.desktop
/usr/share/YaST2/schema/autoyast/rnc/deploy_image.rnc /usr/share/YaST2/schema/autoyast/rnc/deploy_image.rnc
%dir /usr/share/autoinstall %dir /usr/share/autoinstall
@ -236,17 +236,19 @@ rm -rf "$RPM_BUILD_ROOT"
/var/adm/fillup-templates/sysconfig.security-checksig /var/adm/fillup-templates/sysconfig.security-checksig
# programs and scripts # programs and scripts
%{_prefix}/lib/YaST2/startup %{prefix}/lib/YaST2/startup
# icewm # icewm
/etc/icewm /etc/icewm
%dir %{_prefix}/share/doc/packages/yast2-installation %dir %{prefix}/share/doc/packages/yast2-installation
%{_prefix}/share/doc/packages/yast2-installation/COPYING %{prefix}/share/doc/packages/yast2-installation/COPYING
%readme %{_prefix}/share/doc/packages/yast2-installation/README %readme %{prefix}/share/doc/packages/yast2-installation/README
%files devel-doc %files devel-doc
%defattr(-,root,root) %defattr(-,root,root)
%doc %{_prefix}/share/doc/packages/yast2-installation %doc %{prefix}/share/doc/packages/yast2-installation
%exclude %{_prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{_prefix}/share/doc/packages/yast2-installation/README %exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog