Uwe Gansert 2012-02-01 15:30:28 +00:00 committed by Git OBS Bridge
parent d1786549b6
commit ceeca4d311
4 changed files with 58 additions and 21 deletions

View File

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

3
autoyast2-2.22.0.tar.bz2 Normal file
View File

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

View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Wed Feb 1 16:28:04 CET 2012 - ug@suse.de
- 2.22.0
-------------------------------------------------------------------
Wed Jan 4 15:51:41 CET 2012 - ug@suse.de
- added taboo list for device guessing
(bnc#736530)
-------------------------------------------------------------------
Mon Jan 2 12:45:19 CET 2012 - ug@suse.de
- 2nd password field in ask-dialogs can be too short
(bnc#737660)
-------------------------------------------------------------------
Wed Dec 7 10:05:22 UTC 2011 - coolo@suse.com
- fix license to be in spdx.org format
-------------------------------------------------------------------
Tue Nov 29 16:34:30 CET 2011 - ug@suse.de
- added some more RPM-requires for the installation
(bnc#708258)
-------------------------------------------------------------------
Tue Nov 29 15:10:39 CET 2011 - ug@suse.de
- log ask-scripts only if debug is set to true
(bnc#732359)
-------------------------------------------------------------------
Wed Nov 23 12:07:14 CET 2011 - ug@suse.de
- moved writing init-scripts to 1st stage because of systemd
-------------------------------------------------------------------
Wed Oct 5 10:57:39 UTC 2011 - jsrain@site

View File

@ -1,7 +1,7 @@
#
# spec file for package autoyast2
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 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
@ -19,16 +19,14 @@
Name: autoyast2
Version: 2.21.4
Version: 2.22.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: autoyast2-2.21.4.tar.bz2
Prefix: /usr
Source0: autoyast2-%{version}.tar.bz2
Group: System/YaST
License: GPL v2 or later
License: GPL-2.0+
BuildRequires: docbook-xsl-stylesheets libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-slp yast2-testsuite yast2-transfer
# API for Disabled Modules (ProductControl)
BuildRequires: yast2 >= 2.16.36
@ -39,7 +37,7 @@ BuildRequires: yast2-storage >= 2.19.8
Requires: yast2 >= 2.16.36
Requires: yast2-core yast2-xml libxslt
Requires: autoyast2-installation = %{version}
Requires: yast2-schema yast2 yast2-country yast2-storage
Requires: yast2-schema yast2 yast2-country
Requires: yast2-storage >= 2.19.13
Requires: yast2-transfer >= 2.21.0
@ -65,7 +63,7 @@ This file contains YaST2-independent files needed to create
installation sources.
%package installation
Version: 2.21.4
Version: 2.22.0
Summary: YaST2 - Auto Installation Modules
@ -74,7 +72,7 @@ Group: System/YaST
Requires: yast2 >= 2.16.36
# After API cleanup
Requires: yast2-update >= 2.18.3
Requires: yast2-xml yast2-core yast2 yast2-country yast2-mouse yast2-packager yast2-storage yast2-transfer yast2-slp
Requires: yast2-xml yast2-core yast2 yast2-country yast2-mouse yast2-packager yast2-storage yast2-slp yast2-bootloader yast2-ncurses
Requires: yast2-transfer >= 2.21.0
Provides: yast2-trans-autoinst
Obsoletes: yast2-trans-autoinst
@ -84,26 +82,26 @@ This package performs auto-installation relying on a control file
generated with the autoyast2 package.
%prep
%setup -n autoyast2-2.21.4
%setup -n autoyast2-%{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
@ -144,9 +142,9 @@ rm -rf "$RPM_BUILD_ROOT"
%dir /var/lib/autoinstall/repository/rules
%dir /var/lib/autoinstall/repository/classes
%dir /var/lib/autoinstall/tmp
%doc %{prefix}/share/doc/packages/autoyast2
%doc %{_prefix}/share/doc/packages/autoyast2
%{prefix}/share/applications/YaST2/autoyast.desktop
%{_prefix}/share/applications/YaST2/autoyast.desktop
/usr/share/autoinstall/modules/*.desktop
/usr/share/YaST2/include/autoinstall/classes.ycp
/usr/share/YaST2/include/autoinstall/conftree.ycp
@ -247,7 +245,7 @@ rm -rf "$RPM_BUILD_ROOT"
/usr/share/YaST2/include/autoinstall/ask.ycp
# scripts
%{prefix}/lib/YaST2/bin/fetch_image.sh
%{_prefix}/lib/YaST2/bin/fetch_image.sh
%dir /var/adm/autoinstall/
%dir /var/adm/autoinstall/scripts