Hello community, here is the log from the commit of package yast2-restore for openSUSE:Factory checked in at Mon Sep 19 21:18:36 CEST 2011.
-------- --- yast2-restore/yast2-restore.changes 2009-12-14 15:21:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-restore/yast2-restore.changes 2011-08-02 16:21:46.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Mar 29 09:28:49 CEST 2011 - [email protected] + +- Mounting NFS shares with 'nolock' (bnc #682064) +- 2.21.0 + +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - [email protected] + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-restore-2.19.0.tar.bz2 New: ---- yast2-restore-2.21.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-restore.spec ++++++ --- /var/tmp/diff_new_pack.P5qdcN/_old 2011-09-19 21:18:31.000000000 +0200 +++ /var/tmp/diff_new_pack.P5qdcN/_new 2011-09-19 21:18:31.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package yast2-restore (Version 2.19.0) +# spec file for package yast2-restore # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -19,21 +19,27 @@ Name: yast2-restore -Version: 2.19.0 -Release: 1 +Version: 2.21.0 +Release: 0 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-restore-2.19.0.tar.bz2 +Source0: yast2-restore-2.21.0.tar.bz2 + Prefix: /usr + Group: System/YaST License: GPLv2+ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite + Requires: aaa_base Requires: bzip2 Requires: gzip Requires: tar Requires: yast2 Requires: yast2-bootloader + BuildArch: noarch + Summary: YaST2 - System Restore %description @@ -41,14 +47,16 @@ Backup module. %prep -%setup -n yast2-restore-2.19.0 +%setup -n yast2-restore-2.21.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) @@ -68,6 +76,7 @@ %files %defattr(-,root,root) + %dir /usr/share/YaST2/include/restore /usr/share/YaST2/include/restore/* /usr/share/YaST2/clients/restore.ycp @@ -77,4 +86,5 @@ %{prefix}/share/applications/YaST2/restore.desktop %{prefix}/lib/YaST2/bin/restore_parse_pkginfo.pl %doc %{prefix}/share/doc/packages/yast2-restore + %changelog ++++++ yast2-restore-2.19.0.tar.bz2 -> yast2-restore-2.21.0.tar.bz2 ++++++ ++++ 4219 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.19.0/VERSION new/yast2-restore-2.21.0/VERSION --- old/yast2-restore-2.19.0/VERSION 2009-12-14 15:15:40.000000000 +0100 +++ new/yast2-restore-2.21.0/VERSION 2011-08-02 16:19:22.000000000 +0200 @@ -1 +1 @@ -2.19.0 +2.21.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.19.0/configure.in new/yast2-restore-2.21.0/configure.in --- old/yast2-restore-2.19.0/configure.in 2009-12-14 15:17:40.000000000 +0100 +++ new/yast2-restore-2.21.0/configure.in 2011-08-02 16:20:05.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-restore, 2.19.0, http://bugs.opensuse.org/, yast2-restore) +AC_INIT(yast2-restore, 2.21.0, http://bugs.opensuse.org/, yast2-restore) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.0" +VERSION="2.21.0" RPMNAME="yast2-restore" MAINTAINER="Lukas Ocilka <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.19.0/src/Restore.ycp new/yast2-restore-2.21.0/src/Restore.ycp --- old/yast2-restore-2.19.0/src/Restore.ycp 2009-11-24 15:14:16.000000000 +0100 +++ new/yast2-restore-2.21.0/src/Restore.ycp 2011-03-29 09:30:57.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Ladislav Slezak <[email protected]> * - * $Id: Restore.ycp 55625 2009-02-19 17:33:01Z locilka $ + * $Id: Restore.ycp 63677 2011-03-29 07:30:55Z locilka $ * Representation of the configuration of restore. * Input and output routines. @@ -410,7 +410,8 @@ y2milestone("file: %1", f); y2milestone("mpoint: %1", mpoint); - boolean result = (boolean) SCR::Execute(.target.mount, [server + ":" + dir, mpoint], "-t nfs -o ro"); + // BNC #682064: also 'nolock' is required + boolean result = (boolean) SCR::Execute(.target.mount, [server + ":" + dir, mpoint], "-t nfs -o ro,nolock"); return $[ "mounted" : result, "mountpoint" : mpoint , "file" : f, "server_dir" : dir ]; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.19.0/src/restore.desktop new/yast2-restore-2.21.0/src/restore.desktop --- old/yast2-restore-2.19.0/src/restore.desktop 2009-11-24 15:14:16.000000000 +0100 +++ new/yast2-restore-2.21.0/src/restore.desktop 2010-01-15 11:14:00.000000000 +0100 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-restore -Exec=/sbin/yast2 restore +Exec=xdg-su -c "/sbin/yast2 restore" Name=System Restoration GenericName=Restore files from a backup archive -X-KDE-SubstituteUID=true StartupNotify=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
