Accepting request 38221 from YaST:Head

Copy from YaST:Head/yast2-update based on submit request 38221 from user aschnell

OBS-URL: https://build.opensuse.org/request/show/38221
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-update?expand=0&rev=59
This commit is contained in:
OBS User autobuild 2010-04-20 00:22:28 +00:00 committed by Git OBS Bridge
commit 4a9b7df1e6
4 changed files with 50 additions and 11 deletions

View File

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

View File

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

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Mon Apr 19 10:51:40 CEST 2010 - aschnell@suse.de
- allow btrfs as root fs
- 2.19.0
-------------------------------------------------------------------
Thu Jan 28 11:07:00 CET 2010 - locilka@suse.cz
- Counting packages directly in packages proposal (BNC #573482).
------------------------------------------------------------------
Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz
- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su
where root privileges are needed, removed X-KDE-SubstituteUID key
(bnc#540627)
-------------------------------------------------------------------
Tue Sep 8 13:46:06 CEST 2009 - kmachalkova@suse.cz

View File

@ -1,7 +1,7 @@
#
# spec file for package yast2-update (Version 2.18.6)
# spec file for package yast2-update (Version 2.19.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 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,48 +19,64 @@
Name: yast2-update
Version: 2.18.6
Version: 2.19.0
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-update-2.18.6.tar.bz2
Source0: yast2-update-2.19.0.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPL v2 or later
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-storage yast2-testsuite
License: GPLv2+
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
# FileSystems::possible_root_fs
BuildRequires: yast2-storage >= 2.19.12
# Packages::GetBaseSourceID
BuildRequires: yast2-packager >= 2.17.19
# Wizard::OpenOKDialog
BuildRequires: yast2 >= 2.16.49
# package not really needed to be installed but this breaks the building cycle
# xmllint
BuildRequires: libxml2
# control.rng
BuildRequires: yast2-installation >= 2.17.44
# FileSystems::possible_root_fs
Requires: yast2-storage >= 2.19.12
# PackagesUI::RunPackageSelector
Requires: yast2 >= 2.17.40
Requires: yast2-installation
# Function SelectKernelPackages has been moved to Packages module (bnc #326269).
Requires: yast2-packager >= 2.17.27
# moved into yast2-update from yast2-installation
# to remove dependency on yast2-storage
Provides: yast2-installation:/usr/share/YaST2/clients/vendor.ycp
# Required only in inst-sys
# Requires: yast2-storage
# Requires: yast2-country
# Pkg::PkgUpdateAll (map conf)
Conflicts: yast2-pkg-bindings < 2.15.11
# Storage::DeviceMatchFstab (#244117)
Conflicts: yast2-storage < 2.15.4
Summary: YaST2 - Update
%package FACTORY
License: GPL v2 or later
License: GPLv2+
Group: System/YaST
PreReq: %fillup_prereq
Requires: yast2-update yast2
# moved into yast2-update from yast2-installation
# to remove dependency on yast2-storage
Provides: yast2-update:/usr/share/YaST2/clients/update.ycp
Summary: YaST2 - Update
%description
@ -70,14 +86,16 @@ Use this component if you wish to update your system.
Use this component if you wish to update your system.
%prep
%setup -n yast2-update-2.18.6
%setup -n yast2-update-2.19.0
%build
%{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}
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
@ -99,6 +117,7 @@ rm -rf "$RPM_BUILD_ROOT"
%defattr(-,root,root)
%{prefix}/lib/YaST2/bin/*
/usr/share/YaST2/modules/*
/usr/share/YaST2/clients/inst_rootpart.ycp
/usr/share/YaST2/clients/inst_update.ycp
/usr/share/YaST2/clients/inst_backup.ycp
@ -108,8 +127,10 @@ rm -rf "$RPM_BUILD_ROOT"
/usr/share/YaST2/clients/backup_proposal.ycp
/usr/share/YaST2/clients/inst_update_partition.ycp
/usr/share/YaST2/clients/rootpart_check_keyboard.ycp
/usr/share/YaST2/include/update
/usr/share/YaST2/include/update/rootpart.ycp
%doc %{prefix}/share/doc/packages/yast2-update
%files FACTORY