Mailinglist Archive: opensuse-commit (1426 mails)
| < Previous | Next > |
commit yast2-bootloader
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 01 Mar 2007 22:03:00 +0100
- Message-id: <20070301210301.0EE64678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Thu Mar 1 22:03:00 CET 2007.
--------
--- yast2-bootloader/yast2-bootloader.changes 2007-02-27 16:36:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2007-03-01 10:11:44.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Mar 1 10:04:44 CET 2007 - aosthof@xxxxxxx
+
+- Reverted to make Xen kernel default boot kernel if Xen pattern
+ or Xen RPMs are installed. (Fate #301384)
+- 2.15.7
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-2.15.6.tar.bz2
New:
----
yast2-bootloader-2.15.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.O25577/_old 2007-03-01 22:02:47.000000000 +0100
+++ /var/tmp/diff_new_pack.O25577/_new 2007-03-01 22:02:47.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.15.6)
+# spec file for package yast2-bootloader (Version 2.15.7)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-bootloader
-Version: 2.15.6
+Version: 2.15.7
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.15.6.tar.bz2
+Source0: yast2-bootloader-2.15.7.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite
PreReq: /bin/sed %fillup_prereq
@@ -46,7 +46,7 @@
Dan Meszaros
%prep
-%setup -n yast2-bootloader-2.15.6
+%setup -n yast2-bootloader-2.15.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -91,6 +91,10 @@
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Thu Mar 01 2007 - aosthof@xxxxxxx
+- Reverted to make Xen kernel default boot kernel if Xen pattern
+ or Xen RPMs are installed. (Fate #301384)
+- 2.15.7
* Tue Feb 27 2007 - od@xxxxxxx
- include yast2-storage in BuildRequires
- 2.15.6
++++++ yast2-bootloader-2.15.6.tar.bz2 -> yast2-bootloader-2.15.7.tar.bz2 ++++++
++++ 2918 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-bootloader-2.15.6/autodocs-ycp.ami new/yast2-bootloader-2.15.7/autodocs-ycp.ami
--- old/yast2-bootloader-2.15.6/autodocs-ycp.ami 2006-10-16 20:54:55.000000000 +0200
+++ new/yast2-bootloader-2.15.7/autodocs-ycp.ami 2007-01-23 10:29:08.000000000 +0100
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 32798 2006-09-11 11:25:01Z mvidner $
+# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
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-bootloader-2.15.6/configure.in new/yast2-bootloader-2.15.7/configure.in
--- old/yast2-bootloader-2.15.6/configure.in 2006-10-16 20:54:54.000000000 +0200
+++ new/yast2-bootloader-2.15.7/configure.in 2007-01-23 10:29:08.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-bootloader
dnl
-dnl -- This file is generated by y2autoconf 2.13.27 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-bootloader, 2.13.79, http://bugs.opensuse.org/, yast2-bootloader)
+AC_INIT(yast2-bootloader, 2.15.3, http://bugs.opensuse.org/, yast2-bootloader)
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.13.79"
+VERSION="2.15.3"
RPMNAME="yast2-bootloader"
MAINTAINER="Olaf Dabrunz <od@xxxxxxx>"
@@ -111,6 +111,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -143,6 +145,9 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+ AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
AC_PATH_PROG(YDOXYGEN, ydoxygen, false, $PATH:$devtools_ybindir)
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-bootloader-2.15.6/Makefile.am new/yast2-bootloader-2.15.7/Makefile.am
--- old/yast2-bootloader-2.15.6/Makefile.am 2006-10-16 20:54:55.000000000 +0200
+++ new/yast2-bootloader-2.15.7/Makefile.am 2007-01-23 10:29:08.000000000 +0100
@@ -7,8 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -34,7 +33,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
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-bootloader-2.15.6/src/modules/BootGRUB.ycp new/yast2-bootloader-2.15.7/src/modules/BootGRUB.ycp
--- old/yast2-bootloader-2.15.6/src/modules/BootGRUB.ycp 2007-02-24 01:46:23.000000000 +0100
+++ new/yast2-bootloader-2.15.7/src/modules/BootGRUB.ycp 2007-03-01 10:03:07.000000000 +0100
@@ -13,7 +13,7 @@
* Jiri Srain <jsrain@xxxxxxx>
* Joachim Plack <jplack@xxxxxxx>
*
- * $Id: BootGRUB.ycp 36030 2007-02-12 11:21:35Z jplack $
+ * $Id: BootGRUB.ycp 36591 2007-03-01 09:03:04Z aosthof $
*
*/
@@ -136,9 +136,9 @@
y2debug ("Creating GRUB sections from scratch");
list<map<string,any> > out = [];
+ out = add (out, CreateLinuxSection ("linux"));
if (BootCommon::XenPresent ())
out = add (out, CreateLinuxSection ("xen"));
- out = add (out, CreateLinuxSection ("linux"));
list<string> others_ignore = [];
list<string> others = (list<string>)Storage::GetForeignPrimary();
y2debug ("Other primaries: %1", others);
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-bootloader-2.15.6/VERSION new/yast2-bootloader-2.15.7/VERSION
--- old/yast2-bootloader-2.15.6/VERSION 2007-02-27 16:33:19.000000000 +0100
+++ new/yast2-bootloader-2.15.7/VERSION 2007-03-01 10:04:18.000000000 +0100
@@ -1 +1 @@
-2.15.6
+2.15.7
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |