Mailinglist Archive: opensuse-commit (689 mails)
| < Previous | Next > |
commit yast2-kdump
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 11 Dec 2007 13:17:47 +0100
- Message-id: <20071211121748.0ED2B678335@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-kdump
checked in at Tue Dec 11 13:17:47 CET 2007.
--------
--- yast2-kdump/yast2-kdump.changes 2007-08-30 16:51:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-kdump/yast2-kdump.changes
2007-12-11 10:23:19.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Dec 11 10:17:01 CET 2007 - juhliarik@xxxxxxx
+
+- added patch for bug# 347241 - kdump package needs to be
+ installed in yast2-kdump module
+- new version for openSUSE 11.0
+- V 2.16.8
+
+-------------------------------------------------------------------
Old:
----
yast2-kdump-2.15.7.tar.bz2
New:
----
yast2-kdump-2.16.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-kdump.spec ++++++
--- /var/tmp/diff_new_pack.L27370/_old 2007-12-11 13:17:33.000000000 +0100
+++ /var/tmp/diff_new_pack.L27370/_new 2007-12-11 13:17:33.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-kdump (Version 2.15.7)
+# spec file for package yast2-kdump (Version 2.16.8)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,13 +11,13 @@
# norootforbuild
Name: yast2-kdump
-Version: 2.15.7
+Version: 2.16.8
Release: 1
License: GPL v2 only
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-kdump-2.15.7.tar.bz2
-prefix: /usr
+Source0: yast2-kdump-2.16.8.tar.bz2
+Prefix: /usr
Requires: yast2 yast2-storage yast2-bootloader
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader
yast2-devtools yast2-storage yast2-testsuite
Recommends: makedumpfile
@@ -33,7 +33,7 @@
Jozef Uhliarik <juhliarik@xxxxxxx>
%prep
-%setup -n yast2-kdump-2.15.7
+%setup -n yast2-kdump-2.16.8
%build
%{prefix}/bin/y2tool y2autoconf
@@ -65,8 +65,12 @@
%{prefix}/share/applications/YaST2/kdump.desktop
/usr/share/YaST2/scrconf/*.scr
%doc %{prefix}/share/doc/packages/yast2-kdump
-
%changelog
+* Tue Dec 11 2007 - juhliarik@xxxxxxx
+- added patch for bug# 347241 - kdump package needs to be
+ installed in yast2-kdump module
+- new version for openSUSE 11.0
+- V 2.16.8
* Thu Aug 30 2007 - juhliarik@xxxxxxx
- added correction for:
bug#300124 - Adding boot options via yast bootloader doesn't work
++++++ yast2-kdump-2.15.7.tar.bz2 -> yast2-kdump-2.16.8.tar.bz2 ++++++
++++ 3287 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-kdump-2.15.7/configure.in new/yast2-kdump-2.16.8/configure.in
--- old/yast2-kdump-2.15.7/configure.in 2007-08-30 16:56:17.000000000 +0200
+++ new/yast2-kdump-2.16.8/configure.in 2007-12-11 10:29:16.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-kdump
dnl
-dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-kdump, 2.15.7, http://bugs.opensuse.org/, yast2-kdump)
+AC_INIT(yast2-kdump, 2.16.8, http://bugs.opensuse.org/, yast2-kdump)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.7"
+VERSION="2.16.8"
RPMNAME="yast2-kdump"
MAINTAINER="Jozef Uhliarik <juhliarik@xxxxxxxx>"
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-kdump-2.15.7/Makefile.am new/yast2-kdump-2.16.8/Makefile.am
--- old/yast2-kdump-2.15.7/Makefile.am 2007-08-30 16:56:17.000000000 +0200
+++ new/yast2-kdump-2.16.8/Makefile.am 2007-12-11 10:29:16.000000000 +0100
@@ -30,7 +30,7 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast),
$(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
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-kdump-2.15.7/missing new/yast2-kdump-2.16.8/missing
--- old/yast2-kdump-2.15.7/missing 2007-08-30 16:56:22.000000000 +0200
+++ new/yast2-kdump-2.16.8/missing 2007-12-11 10:29:21.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@xxxxxxxxxxxxxxxx>, 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 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-kdump-2.15.7/src/complex.ycp new/yast2-kdump-2.16.8/src/complex.ycp
--- old/yast2-kdump-2.15.7/src/complex.ycp 2007-08-17 12:31:22.000000000
+0200
+++ new/yast2-kdump-2.16.8/src/complex.ycp 2007-12-11 10:10:50.000000000
+0100
@@ -87,11 +87,17 @@
//only ppc64 includes package kernel-kdump
//others include kdump-helper and kexec-tools depend on it
//it mean that it is not important check for available kdump-helper
- if (Arch::ppc64()) {
- kdump = "kernel-kdump";
- } else {
- kdump = "kdump-helpers";
- }
+
+
+ //if (Arch::ppc64()) {
+ // kdump = "kernel-kdump";
+ //} else {
+ // kdump = "kdump-helpers";
+ //}
+
+ //the patch for openSUSE 11, kdump-helpers was rename to kdump package
+ //it valid for all architectures bug#347241
+ kdump = "kdump";
if (Package::Installed(kdump)) {
kdump_installed =true;
@@ -103,13 +109,14 @@
kexec_available = Package::Available("kexec-tools");
if (!kdump_installed) {
- if (Arch::ppc64())
- kdump_available = Package::Available(kdump);
- else
- kdump_available = true;
+ //if (Arch::ppc64())
+ // kdump_available = Package::Available(kdump);
+ //else
+ // kdump_available = true;
+ kdump_available = Package::Available(kdump);
}
- if ((!kexec_installed) &&(!kexec_available)) {
+ if ((!kexec_installed) && (!kexec_available)) {
if (!Mode::commandline()) {
Popup::Error(_("Package for kexec-tools is not available."));
} else {
@@ -121,9 +128,9 @@
if ((!kdump_installed) && (!kdump_available)) {
if (!Mode::commandline()) {
- Popup::Error(_("Package for kernel-kdump is not available."));
+ Popup::Error(_("Package for kdump is not available."));
} else {
- CommandLine::Error(_("Package for kernel-kdump is not available."));
+ CommandLine::Error(_("Package for kdump is not available."));
}
y2error("[kdump] (ReadDialog ()) Packages for %1 is not
available.",kdump);
return `abort;
@@ -133,7 +140,7 @@
if (!kexec_installed)
package_list = add(package_list, "kexec-tools");
- if ((!kdump_installed) && (Arch::ppc64()))
+ if (!kdump_installed)
package_list = add(package_list, kdump);
//install packages
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-kdump-2.15.7/VERSION new/yast2-kdump-2.16.8/VERSION
--- old/yast2-kdump-2.15.7/VERSION 2007-08-30 16:48:56.000000000 +0200
+++ new/yast2-kdump-2.16.8/VERSION 2007-12-11 10:19:43.000000000 +0100
@@ -1 +1 @@
-2.15.7
+2.16.8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |