rpm/yast2-installation
SHA256
1
0
Fork 0
forked from pool/yast2-installation
Code Pull Requests Activity

Accepting request 87829 from YaST:Head

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

OBS-URL: https://build.opensuse.org/request/show/87829
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-installation?expand=0&rev=222
This commit is contained in:
Lars Vogdt 2011-10-16 11:02:45 +00:00 committed by Git OBS Bridge
commit ecfaeb2463
6 changed files with 74 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
YaST2-Firstboot.service
View File

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

1
YaST2-Second-Stage.service
View File

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

3
yast2-installation-2.21.23.tar.bz2
View File

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

3
yast2-installation-2.21.24.tar.bz2 Normal file
View File

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

6
yast2-installation.changes
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

50
yast2-installation.spec
View File

@ -19,24 +19,21 @@
Name: yast2-installation
Version: 2.21.23
Version: 2.21.24
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-installation-%{version}.tar.bz2
Source0: yast2-installation-2.21.24.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPL-2.0+
Summary: YaST2 - Installation Parts
Source1: YaST2-Second-Stage.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
# FileSystems::possible_root_fs
@ -107,6 +104,11 @@ Conflicts: yast2-ycp-ui-bindings < 2.17.3
Requires: tar gzip
Requires: coreutils
%if 0%{?suse_version} >= 1210
BuildRequires: systemd-devel
%{systemd_requires}
%endif
# for the first/second stage of installation
# currently not used
# bugzilla #208307
@ -127,9 +129,7 @@ Recommends: yast2-add-on
PreReq: %fillup_prereq
BuildArchitectures: noarch
Summary: YaST2 - Installation Parts
BuildArch: noarch
%package devel-doc
Group: Documentation/HTML
@ -146,26 +146,26 @@ 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.24
%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
@ -214,7 +214,7 @@ rm -rf "$RPM_BUILD_ROOT"
/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
@ -236,17 +236,19 @@ rm -rf "$RPM_BUILD_ROOT"
/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
%doc %{prefix}/share/doc/packages/yast2-installation
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog