April 2008 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-theme
by root＠Hilbert.suse.de 29 Apr '08

29 Apr '08

Hello community, here is the log from the commit of package yast2-theme checked in at Tue Apr 29 11:12:52 CEST 2008. -------- --- yast2-theme/yast2-theme.changes 2008-04-22 18:20:43.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-theme/yast2-theme.changes 2008-04-28 19:39:23.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 28 17:58:32 CEST 2008 - sh(a)suse.de + +- Added yast.png icon for yast2-controlcenter in all themes + (bnc #144694) + +------------------------------------------------------------------- Old: ---- yast2-theme-2.16.23.tar.bz2 New: ---- yast2-theme-2.16.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-theme.spec ++++++ --- /var/tmp/diff_new_pack.k30974/_old 2008-04-29 11:11:29.000000000 +0200 +++ /var/tmp/diff_new_pack.k30974/_new 2008-04-29 11:11:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-theme (Version 2.16.23) +# spec file for package yast2-theme (Version 2.16.24) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-theme -Version: 2.16.23 +Version: 2.16.24 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-theme-2.16.23.tar.bz2 +Source0: yast2-theme-2.16.24.tar.bz2 Prefix: /usr BuildRequires: fdupes hicolor-icon-theme pkg-config update-desktop-files yast2 yast2-devtools BuildArch: noarch @@ -35,7 +35,7 @@ %package openSUSE License: GPL v2 or later Summary: YaST2 - Theme (openSUSE) -Version: 2.16.23 +Version: 2.16.24 Release: 1 Group: System/YaST Provides: yast2_theme = %{version} @@ -50,7 +50,7 @@ %package openSUSE-Crystal License: GPL v2 or later Summary: YaST2 - Theme (openSUSE) -Version: 2.16.23 +Version: 2.16.24 Release: 1 Group: System/YaST Provides: yast2_theme = %{version} @@ -59,7 +59,7 @@ %package openSUSE-Oxygen License: GPL v2 or later Summary: YaST2 - Theme (openSUSE) -Version: 2.16.23 +Version: 2.16.24 Release: 1 Group: System/YaST Provides: yast2_theme = %{version} @@ -94,7 +94,7 @@ Ken Wimer <wimer(a)suse.de> %prep -%setup -n yast2-theme-2.16.23 +%setup -n yast2-theme-2.16.24 %build %{prefix}/bin/y2tool y2autoconf @@ -187,6 +187,9 @@ %dir /usr/share/YaST2/theme /usr/share/YaST2/theme/openSUSE-Oxygen %changelog +* Mon Apr 28 2008 sh(a)suse.de +- Added yast.png icon for yast2-controlcenter in all themes + (bnc #144694) * Tue Apr 22 2008 coolo(a)suse.de - adding a kde4 icon * Thu Apr 17 2008 coolo(a)suse.de ++++++ yast2-theme-2.16.23.tar.bz2 -> yast2-theme-2.16.24.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-theme-2.16.23/configure new/yast2-theme-2.16.24/configure --- old/yast2-theme-2.16.23/configure 2008-04-26 12:04:23.000000000 +0200 +++ new/yast2-theme-2.16.24/configure 2008-04-29 08:30:59.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-theme 2.16.23. +# Generated by GNU Autoconf 2.61 for yast2-theme 2.16.24. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-theme' PACKAGE_TARNAME='yast2-theme' -PACKAGE_VERSION='2.16.23' -PACKAGE_STRING='yast2-theme 2.16.23' +PACKAGE_VERSION='2.16.24' +PACKAGE_STRING='yast2-theme 2.16.24' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1194,7 +1194,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-theme 2.16.23 to adapt to many kinds of systems. +\`configure' configures yast2-theme 2.16.24 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1265,7 +1265,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-theme 2.16.23:";; + short | recursive ) echo "Configuration of yast2-theme 2.16.24:";; esac cat <<\_ACEOF @@ -1343,7 +1343,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-theme configure 2.16.23 +yast2-theme configure 2.16.24 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1357,7 +1357,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-theme $as_me 2.16.23, which was +It was created by yast2-theme $as_me 2.16.24, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2178,7 +2178,7 @@ # Define the identity of the package. PACKAGE='yast2-theme' - VERSION='2.16.23' + VERSION='2.16.24' cat >>confdefs.h <<_ACEOF @@ -2406,7 +2406,7 @@ -VERSION="2.16.23" +VERSION="2.16.24" RPMNAME="yast2-theme" MAINTAINER="Stefan Hundhammer <sh(a)suse.de>" @@ -3130,7 +3130,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-theme $as_me 2.16.23, which was +This file was extended by yast2-theme $as_me 2.16.24, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3173,7 +3173,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-theme config.status 2.16.23 +yast2-theme config.status 2.16.24 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-theme-2.16.23/configure.in new/yast2-theme-2.16.24/configure.in --- old/yast2-theme-2.16.23/configure.in 2008-04-26 12:04:18.000000000 +0200 +++ new/yast2-theme-2.16.24/configure.in 2008-04-29 08:30:56.000000000 +0200 @@ -2,7 +2,7 @@ dnl dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-theme, 2.16.23, http://bugs.opensuse.org/, yast2-theme) +AC_INIT(yast2-theme, 2.16.24, http://bugs.opensuse.org/, yast2-theme) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.23" +VERSION="2.16.24" RPMNAME="yast2-theme" MAINTAINER="Stefan Hundhammer <sh(a)suse.de>" Files old/yast2-theme-2.16.23/openSUSE/icons/22x22/apps/pattern-gnome.png and new/yast2-theme-2.16.24/openSUSE/icons/22x22/apps/pattern-gnome.png differ Files old/yast2-theme-2.16.23/openSUSE/icons/32x32/apps/pattern-gnome.png and new/yast2-theme-2.16.24/openSUSE/icons/32x32/apps/pattern-gnome.png differ Files old/yast2-theme-2.16.23/openSUSE/icons/48x48/apps/pattern-gnome.png and new/yast2-theme-2.16.24/openSUSE/icons/48x48/apps/pattern-gnome.png differ Files old/yast2-theme-2.16.23/openSUSE/icons/64x64/apps/pattern-gnome.png and new/yast2-theme-2.16.24/openSUSE/icons/64x64/apps/pattern-gnome.png differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-theme-2.16.23/openSUSE/wizard/installation.qss new/yast2-theme-2.16.24/openSUSE/wizard/installation.qss --- old/yast2-theme-2.16.23/openSUSE/wizard/installation.qss 2008-04-21 16:41:06.000000000 +0200 +++ new/yast2-theme-2.16.24/openSUSE/wizard/installation.qss 2008-04-28 22:35:06.000000000 +0200 @@ -74,8 +74,8 @@ } .steps_heading { - font: bold; - color: black; + font-weight: bold; + color: white; margin-bottom: 7px; } @@ -148,63 +148,58 @@ left: 5px; /* move to the right by 5px */ } -/* Style the tab using the tab sub-control. Note that - it reads QTabBar _not_ QTabWidget */ -QTabBar::tab { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 rgba(60,60,60,80), stop: 1.0 rgba(0,0,0,0)); - border: 0px; - border-top-left-radius: 4px; - border-top-right-radius: 4px; - min-width: 8ex; - padding: 2px; - color: #bbbbbb; - margin-bottom: 2px; -} - -QTabBar::tab:selected { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #aaaaaa, stop: 0.4 #6f7d81, stop: 1.0 rgba(0,0,0,0)); - color: white; - font-weight: bold; - border-top: 1px solid #444444; - border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #444444, stop: 1.0 rgba(0,0,0,0)); - border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #444444, stop: 1.0 rgba(0,0,0,0)); -} - -QTabBar::tab:hover { - color: black; -} - -QTabBar::tab:!selected { - margin-top: 2px; /* make non-selected tabs look smaller */ -} + /* Style the tab using the tab sub-control. Note that + it reads QTabBar _not_ QTabWidget */ + QTabBar::tab { + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 rgba(60,60,60,80), stop: 1.0 rgba(0,0,0,0)); + border: 0px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + min-width: 8ex; + padding: 2px; + color: #bbbbbb; + margin-bottom: 2px; + } + + QTabBar::tab:selected { + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #aaaaaa, stop: 0.4 #6f7d81, stop: 1.0 rgba(0,0,0,0)); + color: white; + font-weight: bold; + border-top: 1px solid #444444; + border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #444444, stop: 1.0 rgba(0,0,0,0)); + border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #444444, stop: 1.0 rgba(0,0,0,0)); + } + + QTabBar::tab:hover { + color: black; + } + + QTabBar::tab:!selected { + margin-top: 2px; /* make non-selected tabs look smaller */ + } -/* make use of negative margins for overlapping tabs */ + /* make use of negative margins for overlapping tabs */ -QTabBar::tab:only-one { -} + QTabBar::tab:only-one { + } -QGroupBox { +#work_area QGroupBox { /* Eventually I'd like to have this global. Possibly belongs to style.qss */ border: 0px; margin-top: 2.5ex; margin-left: 10px; } -QGroupBox::title { - subcontrol-origin: margin; - subcontrol-position: left top; - font-weight: bold; color: #bbb; -} + #work_area QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: left top; + font-weight: bold; color: #bbb; + } -#work_area QPushButton:disabled { - color: rgba(255,255,255,80); - border: 1px solid rgba(0,0,0,80); - background: none; -} #work_area QPushButton { border: 1px solid #313131; @@ -216,30 +211,87 @@ font-weight: bold; } -#work_area QPushButton:default:pressed, #work_area QPushButton:pressed { - background-color: red; /* FIXME: doesn't seem to match */ -} - -#work_area QPushButton:hover { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #a5a5a5, stop: 0.7 #4d4d4d, stop: 1 #747474); - color: white; -} - -#work_area QPushButton:flat { - border: none; /* no border for a flat push button */ -} - -#work_area QPushButton:default { - border: 1px solid #0e5a00; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #75ce1f, stop: 0.8 #4d8e0d, stop: 1 #5aa50f); -} -#work_area QPushButton:default:hover { + #work_area QPushButton:flat { /* disabled state */ + color: rgba(255,255,255,80); + border: 1px solid rgba(0,0,0,80); + background: none; + } + + #work_area QPushButton:default:pressed, #work_area QPushButton:pressed { + background-color: red; /* FIXME: doesn't seem to match */ + } + + #work_area QPushButton:hover { + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #a5a5a5, stop: 0.7 #4d4d4d, stop: 1 #747474); + color: white; + } + + #work_area QPushButton:default { + border: 1px solid #0e5a00; + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #75ce1f, stop: 0.8 #4d8e0d, stop: 1 #5aa50f); + } + #work_area QPushButton:default:hover { + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #75ce1f, stop: 0.7 #4d8e0d, stop: 1 #7ac52f); + } + +#work_area QProgressBar { + border: 1px solid #444; + border-radius: 2px; + text-align: center; + color: #000000; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #75ce1f, stop: 0.7 #4d8e0d, stop: 1 #7ac52f); + stop: 0 #aaaaaa, stop: 0.4 #ffffff, stop: 1 #ffffff); } - + #work_area QProgressBar:chunk { + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #75ce1f, stop: 0.8 #4d8e0d, stop: 1 #5aa50f); + border: 1px solid #4d8e0d; + } + +/* HELP! :) This ain't working! +#work_area QScrollBar:vertical { + width: 10px; + border: 1px solid grey; + margin: 10px 0 10px 0; + background-color: transparent; +} + + #work_area QScrollBar::handle:vertical { + min-height: 10px; + background-color: rgba(40,255,40,50%); + border: 1px solid grey; + } + + #work_area QScrollBar::add-line:vertical { + border: 2px solid grey; + background: transparent; + height: 10px; + subcontrol-position: top; + subcontrol-origin: margin; + } + + #work_area QScrollBar::sub-line:vertical { + border: 2px solid grey; + background: green; + height: 10px; + subcontrol-position: bottom; + subcontrol-origin: margin; + } + + #work_area QScrollBar::up-arrow:vertical, #work_area QScrollBar::down-arrow:vertical { + border: 2px solid grey; + width: 3px; + height: 3px; + background: white; + } + + #work_area QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { + background-color: transparent; + } +*/ BusyBar { qproperty-frameShape: NoShape; Files old/yast2-theme-2.16.23/openSUSE-Crystal/icons/22x22/apps/yast.png and new/yast2-theme-2.16.24/openSUSE-Crystal/icons/22x22/apps/yast.png differ Files old/yast2-theme-2.16.23/openSUSE-Crystal/icons/32x32/apps/yast.png and new/yast2-theme-2.16.24/openSUSE-Crystal/icons/32x32/apps/yast.png differ Files old/yast2-theme-2.16.23/openSUSE-Crystal/icons/48x48/apps/yast.png and new/yast2-theme-2.16.24/openSUSE-Crystal/icons/48x48/apps/yast.png differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-theme-2.16.23/VERSION new/yast2-theme-2.16.24/VERSION --- old/yast2-theme-2.16.23/VERSION 2008-04-22 18:20:48.000000000 +0200 +++ new/yast2-theme-2.16.24/VERSION 2008-04-28 18:01:00.000000000 +0200 @@ -1 +1 @@ -2.16.23 +2.16.24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-packager
by root＠Hilbert.suse.de 29 Apr '08

29 Apr '08

Hello community, here is the log from the commit of package yast2-packager checked in at Tue Apr 29 11:11:14 CEST 2008. -------- --- yast2-packager/yast2-packager.changes 2008-04-28 17:52:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-04-29 09:23:04.698100000 +0200 @@ -1,0 +2,13 @@ +Tue Apr 29 09:13:08 CEST 2008 - lslezak(a)suse.cz + +- use sizes in kB in the total progressbar in slideshow (progress + bar widget uses 32 bit integers only), fixes "tick" progress + mode when install size is greater than 2GB (bnc#380867) +- 2.16.41 + +------------------------------------------------------------------- +Tue Apr 29 08:49:10 CEST 2008 - coolo(a)suse.de + +- resubmitting package with correct version + +------------------------------------------------------------------- Old: ---- yast2-packager-2.16.39.tar.bz2 New: ---- yast2-packager-2.16.41.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.r28663/_old 2008-04-29 11:10:25.000000000 +0200 +++ /var/tmp/diff_new_pack.r28663/_new 2008-04-29 11:10:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.16.39) +# spec file for package yast2-packager (Version 2.16.41) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,25 +12,25 @@ Name: yast2-packager -Version: 2.16.39 -Release: 3 +Version: 2.16.41 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.16.39.tar.bz2 +Source0: yast2-packager-2.16.41.tar.bz2 Prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml # empty package callbacks BuildRequires: yast2 >= 2.16.52 -# Pkg::PkgMediaPackageSizes() -BuildRequires: yast2-pkg-bindings >= 2.16.29 +# "order" flag for pattern resolvables +BuildRequires: yast2-pkg-bindings >= 2.16.31 # Module: OneClickInstallStandard Requires: perl-XML-Bare yast2-perl-bindings # Newly added RPM Requires: yast2-country-data >= 2.16.3 Requires: yast2-installation >= 2.15.12 -# Pkg::PkgMediaPackageSizes() -Requires: yast2-pkg-bindings >= 2.16.29 +# "order" flag for pattern resolvables +Requires: yast2-pkg-bindings >= 2.16.31 # empty package callbacks Requires: yast2 >= 2.16.52 # unzipping license file @@ -72,7 +72,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.16.39 +%setup -n yast2-packager-2.16.41 %build %{prefix}/bin/y2tool y2autoconf @@ -108,6 +108,13 @@ %{prefix}/lib/YaST2/servers_non_y2/ag_* %doc %{prefix}/share/doc/packages/yast2-packager %changelog +* Tue Apr 29 2008 lslezak(a)suse.cz +- use sizes in kB in the total progressbar in slideshow (progress + bar widget uses 32 bit integers only), fixes "tick" progress + mode when install size is greater than 2GB (bnc#380867) +- 2.16.41 +* Tue Apr 29 2008 coolo(a)suse.de +- resubmitting package with correct version * Mon Apr 28 2008 lslezak(a)suse.cz - sw_single - removed extra UI::CloseDialog() call (bnc#382580), display an error message when installation of a package from ++++++ yast2-packager-2.16.39.tar.bz2 -> yast2-packager-2.16.41.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/aclocal.m4 new/yast2-packager-2.16.41/aclocal.m4 --- old/yast2-packager-2.16.39/aclocal.m4 2008-04-25 18:20:31.000000000 +0200 +++ new/yast2-packager-2.16.41/aclocal.m4 2008-04-29 09:22:22.000000000 +0200 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,15 +11,12 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.61],, -[m4_warning([this file was generated for autoconf 2.61. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +31,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], +m4_if([$1], [1.10], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,10 +47,8 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10])dnl +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -146,13 +141,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 13 +# serial 12 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -257,17 +252,16 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. -_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $_am_arg | $_am_arg:* ) + $1 | $1:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -504,7 +498,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/agents/Makefile.in new/yast2-packager-2.16.41/agents/Makefile.in --- old/yast2-packager-2.16.39/agents/Makefile.in 2008-04-25 18:20:34.000000000 +0200 +++ new/yast2-packager-2.16.41/agents/Makefile.in 2008-04-29 09:22:25.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/config.guess new/yast2-packager-2.16.41/config.guess --- old/yast2-packager-2.16.39/config.guess 2008-04-25 18:20:34.000000000 +0200 +++ new/yast2-packager-2.16.41/config.guess 2008-04-29 09:22:25.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2008-01-08' +timestamp='2006-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -171,7 +171,6 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -340,7 +339,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -542,7 +541,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -791,7 +790,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - *:MINGW*:*) + i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -801,18 +800,12 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -846,17 +839,10 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu - else - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi - fi + echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu @@ -974,9 +960,6 @@ x86_64:Linux:*:*) echo x86_64-${VENDOR}-linux-gnu exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu - exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1235,15 +1218,6 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/config.sub new/yast2-packager-2.16.41/config.sub --- old/yast2-packager-2.16.39/config.sub 2008-04-25 18:20:34.000000000 +0200 +++ new/yast2-packager-2.16.41/config.sub 2008-04-29 09:22:25.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2008-01-16' +timestamp='2006-09-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -245,12 +245,12 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ + | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -369,14 +369,10 @@ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa*-* \ + | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -447,14 +443,6 @@ basic_machine=ns32k-sequent os=-dynix ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; c90) basic_machine=c90-cray os=-unicos @@ -487,8 +475,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) - basic_machine=cr16-unknown + cr16c) + basic_machine=cr16c-unknown os=-elf ;; crds | unos) @@ -680,14 +668,6 @@ basic_machine=m68k-isi os=-sysv ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -703,10 +683,6 @@ basic_machine=i386-pc os=-mingw32 ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; miniframe) basic_machine=m68000-convergent ;; @@ -833,14 +809,6 @@ basic_machine=i860-intel os=-osf ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; pbd) basic_machine=sparc-tti ;; @@ -957,9 +925,6 @@ basic_machine=sh-hitachi os=-hms ;; - sh5el) - basic_machine=sh5le-unknown - ;; sh64) basic_machine=sh64-unknown ;; @@ -1049,10 +1014,6 @@ basic_machine=tic6x-unknown os=-coff ;; - tile*) - basic_machine=tile-unknown - os=-linux-gnu - ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1258,7 +1219,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1453,9 +1414,6 @@ m68*-cisco) os=-aout ;; - mep-*) - os=-elf - ;; mips*-cisco) os=-elf ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/configure new/yast2-packager-2.16.41/configure --- old/yast2-packager-2.16.39/configure 2008-04-25 18:20:33.000000000 +0200 +++ new/yast2-packager-2.16.41/configure 2008-04-29 09:22:24.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.39. +# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.41. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.16.39' -PACKAGE_STRING='yast2-packager 2.16.39' +PACKAGE_VERSION='2.16.41' +PACKAGE_STRING='yast2-packager 2.16.41' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-packager 2.16.39 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.16.41 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.16.39:";; + short | recursive ) echo "Configuration of yast2-packager 2.16.41:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.16.39 +yast2-packager configure 2.16.41 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-packager $as_me 2.16.39, which was +It was created by yast2-packager $as_me 2.16.41, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.16.39' + VERSION='2.16.41' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.16.39" +VERSION="2.16.41" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.16.39, which was +This file was extended by yast2-packager $as_me 2.16.41, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-packager config.status 2.16.39 +yast2-packager config.status 2.16.41 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/configure.in new/yast2-packager-2.16.41/configure.in --- old/yast2-packager-2.16.39/configure.in 2008-04-25 18:20:28.000000000 +0200 +++ new/yast2-packager-2.16.41/configure.in 2008-04-29 09:22:19.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.16.39, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.16.41, http://bugs.opensuse.org/, yast2-packager) 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.16.39" +VERSION="2.16.41" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/doc/autodocs/Makefile.in new/yast2-packager-2.16.41/doc/autodocs/Makefile.in --- old/yast2-packager-2.16.39/doc/autodocs/Makefile.in 2008-04-25 18:20:34.000000000 +0200 +++ new/yast2-packager-2.16.41/doc/autodocs/Makefile.in 2008-04-29 09:22:25.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/doc/Makefile.in new/yast2-packager-2.16.41/doc/Makefile.in --- old/yast2-packager-2.16.39/doc/Makefile.in 2008-04-25 18:20:34.000000000 +0200 +++ new/yast2-packager-2.16.41/doc/Makefile.in 2008-04-29 09:22:25.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -314,8 +314,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -340,8 +340,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -351,12 +351,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/install-sh new/yast2-packager-2.16.41/install-sh --- old/yast2-packager-2.16.39/install-sh 2008-04-25 18:20:34.000000000 +0200 +++ new/yast2-packager-2.16.41/install-sh 2008-04-29 09:22:25.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-12-25.00 +scriptversion=2006-10-14.15 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -48,7 +48,7 @@ # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} +doit="${DOITPROG-}" if test -z "$doit"; then doit_exec=exec else @@ -58,49 +58,34 @@ # Put in absolute file names if you don't have them in your path; # or use environment vars. -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" +posix_glob= posix_mkdir= # Desired mode of installed file. mode=0755 -chgrpcmd= chmodcmd=$chmodprog chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" +chgrpcmd= stripcmd= - +rmcmd="$rmprog -f" +mvcmd="$mvprog" src= dst= dir_arg= -dst_arg= - -copy_on_change=false +dstarg= no_target_directory= -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -110,55 +95,65 @@ In the 4th, create DIRECTORIES. Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG " while test $# -ne 0; do case $1 in - -c) ;; - - -C) copy_on_change=true;; + -c) shift + continue;; - -d) dir_arg=true;; + -d) dir_arg=true + shift + continue;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift + shift + continue;; --help) echo "$usage"; exit $?;; -m) mode=$2 + shift + shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac - shift;; + continue;; -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - shift;; - - -T) no_target_directory=true;; + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; --version) echo "$0 $scriptversion"; exit $?;; @@ -170,22 +165,21 @@ *) break;; esac - shift done -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then +if test $# -ne 0 && test -z "$dir_arg$dstarg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do - if test -n "$dst_arg"; then + if test -n "$dstarg"; then # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" + set fnord "$@" "$dstarg" shift # fnord fi shift # arg - dst_arg=$arg + dstarg=$arg done fi @@ -230,7 +224,7 @@ do # Protect names starting with `-'. case $src in - -*) src=./$src;; + -*) src=./$src ;; esac if test -n "$dir_arg"; then @@ -248,22 +242,22 @@ exit 1 fi - if test -z "$dst_arg"; then + if test -z "$dstarg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg + dst=$dstarg # Protect names starting with `-'. case $dst in - -*) dst=./$dst;; + -*) dst=./$dst ;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 + echo "$0: $dstarg: Is a directory" >&2 exit 1 fi dstdir=$dst @@ -384,19 +378,26 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - -*) prefix='./';; - *) prefix='';; + /*) prefix=/ ;; + -*) prefix=./ ;; + *) prefix= ;; esac - eval "$initialize_posix_glob" + case $posix_glob in + '') + if (set -f) 2>/dev/null; then + posix_glob=true + else + posix_glob=false + fi ;; + esac oIFS=$IFS IFS=/ - $posix_glob set -f + $posix_glob && set -f set fnord $dstdir shift - $posix_glob set +f + $posix_glob && set +f IFS=$oIFS prefixes= @@ -458,54 +459,41 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dst"; then + $doit $rmcmd -f "$dst" 2>/dev/null \ + || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ + && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ + || { + echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + } || exit 1 trap '' 0 fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/Makefile.in new/yast2-packager-2.16.41/Makefile.in --- old/yast2-packager-2.16.39/Makefile.in 2008-04-25 18:20:35.000000000 +0200 +++ new/yast2-packager-2.16.41/Makefile.in 2008-04-29 09:22:26.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -389,8 +389,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -415,8 +415,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -426,12 +426,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -504,10 +505,6 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -534,8 +531,6 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -692,10 +687,10 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \ - distclean distclean-generic distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ + dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ install-data-local install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ install-info-am install-man install-pdf install-pdf-am \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/src/clients/Makefile.in new/yast2-packager-2.16.41/src/clients/Makefile.in --- old/yast2-packager-2.16.39/src/clients/Makefile.in 2008-04-25 18:20:34.000000000 +0200 +++ new/yast2-packager-2.16.41/src/clients/Makefile.in 2008-04-29 09:22:25.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/src/clients/sw_single.ycp new/yast2-packager-2.16.41/src/clients/sw_single.ycp --- old/yast2-packager-2.16.39/src/clients/sw_single.ycp 2008-03-15 03:10:53.000000000 +0100 +++ new/yast2-packager-2.16.41/src/clients/sw_single.ycp 2008-04-28 17:26:13.000000000 +0200 @@ -7,7 +7,7 @@ * Purpose: contains dialog loop for workflows: * "Install/Remove software" * - * $Id: sw_single.ycp 45463 2008-03-14 14:00:04Z lslezak $ + * $Id: sw_single.ycp 47125 2008-04-28 15:26:12Z lslezak $ */ { @@ -157,7 +157,19 @@ if (SCR::Read (.target.size, package) > 0) { y2milestone ("SW_SINGLE: installing %1", package); - Pkg::TargetInstall (package); + boolean installed = Pkg::TargetInstall (package); + + if (!installed) + { + // Error message: + // %1 = package name (may include complete RPM file name) + // %2 = error message + Report::Error(sformat(_("Package %1 could not be installed. + +Details: +%2 +"), package, Pkg::LastError())); + } } else { @@ -334,7 +346,6 @@ || (result == `failed)) { UI::CloseDialog(); - UI::CloseDialog(); return `next; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/src/config/Makefile.in new/yast2-packager-2.16.41/src/config/Makefile.in --- old/yast2-packager-2.16.39/src/config/Makefile.in 2008-04-25 18:20:34.000000000 +0200 +++ new/yast2-packager-2.16.41/src/config/Makefile.in 2008-04-29 09:22:25.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/src/include/checkmedia/Makefile.in new/yast2-packager-2.16.41/src/include/checkmedia/Makefile.in --- old/yast2-packager-2.16.39/src/include/checkmedia/Makefile.in 2008-04-25 18:20:34.000000000 +0200 +++ new/yast2-packager-2.16.41/src/include/checkmedia/Makefile.in 2008-04-29 09:22:25.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/src/include/Makefile.in new/yast2-packager-2.16.41/src/include/Makefile.in --- old/yast2-packager-2.16.39/src/include/Makefile.in 2008-04-25 18:20:34.000000000 +0200 +++ new/yast2-packager-2.16.41/src/include/Makefile.in 2008-04-29 09:22:25.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -317,8 +317,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -343,8 +343,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -354,12 +354,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/src/Makefile.in new/yast2-packager-2.16.41/src/Makefile.in --- old/yast2-packager-2.16.39/src/Makefile.in 2008-04-25 18:20:34.000000000 +0200 +++ new/yast2-packager-2.16.41/src/Makefile.in 2008-04-29 09:22:25.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -283,8 +283,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -309,8 +309,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -320,12 +320,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/src/modules/DefaultDesktop.ycp new/yast2-packager-2.16.41/src/modules/DefaultDesktop.ycp --- old/yast2-packager-2.16.39/src/modules/DefaultDesktop.ycp 2008-04-25 11:54:25.000000000 +0200 +++ new/yast2-packager-2.16.41/src/modules/DefaultDesktop.ycp 2008-04-28 18:06:51.000000000 +0200 @@ -20,6 +20,10 @@ // @see GetAllDesktopsMap map <string, map> all_desktops = $[ "gnome" : $[ + "desktop" : "gnome", + "logon" : "gdm", + "cursor" : "DMZ", + "packages" : ["gdm"], "order" : 1, // TRANSLATORS: Dialog label "label" : _("GNOME"), @@ -29,6 +33,11 @@ It combines stability and maturity with incremental innovations."), ], "kde" : $[ + // bnc #381821 + "desktop" : "startkde4", + "logon" : "kdm4", + "cursor" : "DMZ", + "packages" : ["kde4-kdm"], "order" : 1, // TRANSLATORS: Dialog label "label" : _("KDE 4.0"), @@ -38,15 +47,25 @@ new KDE technologies, but it is less mature than the other desktops."), ], "kde3" : $[ + // bnc #381821 + "desktop" : "startkde3", + "logon" : "kdm3", + "cursor" : "DMZ", + "packages" : ["kdebase3-kdm"], "order" : 1, // TRANSLATORS: Dialog label "label" : _("KDE 3.5"), "patterns" : ["kde3", "x11", "base"], "icon" : "pattern-kde", - "description" : _("KDE 3.5 is the previous generation of K Desktop Environment. + "description" : _("KDE 3.5 is the previous generation of the K Desktop Environment. It is mature and stable."), ], "xfce" : $[ + // bnc #298558 + "desktop" : "startxfce4", + "logon" : "xdm", + "cursor" : "DMZ", + "packages" : ["xfce4-desktop"], "order" : 4, // TRANSLATORS: Dialog label "label" : _("XFCE Desktop"), @@ -54,6 +73,10 @@ "icon" : "pattern-xfce", ], "min_x" : $[ + "desktop" : "twm", + "logon" : "xdm", + "cursor" : "DMZ", + "packages" : ["xorg-x11"], "order" : 6, // TRANSLATORS: Dialog label "label" : _("Minimal X Window"), @@ -61,6 +84,10 @@ "icon" : "yast-x11", ], "textmode" : $[ + "desktop" : "twm", + "logon" : "xdm", + "cursor" : "DMZ", + "packages" : ["xorg-x11"], "order" : 8, // TRANSLATORS: Dialog label "label" : _("Minimal Server Selection (Text Mode)"), @@ -76,11 +103,12 @@ * * @struct $[ * "desktop ID" : $[ + * "desktop" : "desktop to start", // DEFAULT_WM * "order" : integer, * "label" : _("Desktop Name Visible in Dialog"), * "description" : _("Description text of the desktop"), * "patterns" : ["list", "of", "related", "patterns"], - * "icon" : "some-icon", // filename from the 32x32 directory of the current theme (without .png suffix) + * "icon" : "some-icon", // filename from the 64x64 directory of the current theme (without .png suffix) * ], * ] */ @@ -131,24 +159,15 @@ /** * Desktop which was selected in the desktop selection dialog - * "kde", "gnome", "min_x11", "text" + * "kde", "kde3", "gnome", "xfce", "min_x", "textmode", nil */ string desktop = nil; -/** - * Window manager to be set according to selected desktop - */ -map<string,string> desktop2wm = $[ - "gnome" : "gnome", - "kde" : "kde", - "xfce" : "twm", - "min_x" : "twm", - "textmode" : "twm", -]; + /** * Get the currently set default desktop, nil if none set - * @return string "kde", "gnome", "xfce", "min_x", "textmode", nil + * @return string "kde", "kde3", "gnome", "xfce", "min_x", "textmode", nil */ global string Desktop () { return desktop; @@ -170,7 +189,7 @@ * @return string preffered window/desktop manager, empty if no one */ global string PrefferedWindowManager () { - return desktop2wm[desktop]:""; + return all_desktops[desktop,"desktop"]:""; } /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/src/modules/Makefile.in new/yast2-packager-2.16.41/src/modules/Makefile.in --- old/yast2-packager-2.16.39/src/modules/Makefile.in 2008-04-25 18:20:34.000000000 +0200 +++ new/yast2-packager-2.16.41/src/modules/Makefile.in 2008-04-29 09:22:25.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/src/modules/Packages.ycp new/yast2-packager-2.16.41/src/modules/Packages.ycp --- old/yast2-packager-2.16.39/src/modules/Packages.ycp 2008-04-23 15:55:28.000000000 +0200 +++ new/yast2-packager-2.16.41/src/modules/Packages.ycp 2008-04-28 17:26:13.000000000 +0200 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Packages.ycp 46985 2008-04-23 13:17:53Z lslezak $ + * $Id: Packages.ycp 47125 2008-04-28 15:26:12Z lslezak $ */ { @@ -131,6 +131,24 @@ selected = filter (map<string,any> r, selected, { return r["user_visible"]:nil == true; }); + + // order patterns according to "order" flag + selected = sort(map<string,any> x, map<string,any> y, selected, + { + integer xo = tointeger(x["order"]:""); + integer yo = tointeger(y["order"]:""); + + if (xo == nil || yo == nil) + { + // order is not an integer, compare as strings + return x["order"]:"" < y["order"]:""; + } + else + { + return xo < yo; + } + } + ); } selected = filter (map<string,any> r, selected, { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/src/modules/SlideShow.ycp new/yast2-packager-2.16.41/src/modules/SlideShow.ycp --- old/yast2-packager-2.16.39/src/modules/SlideShow.ycp 2008-04-23 15:55:28.000000000 +0200 +++ new/yast2-packager-2.16.41/src/modules/SlideShow.ycp 2008-04-29 09:21:56.000000000 +0200 @@ -5,7 +5,7 @@ * * Author: Stefan Hundhammer <sh(a)suse.de> * - * $Id: SlideShow.ycp 46985 2008-04-23 13:17:53Z lslezak $ + * $Id: SlideShow.ycp 47146 2008-04-29 07:21:56Z lslezak $ * */ { @@ -1236,7 +1236,8 @@ if ( UI::WidgetExists(`progressTotal ) ) { - UI::ChangeWidget(`progressTotal, `Value, TotalInstalledSize() ); + // progress is in kB + UI::ChangeWidget(`progressTotal, `Value, TotalInstalledSize() >> 10); UI::ChangeWidget(`progressTotal, `Label, GetProgressLabel() ); } @@ -1477,7 +1478,8 @@ page_contents ), // Progress bar for overall progress of software package installation `ProgressBar(`id(`progressTotal ), GetProgressLabel(), - total_size_to_install, TotalInstalledSize() ) + // progress is in kB due to 32 bit UI limit + total_size_to_install >> 10, TotalInstalledSize() >> 10) // intentionally omitting `Label(`nextMedia) - // too much flicker upon update (UI::RecalcLayout() ) on NCurses ), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/testsuite/Makefile.in new/yast2-packager-2.16.41/testsuite/Makefile.in --- old/yast2-packager-2.16.39/testsuite/Makefile.in 2008-04-25 18:20:34.000000000 +0200 +++ new/yast2-packager-2.16.41/testsuite/Makefile.in 2008-04-29 09:22:25.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.39/VERSION new/yast2-packager-2.16.41/VERSION --- old/yast2-packager-2.16.39/VERSION 2008-04-25 18:15:58.000000000 +0200 +++ new/yast2-packager-2.16.41/VERSION 2008-04-29 09:17:14.000000000 +0200 @@ -1 +1 @@ -2.16.39 +2.16.41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ncurses
by root＠Hilbert.suse.de 29 Apr '08

29 Apr '08

Hello community, here is the log from the commit of package yast2-ncurses checked in at Tue Apr 29 11:10:07 CEST 2008. -------- --- yast2-ncurses/yast2-ncurses.changes 2008-04-12 09:16:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2008-04-16 09:44:20.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 15:39:14 CEST 2008 - tgoettlicher(a)suse.de + +- fixed keyboard shortcuts in popup menu (bnc #377098) +- V 2.16.25 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.16.24.tar.bz2 New: ---- yast2-ncurses-2.16.25.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.y23637/_old 2008-04-29 11:06:59.000000000 +0200 +++ /var/tmp/diff_new_pack.y23637/_new 2008-04-29 11:06:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.16.24) +# spec file for package yast2-ncurses (Version 2.16.25) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-ncurses -Version: 2.16.24 +Version: 2.16.25 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.16.24.tar.bz2 +Source0: yast2-ncurses-2.16.25.tar.bz2 Prefix: /usr BuildRequires: dejagnu doxygen gcc-c++ yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel @@ -49,7 +49,7 @@ %prep -%setup -n yast2-ncurses-2.16.24 +%setup -n yast2-ncurses-2.16.25 %build %{prefix}/bin/y2tool y2autoconf @@ -83,6 +83,9 @@ %{prefix}/include/YaST2/ncurses/ %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog +* Tue Apr 15 2008 tgoettlicher(a)suse.de +- fixed keyboard shortcuts in popup menu (bnc #377098) +- V 2.16.25 * Sat Apr 12 2008 coolo(a)suse.de - compile with latest ncurses - V 2.16.24 ++++++ yast2-ncurses-2.16.24.tar.bz2 -> yast2-ncurses-2.16.25.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.16.24/configure new/yast2-ncurses-2.16.25/configure --- old/yast2-ncurses-2.16.24/configure 2008-04-12 09:16:15.000000000 +0200 +++ new/yast2-ncurses-2.16.25/configure 2008-04-16 09:44:09.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-ncurses 2.16.24. +# Generated by GNU Autoconf 2.61 for yast2-ncurses 2.16.25. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ncurses' PACKAGE_TARNAME='yast2-ncurses' -PACKAGE_VERSION='2.16.24' -PACKAGE_STRING='yast2-ncurses 2.16.24' +PACKAGE_VERSION='2.16.25' +PACKAGE_STRING='yast2-ncurses 2.16.25' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1435,7 +1435,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-ncurses 2.16.24 to adapt to many kinds of systems. +\`configure' configures yast2-ncurses 2.16.25 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1506,7 +1506,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ncurses 2.16.24:";; + short | recursive ) echo "Configuration of yast2-ncurses 2.16.25:";; esac cat <<\_ACEOF @@ -1612,7 +1612,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ncurses configure 2.16.24 +yast2-ncurses configure 2.16.25 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1626,7 +1626,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-ncurses $as_me 2.16.24, which was +It was created by yast2-ncurses $as_me 2.16.25, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2447,7 +2447,7 @@ # Define the identity of the package. PACKAGE='yast2-ncurses' - VERSION='2.16.24' + VERSION='2.16.25' cat >>confdefs.h <<_ACEOF @@ -2675,7 +2675,7 @@ -VERSION="2.16.24" +VERSION="2.16.25" RPMNAME="yast2-ncurses" MAINTAINER="Stefan Hundhammer <sh(a)suse.de>" @@ -21351,7 +21351,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ncurses $as_me 2.16.24, which was +This file was extended by yast2-ncurses $as_me 2.16.25, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21404,7 +21404,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-ncurses config.status 2.16.24 +yast2-ncurses config.status 2.16.25 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.16.24/configure.in new/yast2-ncurses-2.16.25/configure.in --- old/yast2-ncurses-2.16.24/configure.in 2008-04-12 09:16:01.000000000 +0200 +++ new/yast2-ncurses-2.16.25/configure.in 2008-04-16 09:43:59.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses, 2.16.24, http://bugs.opensuse.org/, yast2-ncurses) +AC_INIT(yast2-ncurses, 2.16.25, http://bugs.opensuse.org/, yast2-ncurses) 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.16.24" +VERSION="2.16.25" RPMNAME="yast2-ncurses" MAINTAINER="Stefan Hundhammer <sh(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.16.24/src/NCPopupTable.cc new/yast2-ncurses-2.16.25/src/NCPopupTable.cc --- old/yast2-ncurses-2.16.24/src/NCPopupTable.cc 2008-04-07 18:46:25.000000000 +0200 +++ new/yast2-ncurses-2.16.25/src/NCPopupTable.cc 2008-04-15 15:17:46.000000000 +0200 @@ -55,6 +55,7 @@ sellist->SetHotCol( 0 ); sellist->setNotify( true ); + } @@ -65,6 +66,11 @@ return; sellist->addItem( yitem ); + + // Calling sellist->addItem() resets the hotcol because + // NCTableStyle's constructor sets hotcol to -1. + // Set hot coll again: + sellist->SetHotCol( 0 ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.16.24/VERSION new/yast2-ncurses-2.16.25/VERSION --- old/yast2-ncurses-2.16.24/VERSION 2008-04-12 09:15:47.000000000 +0200 +++ new/yast2-ncurses-2.16.25/VERSION 2008-04-15 15:17:46.000000000 +0200 @@ -1 +1 @@ -2.16.24 +2.16.25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tomboy
by root＠Hilbert.suse.de 28 Apr '08

28 Apr '08

Hello community, here is the log from the commit of package tomboy checked in at Tue Apr 29 01:36:39 CEST 2008. -------- --- GNOME/tomboy/tomboy.changes 2008-04-08 16:16:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/tomboy/tomboy.changes 2008-04-29 00:09:31.348923000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 29 00:07:04 CEST 2008 - ajorgensen(a)novell.com + +- Remove Mono.Addins.* and all tomboy addins assemblies from provides + Partially fixes bnc#381750 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomboy.spec ++++++ --- /var/tmp/diff_new_pack.vPK946/_old 2008-04-29 01:36:33.000000000 +0200 +++ /var/tmp/diff_new_pack.vPK946/_new 2008-04-29 01:36:33.000000000 +0200 @@ -17,7 +17,7 @@ Group: Productivity/Office/Other Requires: mono Version: 0.10.0 -Release: 1 +Release: 10 Summary: GNOME Note Taking Application Url: http://www.beatniksoftware.com/tomboy/ Source: %{name}-%{version}.tar.bz2 @@ -124,8 +124,12 @@ %{_datadir}/omf/tomboy/tomboy* %files lang -f %{name}.lang +%define __find_provides env sh -c 'filelist=($(grep -v -E "%{_libdir}/%{name}/addins|Mono.Addins")) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' %changelog +* Tue Apr 29 2008 ajorgensen(a)novell.com +- Remove Mono.Addins.* and all tomboy addins assemblies from provides + Partially fixes bnc#381750 * Thu Apr 03 2008 hpj(a)suse.de - Upgrade to version 0.10.0: * Fix icon sizes and install locations (bgo#507239). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit f-spot
by root＠Hilbert.suse.de 28 Apr '08

28 Apr '08

Hello community, here is the log from the commit of package f-spot checked in at Tue Apr 29 01:36:21 CEST 2008. -------- --- GNOME/f-spot/f-spot.changes 2008-04-15 21:01:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/f-spot/f-spot.changes 2008-04-29 00:42:22.025278000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 29 00:45:46 CEST 2008 - ajorgensen(a)novell.com + +- Remove Mono.Addins.* and all f-spot extensions assemblies from provides + Partially fixes bnc#381750 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ f-spot.spec ++++++ --- /var/tmp/diff_new_pack.L32152/_old 2008-04-29 01:36:10.000000000 +0200 +++ /var/tmp/diff_new_pack.L32152/_new 2008-04-29 01:36:10.000000000 +0200 @@ -23,7 +23,7 @@ AutoReqProv: on Requires: dcraw Version: 0.4.2+r3834 -Release: 3 +Release: 11 Summary: GNOME Photo Management Application Url: http://www.gnome.org/projects/f-spot/ # Source: %{name}-%{version}.tar.bz2 @@ -108,8 +108,12 @@ %{_prefix}/lib/gnome-screensaver/gnome-screensaver/* %files lang -f %{name}.lang +%define __find_provides env sh -c 'filelist=($(grep -v -E "%{_libdir}/%{name}/extensions|Mono.Addins")) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' %changelog +* Tue Apr 29 2008 ajorgensen(a)novell.com +- Remove Mono.Addins.* and all f-spot extensions assemblies from provides + Partially fixes bnc#381750 * Tue Apr 15 2008 maw(a)suse.de - Rename f-spot-gthtml-checks.patch to f-spot-gtkhtml-checks.patch. * Tue Apr 15 2008 maw(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_6_0-openjdk
by root＠Hilbert.suse.de 28 Apr '08

28 Apr '08

Hello community, here is the log from the commit of package java-1_6_0-openjdk checked in at Tue Apr 29 00:27:43 CEST 2008. -------- --- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2008-04-26 01:31:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2008-04-29 00:21:59.632189000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 29 00:21:46 CEST 2008 - ro(a)suse.de + +- switch to openjdk-bootstrap for i386,ppc,x86_64 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.d24821/_old 2008-04-29 00:27:26.000000000 +0200 +++ /var/tmp/diff_new_pack.d24821/_new 2008-04-29 00:27:26.000000000 +0200 @@ -48,7 +48,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # Bootstrapping using gcj doesn't work in openSUSE so far, OpenJDK needs java-1.6: %define gcjbootstrap 0 -%ifarch ia64 s390 +%ifarch i386 ia64 ppc s390 x86_64 %define openjdk_bootstrap 1 %else %define openjdk_bootstrap 0 @@ -731,6 +731,8 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Tue Apr 29 2008 ro(a)suse.de +- switch to openjdk-bootstrap for i386,ppc,x86_64 * Fri Apr 25 2008 bk(a)suse.de - Fix build and add macros to make it easyer to build on SUSE 10.3 * Tue Apr 22 2008 bk(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yelp
by root＠Hilbert.suse.de 28 Apr '08

28 Apr '08

Hello community, here is the log from the commit of package yelp checked in at Tue Apr 29 00:02:05 CEST 2008. -------- --- GNOME/yelp/yelp.changes 2008-04-23 21:41:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/yelp/yelp.changes 2008-04-28 19:58:45.275573000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 28 20:03:34 CEST 2008 - maw(a)suse.de + +- Add yelp-xulrunner190.patch, to enable building against + mozilla-xulrunner190. + +------------------------------------------------------------------- New: ---- yelp-xulrunner190.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yelp.spec ++++++ --- /var/tmp/diff_new_pack.U18373/_old 2008-04-29 00:01:56.000000000 +0200 +++ /var/tmp/diff_new_pack.U18373/_new 2008-04-29 00:01:56.000000000 +0200 @@ -12,13 +12,13 @@ Name: yelp -%define xulrunner_version 181 +%define xulrunner_version 190 BuildRequires: fdupes gcc-c++ gnome-common gnome-doc-utils-devel gnome-menus-devel intltool libbeagle-devel libglade2-devel libgnomeui-devel libxslt-devel perl-XML-Parser rarian-devel startup-notification-devel susehelp update-desktop-files Requires: gnome-utils susehelp License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME Version: 2.22.1 -Release: 7 +Release: 10 Summary: The GNOME 2.x Desktop Help Browser Source: ftp://ftp.gnome.org/pub/GNOME/sources/yelp/2.12/%{name}-%{version}.tar.bz2 Source1: help-title.png @@ -31,6 +31,8 @@ Patch6: yelp-2.13.5-use-susehelp.patch # PATCH-FEATURE-OPENSUSE yelp-handle-help-uri.patch vuntz(a)novell.com -- handle help: URI Patch9: yelp-handle-help-uri.patch +# PATCH-FIX-UPSTREAM yelp-xulrunner190.patch maw(a)novell.com -- Taken from http://patches.ubuntu.com/by-release/extracted/ubuntu/y/yelp/2.22.0-0ubuntu…, modified so that it actually builds +Patch10: yelp-xulrunner190.patch PreReq: filesystem gconf2 Requires: gnome-doc-utils Requires: libbeagle >= 0.2.0 @@ -65,6 +67,7 @@ %patch5 %patch6 -p1 %patch9 -p1 +%patch10 -p0 # Use nds for Low Saxon (Northern Frisian Enclave) # Northern Frisian Enclave is not ISO-3166 country code: rename nds@NFE nds po/nds(a)NFE.* @@ -104,6 +107,9 @@ %files lang -f %{name}.lang %changelog +* Mon Apr 28 2008 maw(a)suse.de +- Add yelp-xulrunner190.patch, to enable building against + mozilla-xulrunner190. * Wed Apr 23 2008 vuntz(a)suse.de - Drop two patches that needed rebasing: yelp-suse-20060319.patch and yelp-2.14.0-process-suse-manuals.patch. The first one ++++++ yelp-xulrunner190.patch ++++++ === modified file 'configure.in' --- configure.in 2008-04-28 19:42:36 +0000 +++ configure.in 2008-04-28 20:24:34 +0000 @@ -77,6 +77,7 @@ libxslt >= 1.1.4 libexslt >= 0.8.1 libstartup-notification-1.0 >= 0.8 + nspr >= 4.7.1 dbus-glib-1 rarian >= 0.7.0 ]) @@ -190,11 +191,17 @@ case "$MOZILLA" in xulrunner) gecko_min_version=1.8 ;; +libxul-embedding) gecko_min_version=1.9 ;; *firefox) gecko_min_version=1.5 ;; *) AC_MSG_ERROR([$gecko_cv_gecko is not supported]) esac -PKG_CHECK_MODULES([MOZILLA_COMPONENT],[${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies]) +if test $MOZILLA = libxul-embedding; then + PKG_CHECK_MODULES([MOZILLA_COMPONENT],[libxul-embedding $gecko_cv_extra_pkg_dependencies]) + MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS `$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`" +else + PKG_CHECK_MODULES([MOZILLA_COMPONENT],[${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies]) +fi dnl ==================================== dnl = zlib for help converters === modified file 'm4/gecko.m4' --- m4/gecko.m4 2008-04-28 19:42:36 +0000 +++ m4/gecko.m4 2008-04-28 19:44:08 +0000 @@ -51,7 +51,7 @@ AC_MSG_CHECKING([which gecko to use]) AC_ARG_WITH([gecko], - AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner@:>@], + AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul-embedding@:>@], [Which gecko engine to use (autodetected by default)])) # Backward compat @@ -60,12 +60,15 @@ gecko_cv_gecko=$with_gecko # Autodetect gecko -_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla" +_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding" if test -z "$gecko_cv_gecko"; then for lizard in $_geckos; do if $PKG_CONFIG --exists $lizard-xpcom; then gecko_cv_gecko=$lizard break; + elif $PKG_CONFIG --exists $lizard; then + gecko_cv_gecko=$lizard + break; fi done fi @@ -93,13 +96,22 @@ seamonkey) gecko_cv_gecko_flavour=mozilla ;; *firefox) gecko_cv_gecko_flavour=toolkit ;; xulrunner) gecko_cv_gecko_flavour=toolkit ;; +libxul-embedding) gecko_cv_gecko_flavour=toolkit ;; esac -_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" -_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" -_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" -_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" - +if $PKG_CONFIG --exists ${gecko_cv_gecko}-xpcom; then + _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" + _GECKO_CFLAGS="-I$GECKO_INCLUDE_ROOT" + _GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" + _GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" + _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" +else + _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable" + _GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`" + _GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin" + _GECKO_HOME=# NO HOME + _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`" +fi fi # if gecko_cv_have_gecko if test "$gecko_cv_gecko_flavour" = "toolkit"; then @@ -111,6 +123,7 @@ $1[]=$gecko_cv_gecko $1[]_FLAVOUR=$gecko_cv_gecko_flavour $1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT +$1[]_CFLAGS=$_GECKO_CFLAGS $1[]_LIBDIR=$_GECKO_LIBDIR $1[]_HOME=$_GECKO_HOME $1[]_PREFIX=$_GECKO_PREFIX @@ -184,7 +197,7 @@ AC_LANG_PUSH([C++]) _SAVE_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT" +CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS" AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]]) AC_RUN_IFELSE( @@ -209,8 +222,10 @@ AC_COMPILE_IFELSE( [AC_LANG_SOURCE( [[#include <mozilla-config.h> + #if !defined(MOZ_STORAGE) #if !defined(MOZ_REFLOW_PERF) || !defined(MOZ_REFLOW_PERF_DSP) #error No + #endif #endif]] )], [gecko_cv_have_debug=yes], @@ -241,7 +256,7 @@ AC_LANG_PUSH([C++]) _SAVE_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT" +CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS" AC_CACHE_CHECK([for gecko version], [gecko_cv_gecko_version], @@ -328,8 +343,8 @@ gecko_cv_extra_pkg_dependencies= if test "$gecko_cv_gecko_version_int" -ge "1009000"; then - gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul" - gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue_s" +# gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul" + gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue" else gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed" fi @@ -359,10 +374,20 @@ _SAVE_CXXFLAGS="$CXXFLAGS" _SAVE_LDFLAGS="$LDFLAGS" _SAVE_LIBS="$LIBS" -CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" -CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" -LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" -LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" +if test "${gecko_cv_gecko}" = "libxul-embedding"; then + CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})" + CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})" + LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl" +else + CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xapcom)" + CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xapcom)" + LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" +fi +if test -n "$_GECKO_HOME"; then + LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +else + LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" +fi _GECKO_DISPATCH_INCLUDEDIRS="$2" @@ -371,9 +396,11 @@ # Mind you, it's useful to be able to test against uninstalled mozilla builds... _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" -# Now add them to CPPFLAGS +# Now add them to CPPFLAGS - well ... not anymore since 1.9 -> test whether they exist before adding. for i in $_GECKO_DISPATCH_INCLUDEDIRS; do - CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" + if test -d "$_GECKO_INCLUDE_ROOT/$i"; then + CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" + fi done m4_indir([$1],m4_shiftn(2,$@)) @@ -426,11 +453,17 @@ #include <mozilla-config.h> #include <stdlib.h> #include <stdio.h> + +#ifdef XPCOM_GLUE +#include <nsXPCOMGlue.h> +#else #include <nsXPCOM.h> +#endif // XPCOM_GLUE + #include <nsCOMPtr.h> #include <nsILocalFile.h> #include <nsIServiceManager.h> -#ifdef HAVE_GECKO_1_8 +#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9) #include <nsStringAPI.h> #else #include <nsString.h> @@ -438,16 +471,37 @@ ]] [$1], [[ + +nsresult rv; +#ifdef XPCOM_GLUE + static const GREVersionRange greVersion = { + "1.8", PR_TRUE, + "2", PR_TRUE + }; + char xpcomLocation[4096]; + rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); + if (NS_FAILED(rv)) { + exit(123); + } + + // Startup the XPCOM Glue that links us up with XPCOM. + XPCOMGlueStartup(xpcomLocation); + if (NS_FAILED(rv)) { + exit(124); + } +#endif // XPCOM_GLUE + // redirect unwanted mozilla debug output to the bit bucket freopen ("/dev/null", "w", stdout); -nsresult rv; -nsCOMPtr<nsILocalFile> directory; +nsCOMPtr<nsILocalFile> directory = nsnull; +#ifndef XPCOM_GLUE rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE, getter_AddRefs (directory)); if (NS_FAILED (rv) || !directory) { exit (126); } +#endif rv = NS_InitXPCOM2 (nsnull, directory, nsnull); if (NS_FAILED (rv)) { @@ -595,23 +649,31 @@ AC_DEFUN([GECKO_XPIDL], [AC_REQUIRE([GECKO_INIT])dnl -_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +if test ${gecko_cv_gecko} = "libxul-embedding"; then + _GECKO_LIBDIR="`$PKG_CONFIG pkg-config --variable=sdkdir ${gecko_cv_gecko}`/bin" +else + _GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +fi AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH]) +if test ${gecko_cv_gecko} = "libxul-embedding"; then +XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}`" +else XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`" +fi # Older geckos don't have this variable, see # https://bugzilla.mozilla.org/show_bug.cgi?id=240473 -if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then - XPIDL_IDLDIR="`echo $_GECKO_LIBDIR | sed -e s!lib!share/idl!`" -fi - -# Some distributions (Gentoo) have it in unusual places - -if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then - XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl" +if test ${gecko_cv_gecko} != "libxul-embedding"; then + if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then + XPIDL_IDLDIR="`echo $_GECKO_LIBDIR | sed -e s!lib!share/idl!`" + fi + # Some distributions (Gentoo) have it in unusual places + if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then + XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl" + fi fi if test "$XPIDL" != "no" -a -n "$XPIDL_IDLDIR" -a -f "$XPIDL_IDLDIR/nsISupports.idl"; then === modified file 'src/Makefile.am' --- src/Makefile.am 2008-04-28 19:43:13 +0000 +++ src/Makefile.am 2008-04-28 19:44:08 +0000 @@ -65,10 +65,12 @@ yelp_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir)/src \ - $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \ $(YELP_DEFINES) \ $(AM_CPPFLAGS) +yelp_CPPFLAGS += $(MOZILLA_COMPONENT_CFLAGS) +yelp_CPPFLAGS += $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) + yelp_CFLAGS = \ $(YELP_CFLAGS) \ $(YELP_SEARCH_CFLAGS) \ @@ -92,7 +94,7 @@ $(MOZILLA_EXTRA_LIBS) \ $(MOZILLA_GLUE_LIBS) -yelp_LDFLAGS = -R$(MOZILLA_HOME) $(AM_LDFLAGS) +yelp_LDFLAGS = $(AM_LDFLAGS) #check_PROGRAMS = \ # test-document \ === modified file 'src/yelp-gecko-services.cpp' --- src/yelp-gecko-services.cpp 2008-04-28 19:42:36 +0000 +++ src/yelp-gecko-services.cpp 2008-04-28 19:44:08 +0000 @@ -21,7 +21,7 @@ */ #include <mozilla-config.h> -#include "config.h" +#include <config.h> #include <stdlib.h> #include <unistd.h> @@ -30,12 +30,18 @@ #include <nsCOMPtr.h> #include <nsIComponentManager.h> +#include <nsComponentManagerUtils.h> #include <nsIComponentRegistrar.h> #include <nsIGenericFactory.h> #include <nsILocalFile.h> #include <nsIPrintSettings.h> #include <nsServiceManagerUtils.h> + +#ifdef XPCOM_GLUE +#include <nsXPCOMGlue.h> +#else #include <nsXPCOM.h> +#endif #include "yelp-gecko-services.h" @@ -298,7 +304,6 @@ target->SetPrintInColor (gtk_print_settings_get_use_color (settings->config)); target->SetPaperSizeUnit(nsIPrintSettings::kPaperSizeMillimeters); - target->SetPaperSize (nsIPrintSettings::kPaperSizeDefined); GtkPaperSize *paperSize = gtk_page_setup_get_paper_size (settings->setup); if (!paperSize) { @@ -437,15 +442,16 @@ NS_ENSURE_SUCCESS (rv, ); nsCOMPtr<nsIGenericFactory> componentFactory; - rv = NS_NewGenericFactory(getter_AddRefs(componentFactory), - &(sAppComps[0])); - + componentFactory = do_CreateInstance ("@mozilla.org/generic-factory;1", &rv); + if (NS_FAILED(rv) || !componentFactory) { g_warning ("Failed to make a factory for %s\n", sAppComps[0].mDescription); return; } + componentFactory->SetComponentInfo(&(sAppComps[0])); + rv = cr->RegisterFactory(sAppComps[0].mCID, sAppComps[0].mDescription, sAppComps[0].mContractID, === modified file 'src/yelp-gecko-utils.cpp' --- src/yelp-gecko-utils.cpp 2008-04-28 19:42:36 +0000 +++ src/yelp-gecko-utils.cpp 2008-04-28 19:44:08 +0000 @@ -27,6 +27,8 @@ #include <nsStringAPI.h> +#include <gtkmozembed_glue.cpp> + #include <gtkmozembed.h> #include <gtkmozembed_internal.h> #include <nsCOMPtr.h> @@ -205,18 +207,45 @@ #ifdef HAVE_GECKO_1_9 NS_LogInit (); #endif - + + nsresult rv; +#ifdef XPCOM_GLUE + static const GREVersionRange greVersion = { + "1.9a", PR_TRUE, + "2", PR_TRUE + }; + char xpcomLocation[4096]; + rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); + NS_ENSURE_SUCCESS (rv, rv); + + // Startup the XPCOM Glue that links us up with XPCOM. + rv = XPCOMGlueStartup(xpcomLocation); + NS_ENSURE_SUCCESS (rv, rv); + + rv = GTKEmbedGlueStartup(); + NS_ENSURE_SUCCESS (rv, rv); + + rv = GTKEmbedGlueStartupInternal(); + NS_ENSURE_SUCCESS (rv, rv); + + char *lastSlash = strrchr(xpcomLocation, '/'); + if (lastSlash) + *lastSlash = '\0'; + + gtk_moz_embed_set_path(xpcomLocation); + +#else #ifdef HAVE_GECKO_1_9 gtk_moz_embed_set_path (MOZILLA_HOME); #else gtk_moz_embed_set_comp_path (MOZILLA_HOME); #endif +#endif // XPCOM_GLUE gtk_moz_embed_push_startup (); yelp_register_printing (); - nsresult rv; nsCOMPtr<nsIPrefService> prefService (do_GetService (NS_PREFSERVICE_CONTRACTID, &rv)); NS_ENSURE_SUCCESS (rv, FALSE); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit librdmacm
by root＠Hilbert.suse.de 28 Apr '08

28 Apr '08

Hello community, here is the log from the commit of package librdmacm checked in at Tue Apr 29 00:01:43 CEST 2008. -------- --- librdmacm/librdmacm.changes 2008-03-04 07:50:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/librdmacm/librdmacm.changes 2008-04-28 22:50:48.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 28 22:50:30 CEST 2008 - crrodriguez(a)suse.de + +- update to version 1.0.7 , no upstream changelog available + +------------------------------------------------------------------- Old: ---- librdmacm-1.0.6.tar.bz2 New: ---- librdmacm-1.0.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librdmacm.spec ++++++ --- /var/tmp/diff_new_pack.b17099/_old 2008-04-29 00:01:25.000000000 +0200 +++ /var/tmp/diff_new_pack.b17099/_new 2008-04-29 00:01:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package librdmacm (Version 1.0.6) +# spec file for package librdmacm (Version 1.0.7) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ Name: librdmacm Summary: RDMA cm library. -Version: 1.0.6 +Version: 1.0.7 Release: 1 License: BSD 3-Clause; GPL v2 or later Group: System/Libraries @@ -32,6 +32,7 @@ Sean Hefty <sean.hefty(a)intel.com> %package devel +License: BSD 3-Clause; GPL v2 or later Group: Development/Libraries/Other Summary: Development files for the librdmacm library Requires: %{name} = %{version} libibverbs-devel @@ -55,6 +56,7 @@ %install make DESTDIR=$RPM_BUILD_ROOT install rm -f %{buildroot}%{_libdir}/*.la +grep -r include %{buildroot}%{_includedir} %clean rm -rf ${RPM_BUILD_ROOT} @@ -77,6 +79,8 @@ %_mandir/man3/* %changelog +* Tue Apr 29 2008 crrodriguez(a)suse.de +- update to version 1.0.7 , no upstream changelog available * Tue Mar 04 2008 jjolly(a)suse.de - Updated to 1.0.6 from the OFED 1.3 GA release * Wed Nov 28 2007 crrodriguez(a)suse.de ++++++ librdmacm-1.0.6.tar.bz2 -> librdmacm-1.0.7.tar.bz2 ++++++ ++++ 54587 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepimlibs4
by root＠Hilbert.suse.de 28 Apr '08

28 Apr '08

Hello community, here is the log from the commit of package kdepimlibs4 checked in at Tue Apr 29 00:01:14 CEST 2008. -------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2008-04-22 00:59:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2008-04-28 22:33:31.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 28 22:33:21 CEST 2008 - dmueller(a)suse.de + +- adapt to akonadi -> akonadi-runtime rename + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.J16122/_old 2008-04-29 00:00:45.000000000 +0200 +++ /var/tmp/diff_new_pack.J16122/_new 2008-04-29 00:00:45.000000000 +0200 @@ -11,13 +11,13 @@ Name: kdepimlibs4 -BuildRequires: akonadi-devel boost-devel cyrus-sasl-devel gpgme-devel libkde4-devel openldap2-devel +BuildRequires: boost-devel cyrus-sasl-devel gpgme-devel libakonadiprotocolinternals-devel libkde4-devel openldap2-devel License: LGPL v2.1 or later Group: System/GUI/KDE Summary: KDE PIM Libraries Url: http://www.kde.org Version: 4.0.71 -Release: 1 +Release: 3 Source0: kdepimlibs-%version.tar.bz2 Source1: _upstream Patch0: 4_1_BRANCH.diff @@ -128,7 +128,8 @@ License: LGPL v2.1 or later Group: System/GUI/KDE Summary: KDE PIM Libraries: Build Environment -Requires: kdepimlibs4 = %version akonadi-devel libkde4-devel cyrus-sasl-devel openldap2-devel boost-devel +Requires: kdepimlibs4 = %version libkde4-devel cyrus-sasl-devel openldap2-devel boost-devel +Requires: libakonadiprotocolinternals-devel Requires: libkdepimlibs4 = %version %description -n libkdepimlibs4-devel @@ -183,6 +184,8 @@ %_kde_share_dir/config.kcfg/mailtransport.kcfg %changelog +* Tue Apr 29 2008 dmueller(a)suse.de +- adapt to akonadi -> akonadi-runtime rename * Fri Apr 18 2008 dmueller(a)suse.de - update to 4.0.70: * akonadi: API polishment ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace
by root＠Hilbert.suse.de 28 Apr '08

28 Apr '08

Hello community, here is the log from the commit of package kdebase4-workspace checked in at Tue Apr 29 00:00:34 CEST 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-04-28 18:08:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-04-28 23:58:43.600832000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 28 23:43:56 CEST 2008 - dmueller(a)suse.de + +- fix focus issues in kde4-kdm (bnc#381501) + +------------------------------------------------------------------- kdebase4-workspace.changes: same change New: ---- kdm-focus-handling-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.g11424/_old 2008-04-29 00:00:13.000000000 +0200 +++ /var/tmp/diff_new_pack.g11424/_new 2008-04-29 00:00:13.000000000 +0200 @@ -22,7 +22,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.0.3 -Release: 21 +Release: 22 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -59,6 +59,8 @@ /usr/share/wallpapers %changelog +* Tue Apr 29 2008 dmueller(a)suse.de +- fix focus issues in kde4-kdm (bnc#381501) * Mon Apr 28 2008 stbinner(a)suse.de - update Plasma diff from openSUSE Plasma branch: several bugfixes including bnc#381704, bnc#379082, bnc#382510, bnc#377728, ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.g11424/_old 2008-04-29 00:00:13.000000000 +0200 +++ /var/tmp/diff_new_pack.g11424/_new 2008-04-29 00:00:13.000000000 +0200 @@ -27,7 +27,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.0.3 -Release: 21 +Release: 22 %define rversion 4.0.3 Source0: kdebase-workspace-%rversion.tar.bz2 Source2: titlebar_decor.png @@ -62,6 +62,7 @@ Patch76: ksplashx-scale.diff Patch77: systemsettings-desktop.diff Patch78: kdm-use-radiobuttons.diff +Patch79: kdm-focus-handling-fix.diff %kde4_runtime_requires Conflicts: yast2-theme-NLD %if %suse_version > 1030 @@ -120,6 +121,7 @@ %patch76 %patch77 %patch78 +%patch79 %build %cmake_kde4 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE4_KCHECKPASS_PAM_SERVICE=xdm @@ -644,6 +646,8 @@ /usr/%_lib/kde4/kgreet_*.so %changelog +* Tue Apr 29 2008 dmueller(a)suse.de +- fix focus issues in kde4-kdm (bnc#381501) * Mon Apr 28 2008 stbinner(a)suse.de - update Plasma diff from openSUSE Plasma branch: several bugfixes including bnc#381704, bnc#379082, bnc#382510, bnc#377728, ++++++ kdm-focus-handling-fix.diff ++++++ --- kdm/kfrontend/kfdialog.cpp +++ kdm/kfrontend/kfdialog.cpp @@ -37,13 +37,12 @@ Foundation, Inc., 51 Franklin Street, Fi #include <QMouseEvent> #include <QX11Info> -#include <X11/Xlib.h> - #include <stdio.h> FDialog::FDialog( QWidget *parent, bool framed ) : inherited( parent/*, framed ? 0 : WStyle_NoBorder*/ ) { + prevWindow = 0; setModal( true ); if (framed) { winFrame = new QFrame( this ); @@ -110,41 +109,34 @@ FDialog::adjustGeometry() QCursor::setPos( grt.center() ); } -static void -fakeFocusIn( WId window ) +void +FDialog::showEvent( QShowEvent* e ) +{ + inherited::showEvent( e ); + prevWindow = QApplication::activeWindow(); + + if (!prevWindow ) + secureInputs( QX11Info::display() ); + + QApplication::setActiveWindow( this ); +} + +void +FDialog::hideEvent( QHideEvent* e ) { - // We have keyboard grab, so this application will - // get keyboard events even without having focus. - // Fake FocusIn to make Qt realize it has the active - // window, so that it will correctly show cursor in the dialog. - XEvent ev; - memset( &ev, 0, sizeof(ev) ); - ev.xfocus.display = QX11Info::display(); - ev.xfocus.type = FocusIn; - ev.xfocus.window = window; - ev.xfocus.mode = NotifyNormal; - ev.xfocus.detail = NotifyAncestor; - XSendEvent( QX11Info::display(), window, False, NoEventMask, &ev ); + if (QApplication::activeWindow() == this) + QApplication::setActiveWindow( prevWindow ); + if (!prevWindow) + unsecureInputs( QX11Info::display() ); + inherited::hideEvent( e ); } int FDialog::exec() { - static QWidget *current; - adjustGeometry(); - if (!current) - secureInputs( QX11Info::display() ); - fakeFocusIn( winId() ); - QWidget *previous = current; - current = this; - inherited::exec(); - current = previous; - if (current) - fakeFocusIn( current->winId() ); - else - unsecureInputs( QX11Info::display() ); - return result(); + + return inherited::exec(); } KFMsgBox::KFMsgBox( QWidget *parent, QMessageBox::Icon type, const QString &text ) --- kdm/kfrontend/kfdialog.h +++ kdm/kfrontend/kfdialog.h @@ -41,10 +41,13 @@ class FDialog : public QDialog { protected: virtual void resizeEvent( QResizeEvent *e ); + virtual void showEvent( QShowEvent *e ); + virtual void hideEvent( QHideEvent *e ); void adjustGeometry(); private: QFrame *winFrame; + QWidget *prevWindow; }; #define errorbox QMessageBox::Critical --- kdm/kfrontend/themer/kdmitem.cpp +++ kdm/kfrontend/themer/kdmitem.cpp @@ -213,7 +213,7 @@ void KdmItem::setWidget( QWidget *widget ) { if ((myWidget = widget)) { - myWidget->hide(); // yes, really + myWidget->setAttribute(Qt::WA_DontShowOnScreen); connect( myWidget, SIGNAL(destroyed()), SLOT(widgetGone()) ); setWidgetAttribs( myWidget ); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0