December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit f-spot
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package f-spot checked in at Thu Dec 7 19:56:51 CET 2006. -------- --- GNOME/f-spot/f-spot.changes 2006-11-20 17:05:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/f-spot/f-spot.changes 2006-11-30 19:28:56.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 30 19:26:16 CET 2006 - lewing(a)suse.de + +- Update to f-spot 0.3.0 See Fate #301234. + +------------------------------------------------------------------ Old: ---- f-spot-0.2.2.tar.bz2 f-spot-picasa.patch New: ---- f-spot-0.3.0.tar.bz2 f-spot-icons.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ f-spot.spec ++++++ --- /var/tmp/diff_new_pack.Rk67Cp/_old 2006-12-07 19:56:19.000000000 +0100 +++ /var/tmp/diff_new_pack.Rk67Cp/_new 2006-12-07 19:56:19.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package f-spot (Version 0.2.2) +# spec file for package f-spot (Version 0.3.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,13 +13,14 @@ Name: f-spot BuildRequires: art-sharp2 dbus-1-mono gconf-sharp2 glade-sharp2 glib-sharp2 gnome-screensaver gnome-sharp2 gtk-sharp2 gtkhtml-sharp2 intltool libglade2-devel libgnomeui-devel libgphoto2-devel libicu liblcms-devel libwnck-devel mono-basic mono-data-sqlite mono-devel perl-XML-Parser sqlite2-devel update-desktop-files %define prefix /usr +%define gnomeprefix /opt/gnome %define sysconfdir /etc/opt/gnome License: GNU General Public License (GPL) Group: Productivity/Graphics/Viewers Autoreqprov: on Requires: dcraw -Version: 0.2.2 -Release: 25 +Version: 0.3.0 +Release: 1 Summary: GNOME Photo Management Application URL: http://www.gnome.org/projects/f-spot/ Source: %{name}-%{version}.tar.bz2 @@ -27,7 +28,7 @@ Patch: %{name}-64bit-warn.patch Patch1: %{name}-libexif-so.patch Patch2: %{name}-configure.patch -Patch3: %{name}-picasa.patch +Patch3: %{name}-icons.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mono-core nautilus-cd-burner dbus-1-x11 libgphoto2 @@ -86,6 +87,8 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL +mkdir -p $RPM_BUILD_ROOT%{gnomeprefix}/share +mv $RPM_BUILD_ROOT%{prefix}/share/icons $RPM_BUILD_ROOT%{gnomeprefix}/share/ %find_lang %{name} %suse_update_desktop_file -C "Organize digital photographs" -G "Photo Browser" -N "F-Spot" %{name} rm $RPM_BUILD_ROOT/%{_libdir}/f-spot/*.*a @@ -106,7 +109,16 @@ %{prefix}/%_lib/f-spot/* %{prefix}/share/applications/f-spot.desktop %{prefix}/share/applications/f-spot-view.desktop -%{prefix}/share/pixmaps/f-spot-logo.png +%{gnomeprefix}/share/icons/hicolor/16x16/apps/f-spot.png +%{gnomeprefix}/share/icons/hicolor/16x16/apps/f-spot.svg +%{gnomeprefix}/share/icons/hicolor/22x22/apps/f-spot.png +%{gnomeprefix}/share/icons/hicolor/22x22/apps/f-spot.svg +%{gnomeprefix}/share/icons/hicolor/24x24/apps/f-spot.png +%{gnomeprefix}/share/icons/hicolor/32x32/apps/f-spot.png +%{gnomeprefix}/share/icons/hicolor/32x32/apps/f-spot.svg +%{gnomeprefix}/share/icons/hicolor/48x48/apps/f-spot.png +%{gnomeprefix}/share/icons/hicolor/48x48/apps/f-spot.svg +%{gnomeprefix}/share/icons/hicolor/scalable/apps/f-spot.svg %{prefix}/%_lib/pkgconfig/f-spot.pc /opt/gnome/lib/gnome-screensaver/gnome-screensaver/f-spot-screensaver %dir /opt/gnome/share/gnome-screensaver/themes @@ -117,6 +129,8 @@ %endif %changelog -n f-spot +* Thu Nov 30 2006 - lewing(a)suse.de +- Update to f-spot 0.3.0 See Fate #301234. * Mon Nov 20 2006 - lewing(a)suse.de - Fix picasa web export. See b.n.c #222659 * Sat Oct 21 2006 - meissner(a)suse.de ++++++ f-spot-0.2.2.tar.bz2 -> f-spot-0.3.0.tar.bz2 ++++++ ++++ 68084 lines of diff (skipped) ++++++ f-spot-icons.patch ++++++ Index: icons/Makefile.am =================================================================== RCS file: /cvs/gnome/f-spot/icons/Makefile.am,v retrieving revision 1.26 diff -u -p -r1.26 Makefile.am --- icons/Makefile.am 27 Nov 2006 13:49:28 -0000 1.26 +++ icons/Makefile.am 29 Nov 2006 21:18:45 -0000 @@ -26,8 +26,7 @@ noinst_DATA = \ f-spot-question-mark.png \ f-spot.js \ f-spot-simple.css \ - f-spot-simple-white.css \ - f-spot-logo-tango.svg + f-spot-simple-white.css hicolordir = $(DESTDIR)$(datadir)/icons/hicolor @@ -47,6 +46,9 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/f-spot-48.png $(hicolordir)/48x48/apps/f-spot.png $(INSTALL_DATA) $(srcdir)/f-spot-48.svg $(hicolordir)/48x48/apps/f-spot.svg + $(mkinstalldirs) $(hicolordir)/scalable/apps + $(INSTALL_DATA) $(srcdir)/f-spot-logo-tango.svg $(hicolordir)/scalable/apps/f-spot.svg + uninstall-hook: rm -f $(hicolordir)/16x16/apps/f-spot.png rm -f $(hicolordir)/16x16/apps/f-spot.svg @@ -57,6 +59,7 @@ uninstall-hook: rm -f $(hicolordir)/32x32/apps/f-spot.svg rm -f $(hicolordir)/48x48/apps/f-spot.png rm -f $(hicolordir)/48x48/apps/f-spot.svg + rm -f $(hicolordir)/scalable/apps/f-spot.svg EXTRA_DIST = \ $(noinst_DATA) \ @@ -68,4 +71,5 @@ EXTRA_DIST = \ f-spot-32.png \ f-spot-32.svg \ f-spot-48.png \ - f-spot-48.svg + f-spot-48.svg \ + f-spot-logo-tango.svg ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-installation
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-installation checked in at Thu Dec 7 19:56:47 CET 2006. -------- --- yast2-installation/yast2-installation.changes 2006-11-23 11:20:30.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2006-12-07 11:20:39.000000000 +0100 @@ -1,0 +2,33 @@ +Thu Dec 7 10:46:00 CET 2006 - locilka(a)suse.cz + +- Reworked adding and removing Add-Ons during the first stage + installation. If some Add-Ons are added or removed, the entire + workflow is created from scratch (#221377). +- Using a separate temporary directory for Add-On licenses not to + be confused by the previous Add-On. +- Fixed Second Stage Installation script to handle rebooting + after kernel-patch correctly (#224251). +- Fixed Add-On handling when cancelling adding an Add-On product, + before that return value from the previous adding was evaluated. +- Fixing some texts (#223880) +- 2.15.1 + +------------------------------------------------------------------- +Mon Dec 4 16:27:21 CET 2006 - locilka(a)suse.cz + +- Adding support for own help texts for particular submodules in + installation proposal (FATE #301151). Use key "help" in + "MakeProposal"'s function result. +- Adding root_password_ca_check item into the globals of control + file set to true for SLES and false otherwise (FATE #300438). +- A better fix for disabling [Back] button in License Agreement + dialog when the previous (Language) dialog has been skipped + (223258). +- 2.15.0 + +------------------------------------------------------------------- +Mon Dec 4 08:34:02 CET 2006 - lslezak(a)suse.cz + +- "en_EN" -> "en_GB" in list of the preferred languages for EULA + +------------------------------------------------------------------- Old: ---- yast2-installation-2.14.15.tar.bz2 New: ---- yast2-installation-2.15.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.C3JhOp/_old 2006-12-07 19:56:10.000000000 +0100 +++ /var/tmp/diff_new_pack.C3JhOp/_new 2006-12-07 19:56:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.14.15) +# spec file for package yast2-installation (Version 2.15.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.14.15 +Version: 2.15.1 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.14.15.tar.bz2 +Source0: yast2-installation-2.15.1.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-country yast2-devtools yast2-testsuite Requires: yast2-slp yast2-firewall @@ -29,8 +29,8 @@ Requires: yast2-pkg-bindings >= 2.13.101 # ProductControl::Run returning `abort (FATE #300422) Requires: yast2 >= 2.14.6 -# Languages:GetLanguagesMap, bugzilla #204791 -Requires: yast2-country >= 2.13.35 +# Language::selection_skipped, bugzilla #223258 +Requires: yast2-country >= 2.15.0 Requires: yast2-network yast2-users Requires: curl release-notes Requires: autoyast2-installation yast2-online-update @@ -69,7 +69,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-installation-2.14.15 +%setup -n yast2-installation-2.15.1 %build %{prefix}/bin/y2tool y2autoconf @@ -133,6 +133,30 @@ %endif %changelog -n yast2-installation +* Thu Dec 07 2006 - locilka(a)suse.cz +- Reworked adding and removing Add-Ons during the first stage + installation. If some Add-Ons are added or removed, the entire + workflow is created from scratch (#221377). +- Using a separate temporary directory for Add-On licenses not to + be confused by the previous Add-On. +- Fixed Second Stage Installation script to handle rebooting + after kernel-patch correctly (#224251). +- Fixed Add-On handling when cancelling adding an Add-On product, + before that return value from the previous adding was evaluated. +- Fixing some texts (#223880) +- 2.15.1 +* Mon Dec 04 2006 - locilka(a)suse.cz +- Adding support for own help texts for particular submodules in + installation proposal (FATE #301151). Use key "help" in + "MakeProposal"'s function result. +- Adding root_password_ca_check item into the globals of control + file set to true for SLES and false otherwise (FATE #300438). +- A better fix for disabling [Back] button in License Agreement + dialog when the previous (Language) dialog has been skipped + (223258). +- 2.15.0 +* Mon Dec 04 2006 - lslezak(a)suse.cz +- "en_EN" -> "en_GB" in list of the preferred languages for EULA * Thu Nov 23 2006 - locilka(a)suse.cz - Disabling [Back] button in License Agreement dialog when the previous (Language) dialog has been skipped (223258). ++++++ yast2-installation-2.14.15.tar.bz2 -> yast2-installation-2.15.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/VERSION new/yast2-installation-2.15.1/VERSION --- old/yast2-installation-2.14.15/VERSION 2006-11-23 11:20:36.000000000 +0100 +++ new/yast2-installation-2.15.1/VERSION 2006-12-07 10:59:32.000000000 +0100 @@ -1 +1 @@ -2.14.15 +2.15.1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/configure new/yast2-installation-2.15.1/configure --- old/yast2-installation-2.14.15/configure 2006-11-15 15:52:57.000000000 +0100 +++ new/yast2-installation-2.15.1/configure 2006-12-07 11:24:28.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-installation 2.14.10. +# Generated by GNU Autoconf 2.60 for yast2-installation 2.15.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.14.10' -PACKAGE_STRING='yast2-installation 2.14.10' +PACKAGE_VERSION='2.15.1' +PACKAGE_STRING='yast2-installation 2.15.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1192,7 +1192,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-installation 2.14.10 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.15.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1263,7 +1263,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-installation 2.14.10:";; + short | recursive ) echo "Configuration of yast2-installation 2.15.1:";; esac cat <<\_ACEOF @@ -1341,7 +1341,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.14.10 +yast2-installation configure 2.15.1 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1355,7 +1355,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-installation $as_me 2.14.10, which was +It was created by yast2-installation $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2156,7 +2156,7 @@ # Define the identity of the package. PACKAGE='yast2-installation' - VERSION='2.14.10' + VERSION='2.15.1' cat >>confdefs.h <<_ACEOF @@ -2383,7 +2383,7 @@ -VERSION="2.14.10" +VERSION="2.15.1" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3512,7 +3512,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-installation $as_me 2.14.10, which was +This file was extended by yast2-installation $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3555,7 +3555,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-installation config.status 2.14.10 +yast2-installation config.status 2.15.1 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/configure.in new/yast2-installation-2.15.1/configure.in --- old/yast2-installation-2.14.15/configure.in 2006-11-15 15:52:50.000000000 +0100 +++ new/yast2-installation-2.15.1/configure.in 2006-12-07 11:24:23.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.14.10, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.15.1, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.10" +VERSION="2.15.1" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/control/control.xml new/yast2-installation-2.15.1/control/control.xml --- old/yast2-installation-2.14.15/control/control.xml 2006-10-23 16:15:54.000000000 +0200 +++ new/yast2-installation-2.15.1/control/control.xml 2006-12-04 17:33:44.000000000 +0100 @@ -25,6 +25,7 @@ <display_register_forcereg config:type="boolean">false</display_register_forcereg> <disable_register_w3m config:type="boolean">false</disable_register_w3m> <manual_online_update config:type="boolean">true</manual_online_update> + <root_password_ca_check config:type="boolean">false</root_password_ca_check> </globals> <software> <delete_old_packages config:type="boolean">true</delete_old_packages> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/doc/proposal/proposal-API.txt new/yast2-installation-2.15.1/doc/proposal/proposal-API.txt --- old/yast2-installation-2.14.15/doc/proposal/proposal-API.txt 2006-10-09 16:09:06.000000000 +0200 +++ new/yast2-installation-2.15.1/doc/proposal/proposal-API.txt 2006-12-04 16:11:46.000000000 +0100 @@ -213,7 +213,11 @@ This module just caused a change of the root partition. This is only relevant for the "root part" module. - + + string help + + Helptext for this module which appears in the standard dialog + help (particular helps for modules sorted by presentation order). map AskUser( boolean has_next ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/desktop_finish.ycp new/yast2-installation-2.15.1/src/clients/desktop_finish.ycp --- old/yast2-installation-2.14.15/src/clients/desktop_finish.ycp 2006-07-18 11:27:46.000000000 +0200 +++ new/yast2-installation-2.15.1/src/clients/desktop_finish.ycp 2006-11-29 15:47:32.000000000 +0100 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: desktop_finish.ycp 31885 2006-07-17 08:14:59Z jsrain $ + * $Id: desktop_finish.ycp 33279 2006-10-09 14:16:49Z locilka $ * */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/inst_add-on.ycp new/yast2-installation-2.15.1/src/clients/inst_add-on.ycp --- old/yast2-installation-2.14.15/src/clients/inst_add-on.ycp 2006-06-26 09:10:54.000000000 +0200 +++ new/yast2-installation-2.15.1/src/clients/inst_add-on.ycp 2006-12-06 18:51:42.000000000 +0100 @@ -30,9 +30,6 @@ if (ret == `next) { - foreach (map<string,any> prod, AddOnProduct::add_on_products, { - AddOnProduct::Integrate (prod["media"]:0); - }); ret = ProductControl::RunFrom ( ProductControl::CurrentStep () + 1, true); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/inst_congratulate.ycp new/yast2-installation-2.15.1/src/clients/inst_congratulate.ycp --- old/yast2-installation-2.14.15/src/clients/inst_congratulate.ycp 2006-11-15 11:42:10.000000000 +0100 +++ new/yast2-installation-2.15.1/src/clients/inst_congratulate.ycp 2006-12-07 11:20:52.000000000 +0100 @@ -6,7 +6,7 @@ * * Display a congratulation message for the user. * - * $Id: inst_congratulate.ycp 34401 2006-11-15 10:42:07Z locilka $ + * $Id: inst_congratulate.ycp 34843 2006-12-07 10:20:49Z locilka $ */ { @@ -56,7 +56,12 @@ integer space = display["TextMode"]:true ? 1 : 3; string vendor_url_tmp = ProductFeatures::GetStringFeature("globals", "vendor_url"); + // fallback string vendor_url = "http://www.novell.com/linux/"; + if (ProductFeatures::GetStringFeature("globals", "ui_mode") == "simple") { + vendor_url = "http://www.openSUSE.org"; + } + y2milestone ("UI mode: %1", ProductFeatures::GetStringFeature("globals", "ui_mode")); if (vendor_url_tmp != nil && vendor_url_tmp != "") vendor_url = vendor_url_tmp; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/inst_finish.ycp new/yast2-installation-2.15.1/src/clients/inst_finish.ycp --- old/yast2-installation-2.14.15/src/clients/inst_finish.ycp 2006-09-13 11:12:49.000000000 +0200 +++ new/yast2-installation-2.15.1/src/clients/inst_finish.ycp 2006-11-29 15:47:32.000000000 +0100 @@ -6,7 +6,7 @@ * Arvin Schnell <arvin(a)suse.de> * Jiri Srain <jsrain(a)suse.de> * - * $Id: inst_finish.ycp 32850 2006-09-13 09:14:23Z locilka $ + * $Id: inst_finish.ycp 33279 2006-10-09 14:16:49Z locilka $ * * Writes: * [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/inst_license.ycp new/yast2-installation-2.15.1/src/clients/inst_license.ycp --- old/yast2-installation-2.14.15/src/clients/inst_license.ycp 2006-10-09 13:28:35.000000000 +0200 +++ new/yast2-installation-2.15.1/src/clients/inst_license.ycp 2006-11-29 15:47:32.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Generic License File * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: inst_license.ycp 33271 2006-10-09 11:28:31Z locilka $ + * $Id: inst_license.ycp 33279 2006-10-09 14:16:49Z locilka $ * */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/inst_proposal.ycp new/yast2-installation-2.15.1/src/clients/inst_proposal.ycp --- old/yast2-installation-2.14.15/src/clients/inst_proposal.ycp 2006-11-20 09:00:09.000000000 +0100 +++ new/yast2-installation-2.15.1/src/clients/inst_proposal.ycp 2006-12-04 17:08:15.000000000 +0100 @@ -7,7 +7,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: inst_proposal.ycp 34452 2006-11-20 08:00:07Z locilka $ + * $Id: inst_proposal.ycp 34739 2006-12-04 16:08:14Z locilka $ * * Create and display reasonable proposal for basic * installation and call sub-workflows as required @@ -59,6 +59,9 @@ boolean have_blocker = false; string proposal_mode = ""; + // FATE #301151: Allow YaST proposals to have help texts + map <string, string> submodule_helps = $[]; + symbol proposal_result = nil; // skip if not interactive mode. @@ -218,6 +221,8 @@ Wizard::DisableNextButton (); UI::BusyCursor(); + submodule_helps = $[]; + y2debug("Submodules list before execution: %1", submodules ); foreach ( string submod, submodules, ``{ @@ -240,6 +245,35 @@ } prop_map = submod_make_proposal( submod, force_reset, language_changed ); + + if (haskey (prop_map, "help")) + { + boolean use_this_help = false; + // using tabs + if (haskey (mod2tab, submod)) { + // visible in the current tab + if (mod2tab[submod]:999 == current_tab) { + use_this_help = true; + } + // not using tabs + } else { + use_this_help = true; + } + + if (use_this_help) { + y2milestone("Submodule '%1' has it's own help", submod); + string own_help = prop_map["help"]:""; + + if (own_help == nil) { + y2error ("Help text cannot be 'nil'"); + } else if (own_help == "") { + y2milestone ("Skipping empty help"); + } else { + submodule_helps[submod] = prop_map["help"]:""; + } + } + } + // check if it is needed to switch to another tab // because of an error @@ -301,6 +335,12 @@ skip_the_rest = true; } }); + + // FATE #301151: Allow YaST proposals to have help texts + if (size(submodule_helps) > 0) { + Wizard::SetHelpText (help_text ()); + } + if (has_tab && tab_to_switch < 999 && ! current_tab_affected) { // FIXME copy-paste from event loop (but for last 2 lines) @@ -1004,6 +1044,12 @@ locked by the system administrator, so cannot be changed. To change a proposal that is locked, ask your system administrator."); } + + foreach (string submod, submodules_presentation, { + if (submodule_helps[submod]:"" != "") { + help_text_string = help_text_string + submodule_helps[submod]:""; + } + }); return help_text_string; }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/inst_release_notes.ycp new/yast2-installation-2.15.1/src/clients/inst_release_notes.ycp --- old/yast2-installation-2.14.15/src/clients/inst_release_notes.ycp 2006-11-15 13:28:45.000000000 +0100 +++ new/yast2-installation-2.15.1/src/clients/inst_release_notes.ycp 2006-11-29 15:47:32.000000000 +0100 @@ -7,7 +7,7 @@ * * Display release notes. * - * $Id: inst_release_notes.ycp 33271 2006-10-09 11:28:31Z locilka $ + * $Id: inst_release_notes.ycp 33279 2006-10-09 14:16:49Z locilka $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/installation_worker.ycp new/yast2-installation-2.15.1/src/clients/installation_worker.ycp --- old/yast2-installation-2.14.15/src/clients/installation_worker.ycp 2006-11-21 13:05:55.000000000 +0100 +++ new/yast2-installation-2.15.1/src/clients/installation_worker.ycp 2006-12-06 18:36:28.000000000 +0100 @@ -91,10 +91,11 @@ UI::RecordMacro( Directory::logdir + "/macro_inst_initial.ycp" ); } - string file_inst_aborted = "/var/lib/YaST2/second_stage_aborted"; - string file_inst_failed = "/var/lib/YaST2/second_stage_failed"; - string run_yast_at_boot = "/var/lib/YaST2/runme_at_boot"; - string current_step = "/var/lib/YaST2/step"; + string file_inst_aborted = Directory::vardir + "/second_stage_aborted"; + string file_inst_failed = Directory::vardir + "/second_stage_failed"; + string run_yast_at_boot = Directory::vardir + "/runme_at_boot"; + string current_step = Directory::vardir + "/step"; + string file_update_mode = Directory::vardir + "/update_mode"; // Second stage // FATE #300422 @@ -146,7 +147,7 @@ // Second stage // Detect mode early to be able to setup steps correctly - if (Stage::cont () && FileUtils::Exists (Installation::destdir + "/var/lib/YaST2/update_mode")) + if (Stage::cont () && FileUtils::Exists (Installation::destdir + file_update_mode)) { Mode::SetMode ("update"); } @@ -192,6 +193,7 @@ list<string> files = (list<string>)SCR::Read (.target.ycp, listname); foreach (string f, files, { f = Installation::destdir + Directory::etcdir + "/control_files/" + f; + y2milestone ("Calling WFIntegrate()"); AddOnProduct::WFIntegrate (f); }); } @@ -401,9 +403,9 @@ retranslateWizardDialog(); symbol ret = nil; - string restart_data_file = "/var/lib/YaST2/continue_installation"; - string reboot_file = "/var/lib/YaST2/reboot"; - string restart_file = "/var/lib/YaST2/restart_yast"; + string restart_data_file = Directory::vardir + "/continue_installation"; + string reboot_file = Directory::vardir + "/reboot"; + string restart_file = Directory::vardir + "/restart_yast"; // Continue the second stage installation if (Stage::cont () @@ -452,8 +454,7 @@ y2milestone("Evaluating ret: %1", ret); - if (Stage::cont () && (ret == `reboot || ret == `restart_yast || ret == `restart_same_step)) - { + if (Stage::cont () && (ret == `reboot || ret == `restart_yast || ret == `restart_same_step)) { // restarting yast, removing files that identify the user-abort or installation-crash // bugzilla #222896 if (FileUtils::Exists (file_inst_aborted)) SCR::Execute (.target.remove, file_inst_aborted); @@ -462,45 +463,49 @@ // creating new files to identify restart integer last_step = ProductControl::CurrentStep (); integer restarting_step = last_step; - if (ret == `restart_same_step) - { + + if (ret == `restart_same_step) { last_step = last_step - 1; ret = `restart_yast; } + integer next_step = last_step + 1; + y2milestone ("Creating %1 file with values %2", + restart_data_file, [next_step, restarting_step]); SCR::Write (.target.string, restart_data_file, sformat ("%1\n%2", next_step, restarting_step)); - if (ret == `reboot) - { + + if (ret == `reboot) { + y2milestone ("Creating %1 file", reboot_file); SCR::Execute (.target.bash, sformat ( "touch %1", reboot_file)); - } - else if (ret == `restart_yast) - { + + } else if (ret == `restart_yast) { + y2milestone ("Creating %1 file", restart_file); SCR::Execute (.target.bash, sformat ( "touch %1", restart_file)); } } // Installation has been aborted - if (ret == `abort) - { + if (ret == `abort) { // tell linuxrc that we aborted Linuxrc::WriteYaSTInf($["Aborted" : "1"]); } // re-enable automatic probing - if (!Mode::test ()) + if (!Mode::test ()) { WFM::Execute (.local.bash, "/bin/echo \"/sbin/modprobe\" >/proc/sys/kernel/modprobe"); + } // when the installation is not aborted or YaST is not restarted on purpose - if (Stage::cont () && ret != `reboot && ret != `restart_yast && ret != `restart_same_step && ret != `abort) - { + if (Stage::cont () && ret != `reboot && ret != `restart_yast && ret != `restart_same_step && ret != `abort) { // remove /etc/install.inf, not needed any more SCR::Execute (.target.remove, "/etc/install.inf"); if (Mode::update ()) { - SCR::Execute(.target.remove, "/var/lib/YaST2/update_mode"); + y2milestone("Removing %1", file_update_mode); + SCR::Execute(.target.remove, file_update_mode); SCR::Execute(.target.bash, "/bin/rm -rf /var/adm/current_package_descr"); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/save_hw_status_finish.ycp new/yast2-installation-2.15.1/src/clients/save_hw_status_finish.ycp --- old/yast2-installation-2.14.15/src/clients/save_hw_status_finish.ycp 2006-09-25 11:01:56.000000000 +0200 +++ new/yast2-installation-2.15.1/src/clients/save_hw_status_finish.ycp 2006-11-29 15:47:32.000000000 +0100 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: save_hw_status_finish.ycp 33076 2006-09-25 08:59:36Z jsrain $ + * $Id: save_hw_status_finish.ycp 33279 2006-10-09 14:16:49Z locilka $ * */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/switch_scr_finish.ycp new/yast2-installation-2.15.1/src/clients/switch_scr_finish.ycp --- old/yast2-installation-2.14.15/src/clients/switch_scr_finish.ycp 2006-10-02 17:07:07.000000000 +0200 +++ new/yast2-installation-2.15.1/src/clients/switch_scr_finish.ycp 2006-11-29 15:47:32.000000000 +0100 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: switch_scr_finish.ycp 33233 2006-10-02 15:07:05Z locilka $ + * $Id: switch_scr_finish.ycp 33279 2006-10-09 14:16:49Z locilka $ * */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/test_inst_client.ycp new/yast2-installation-2.15.1/src/clients/test_inst_client.ycp --- old/yast2-installation-2.14.15/src/clients/test_inst_client.ycp 2006-08-23 16:58:34.000000000 +0200 +++ new/yast2-installation-2.15.1/src/clients/test_inst_client.ycp 2006-11-29 15:47:32.000000000 +0100 @@ -3,7 +3,7 @@ * Summary: For testing the network and hardware proposals. * Author: Michal Svec <msvec(a)suse.cz> * - * $Id: test_inst_client.ycp 32528 2006-08-23 11:23:58Z jsrain $ + * $Id: test_inst_client.ycp 33279 2006-10-09 14:16:49Z locilka $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/test_proposal.ycp new/yast2-installation-2.15.1/src/clients/test_proposal.ycp --- old/yast2-installation-2.14.15/src/clients/test_proposal.ycp 2006-08-23 08:30:51.000000000 +0200 +++ new/yast2-installation-2.15.1/src/clients/test_proposal.ycp 2006-11-29 15:47:32.000000000 +0100 @@ -3,7 +3,7 @@ * Summary: For testing the network and hardware proposals. * Author: Michal Svec <msvec(a)suse.cz> * - * $Id: test_proposal.ycp 32509 2006-08-22 17:28:33Z mvidner $ + * $Id: test_proposal.ycp 33279 2006-10-09 14:16:49Z locilka $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/umount_finish.ycp new/yast2-installation-2.15.1/src/clients/umount_finish.ycp --- old/yast2-installation-2.14.15/src/clients/umount_finish.ycp 2006-09-13 14:14:59.000000000 +0200 +++ new/yast2-installation-2.15.1/src/clients/umount_finish.ycp 2006-11-29 15:47:32.000000000 +0100 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: umount_finish.ycp 32853 2006-09-13 12:16:36Z locilka $ + * $Id: umount_finish.ycp 33279 2006-10-09 14:16:49Z locilka $ * */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/clients/vendor.ycp new/yast2-installation-2.15.1/src/clients/vendor.ycp --- old/yast2-installation-2.14.15/src/clients/vendor.ycp 2006-07-26 10:58:50.000000000 +0200 +++ new/yast2-installation-2.15.1/src/clients/vendor.ycp 2006-11-29 15:47:32.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Load vendor driver CD * Authors: Klaus Kaempf <kkaempf(a)suse.de> * - * $Id: vendor.ycp 31984 2006-07-26 07:21:09Z jsrain $ + * $Id: vendor.ycp 33279 2006-10-09 14:16:49Z locilka $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/include/add-on-workflow.ycp new/yast2-installation-2.15.1/src/include/add-on-workflow.ycp --- old/yast2-installation-2.14.15/src/include/add-on-workflow.ycp 2006-11-01 18:25:30.000000000 +0100 +++ new/yast2-installation-2.15.1/src/include/add-on-workflow.ycp 2006-12-07 10:07:09.000000000 +0100 @@ -186,6 +186,27 @@ } /** + * Returns begining string for source type + * + * @param symbol source_type + * @return string url begins with... + */ +string GetURLBeginsWith (symbol source_type) { + string url = ""; + + if ( source_type == `ftp ) url = "ftp://"; + else if ( source_type == `http ) url = "http://"; + else if ( source_type == `https ) url = "https://"; + else if ( source_type == `samba ) url = "smb://"; + else if ( source_type == `nfs ) url = "nfs://"; + else if ( source_type == `cd ) url = "cd:///"; + else if ( source_type == `dvd ) url = "dvd:///"; + else if ( source_type == `local_dir ) url = "dir://"; + + return url; +} + +/** * Run dialog for selecting the media * @return symbol for wizard sequencer */ @@ -224,6 +245,7 @@ continue; + createResult = nil; symbol input = (symbol)UI::QueryWidget (`id (`type), `CurrentButton); y2milestone ("Current: %1", input); if ( input == `slp ) @@ -240,15 +262,7 @@ else if (contains ([`ftp, `http, `https, `samba, `nfs, `cd, `dvd, `local_dir, `specify_url], input)) { - if ( input == `ftp ) url = "ftp://"; - else if ( input == `http ) url = "http://"; - else if ( input == `https ) url = "https://"; - else if ( input == `samba ) url = "smb://"; - else if ( input == `nfs ) url = "nfs://"; - else if ( input == `cd ) url = "cd:///"; - else if ( input == `dvd ) url = "dvd:///"; - else if ( input == `local_dir ) url = "dir://"; - else url = ""; + url = GetURLBeginsWith (input); if (input == `cd || input == `dvd) { @@ -276,12 +290,14 @@ do { url = editUrl( url ); y2milestone ("New url: '%1'", url); - if ( size( url ) == 0 ) { - break; + if (url == nil || url == "") { + continue; + } else { + y2milestone ("Adding source"); + createResult = SourceManager::createSource( url); } - - createResult = SourceManager::createSource( url); } while ( createResult == `again ); + y2milestone ("New Add-On: finished"); } } if (createResult != `ok) @@ -566,7 +582,7 @@ string product_dir = data["product_dir"]:""; AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[ "media" : AddOnProduct::src_id, - "product" : prod["name"]:"", + "product" : prod["display_name"]:prod["short_name"]:prod["name"]:"", "media_url" : url, "product_dir" : product_dir, ]); @@ -744,6 +760,7 @@ void Redraw (boolean enable_back, boolean enable_next) { + y2milestone ("Called Redraw()"); // main screen heading string title = _("Add-On Product Installation"); @@ -797,53 +814,82 @@ } } +// bugzilla #221377 +// the original control file is stored as /control.xml +// the other (added) control files are under the +// /tmp/$yast_tmp/control_files/ directory +// as $srcid.xml files +// symbol RunAddOnMainDialog(boolean enable_back, boolean enable_next) { Redraw (enable_back, enable_next); symbol ret = nil; + // added / removed + boolean some_addon_changed = false; + + // store the initial settings, only once + AddOnProduct::StoreInitialSettings(); + repeat { - ret = (symbol)Wizard::UserInput(); - if (ret == `abort || ret == `cancel) - { + ret = (symbol) Wizard::UserInput(); + + // aborting + if (ret == `abort || ret == `cancel) { if (Popup::ConfirmAbort (`incomplete)) break; - } - else if (ret == `delete) - { - integer selected = (integer)UI::QueryWidget (`id (`summary), `CurrentItem); - if (selected == nil) - { + + // removing add-on + } else if (ret == `delete) { + integer selected = (integer) UI::QueryWidget (`id (`summary), `CurrentItem); + if (selected == nil) { // message report Report::Message (_("Select a product to delete.")); continue; } - // remove whole media if the product is the onle one on the media + + // remove whole media if the product is the only one on the media integer media = AddOnProduct::add_on_products[selected, "media"]:-1; integer med_count = size (filter (map<string,any> prod, AddOnProduct::add_on_products, { return prod["media"]:-1 == media; })); - if (med_count == 1) - { + if (med_count == 1) { y2milestone ("Deleting source %1", media); Pkg::SourceDelete (media); } + // remove the selected record AddOnProduct::add_on_products[selected] = nil; AddOnProduct::add_on_products = filter (map<string,any> prod, - AddOnProduct::add_on_products, - { + AddOnProduct::add_on_products, + { return prod != nil; }); + + // remove a temporary file, not needed anymore + AddOnProduct::RemoveAddOnControlFile (selected); + some_addon_changed = true; + Redraw (enable_back, enable_next); - } - else if (ret == `add) - { + + // adding new add-on + } else if (ret == `add) { symbol ret = RunWizard (); + if (ret == `next) some_addon_changed = true; Redraw (enable_back, enable_next); } + } until ( ret == `next || ret == `back ); + y2milestone ("Ret: %1, Some Add-on Added/Removed: %2", ret, some_addon_changed); + + if (Mode::installation() && Stage::initial()) { + // bugzilla #221377 + if (some_addon_changed) { + AddOnProduct::ReIntegrateFromScratch(); + } + } + return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/modules/AddOnProduct.ycp new/yast2-installation-2.15.1/src/modules/AddOnProduct.ycp --- old/yast2-installation-2.14.15/src/modules/AddOnProduct.ycp 2006-07-18 11:27:47.000000000 +0200 +++ new/yast2-installation-2.15.1/src/modules/AddOnProduct.ycp 2006-12-07 08:24:53.000000000 +0100 @@ -29,6 +29,7 @@ import "Popup"; import "InstShowInfo"; import "ProductLicense"; +import "FileUtils"; // variables for installation with product /** @@ -86,7 +87,7 @@ global list<integer> mode_config_sources = []; - +boolean RedrawWizardSteps (); /** * Adapts the inst-sys from the tarball @@ -213,6 +214,50 @@ system_workflows_prepared = true; } +list <map> AddOnProduct::initial_workflows = []; +list <map> AddOnProduct::initial_proposals = []; +list <map<string,any> > AddOnProduct::initial_inst_finish = []; +list <string> AddOnProduct::initial_clone_modules = []; + +boolean initial_settings_stored = false; + +/** + * Stores the initial settings for workflows, proposals, inst_finish, clone_modules + * to be able to start from scratch when some part of the workflow modified by add-on + * is removed. + */ +global void StoreInitialSettings () { + // store it only once + if (initial_settings_stored) return; + + y2milestone ("Storing initial settings"); + AddOnProduct::initial_workflows = ProductControl::workflows; + AddOnProduct::initial_proposals = ProductControl::proposals; + AddOnProduct::initial_inst_finish = ProductControl::inst_finish; + AddOnProduct::initial_clone_modules = ProductControl::clone_modules; + + initial_settings_stored = true; +} + +/** + * Reset all the workflow and proposals modifications done + * by Add-on products. + * @see StoreInitialSettings() + */ +void ResetSystemWorkflowsAndProposals () { + y2milestone ("Restoring initial settings"); + ProductControl::workflows = AddOnProduct::initial_workflows; + ProductControl::proposals = AddOnProduct::initial_proposals; + ProductControl::inst_finish = AddOnProduct::initial_inst_finish; + ProductControl::clone_modules = AddOnProduct::initial_clone_modules; + + system_proposals_prepared = false; + PrepareSystemProposals(); + + system_workflows_prepared = false; + PrepareSystemWorkflows(); +} + /** * Replace a module in a proposal with a set of other modules * @param proposal a map describing the proposal @@ -773,43 +818,56 @@ * @return boolean true on success */ global boolean WFIntegrate (string filename) { + y2milestone ("WFIntegrate %1", filename); + map update_file = XML::XMLToYCPFile (filename); string name = update_file["display_name"]:""; boolean ret = UpdateInstallation (update_file["update"]:$[], name, update_file["textdomain"]:"control"); + if (! ret) { y2error ("Failed to udpate installation workflow"); return false; } + if (! UpdateProductInfo (update_file)) { y2error ("Failed to set product options"); return false; } + if (! AddNewProposals (update_file["proposals"]:[])) { y2error ("Failed to add new proposals"); return false; } + if (! Replaceworkflows (update_file["workflows"]:[])) { y2error ("Failed to replace workflows"); return false; } + if (! RedrawWizardSteps ()) { y2error ("Redrawing the wizard steps failed"); return false; } + if (! UpdateInstFinish (update_file["update", "inst_finish"]:$[])) { y2error ("Adding inst_finish steps failed"); return false; } + return true; } +string TmpdirForControlFiles () { + return (string) SCR::Read (.target.tmpdir) + "/control_files"; +} + /** * Integrate the add-on product to the installation workflow, including * preparations for 2nd stage and inst-sys update @@ -819,38 +877,108 @@ global boolean Integrate (integer srcid) { y2milestone ("Integrating source %1", srcid); - string filename = Pkg::SourceProvideOptionalFile (srcid, 1, "/installation.xml"); - if (filename == nil) - { - y2milestone ("Add-on product control file not found, not touching the workglow"); - } - else - { - if (! WFIntegrate (filename)) - { + // Updating workflow or proposals + + // Trying to use a cached file, bugzilla #221377 + string cached_filename = sformat ("%1/%2.xml", TmpdirForControlFiles(), srcid); + string source_filename = nil; + + // A cached copy exists + if (FileUtils::Exists (cached_filename)) { + y2milestone ("Using cached file %1", cached_filename); + source_filename = cached_filename; + // Trying file from source + } else { + y2milestone ("File %1 not cached", cached_filename); + // using a file from source + source_filename = Pkg::SourceProvideOptionalFile (srcid, 1, "/installation.xml"); + } + + if (source_filename == nil) { + y2milestone ("Add-on product control file not found, not touching the work-flow"); + // either cached or file from source exists + } else { + // already cached + if (source_filename != cached_filename) { + y2milestone ("Copying %1 to %2", source_filename, cached_filename); + string tmpdir = TmpdirForControlFiles (); + map out = (map) SCR::Execute (.target.bash_output, sformat (" +test -d '%1' || /bin/mkdir -p '%1'; +/bin/cp -v '%2' '%3'; +", tmpdir, source_filename, cached_filename)); + + if (out["exit"]:-1 != 0) { + y2error ("Error occurred while copying control file: %1", out); + + // cannot copy, using the non-cached file (fallback) + cached_filename = source_filename; + } + } + + // always use cached file + if (! WFIntegrate (cached_filename)) { y2error ("Workflow update failed"); return false; } - string tmpdir = (string)SCR::Read (.target.tmpdir) + "/control_files"; - map out = (map)SCR::Execute (.target.bash_output, sformat (" -test -d %1 || /bin/mkdir %1; -/bin/cp %2 %1/%3.xml; -", tmpdir, filename, srcid)); - if (out["exit"]:-1 != 0) - { - y2error ("Error occurred while copying control file: %1", out); - } + control_files_to_add = add (control_files_to_add, sformat ("%1.xml", srcid)); } + + // Updating inst-sys string y2update = Pkg::SourceProvideOptionalFile (srcid, 1, "/y2update.tgz"); - if (y2update == nil) - { + if (y2update == nil) { y2milestone ("No YaST update found on the media"); - } - else - { + } else { UpdateInstSys (y2update); } + + return true; +} + +/** + * Removes (from disk cache) a control file which was included in + * the add-on product. + */ +global boolean RemoveAddOnControlFile (integer srcid) { + string filename = sformat("%1/%2.xml", TmpdirForControlFiles(), srcid); + + if (FileUtils::Exists (filename)) { + y2milestone ("Removing: %1", filename); + if ((boolean) SCR::Execute (.target.remove, filename)) { + return true; + } else { + y2error ("Cannot remove file %1", filename); + return false; + } + } else { + y2milestone("File %1 does not exist, no need to remove it", filename); + return true; + } +} + +/** + * Some product(s) were removed, reintegrating their control files from scratch. + */ +global boolean ReIntegrateFromScratch () { + y2milestone ("Reintegration workflows from scratch..."); + ResetSystemWorkflowsAndProposals (); + + foreach (map<string,any> prod, AddOnProduct::add_on_products, { + integer srcid = (integer) prod["media"]:nil; + + if (srcid == nil) { + y2error ("Wrong definition of Add-on product: %1, cannot reintegrate", srcid); + return; + } else { + y2milestone ("Reintegrating product %1", prod); + Integrate (srcid); + } + }); + + // steps might be changed, forcing redraw + y2milestone ("Forcing RedrawWizardSteps()"); + RedrawWizardSteps (); + return true; } @@ -871,6 +999,8 @@ return true; } list<string> products = splitstring ((string)SCR::Read (.target.string, filelist), "\r\n"); + + y2milestone ("Adding products: %1", products); foreach (string p, products, { if (p == "") return; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/src/modules/ProductLicense.ycp new/yast2-installation-2.15.1/src/modules/ProductLicense.ycp --- old/yast2-installation-2.14.15/src/modules/ProductLicense.ycp 2006-11-23 10:51:21.000000000 +0100 +++ new/yast2-installation-2.15.1/src/modules/ProductLicense.ycp 2006-12-07 10:13:47.000000000 +0100 @@ -213,6 +213,7 @@ list<string> available_langs = []; string license_dir = nil; + // Base-product license if (src_id == nil) { if (Stage::initial ()) @@ -226,10 +227,12 @@ if (FileUtils::Exists ("/info.txt")) info_file = "/info.txt"; } + // Add-on-product license else { y2milestone ("Getting license info from source %1", src_id); - tmpdir = (string) SCR::Read(.target.tmpdir) + "/product-license/"; + // using a separate license directory for all products + tmpdir = sformat("%1/product-license/%2/", (string) SCR::Read(.target.tmpdir), src_id); license_dir = tmpdir; string license_file = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/license.zip"); @@ -266,7 +269,7 @@ Language::language, substring (Language::language, 0, 2), // "it_IT" -> "it" "en_US", - "en_EN", + "en_GB", "en", "" // license.txt fallback ]; @@ -436,13 +439,9 @@ // bug #223258 // disabling back button when the select-language dialog is skipped // - // FIXME: hotfix for 10.2, solve better for 10.3 - // boolean enable_back = true; - if (Stage::initial () && - ProductFeatures::GetBooleanFeature ("globals", "skip_language_dialog") && - Language::preselected != "en_US" - ) enable_back = false; + if (Language::selection_skipped) + enable_back = false; return AskLicenseAgreement (nil, "", [ "license\\.txt", "license\\.%1\\.txt" ], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/startup/YaST2.Second-Stage new/yast2-installation-2.15.1/startup/YaST2.Second-Stage --- old/yast2-installation-2.14.15/startup/YaST2.Second-Stage 2006-08-09 12:31:07.000000000 +0200 +++ new/yast2-installation-2.15.1/startup/YaST2.Second-Stage 2006-11-29 15:47:39.000000000 +0100 @@ -15,7 +15,7 @@ # : We will now prepare YaST2 for the so called continue # : mode # : -# STATUS : $Id: YaST2.Second-Stage 32171 2006-08-04 14:35:07Z jsrain $ +# STATUS : $Id: YaST2.Second-Stage 33280 2006-10-09 14:21:31Z locilka $ #---------------- #set -x diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.15/startup/YaST2.ssh new/yast2-installation-2.15.1/startup/YaST2.ssh --- old/yast2-installation-2.14.15/startup/YaST2.ssh 2006-06-26 09:11:01.000000000 +0200 +++ new/yast2-installation-2.15.1/startup/YaST2.ssh 2006-12-07 10:59:55.000000000 +0100 @@ -16,30 +16,62 @@ # : This script is called manually # : # : -# STATUS : $Id: YaST2.ssh 20490 2004-12-03 14:11:24Z ms $ +# STATUS : $Id: YaST2.ssh 34842 2006-12-07 09:59:53Z locilka $ #---------------- -# -#======================================== -# call YaST2 if flag file exists -#---------------------------------------- -if [ -f /var/lib/YaST2/runme_at_boot ];then - /usr/lib/YaST2/startup/YaST2.call installation continue - rm -fv /var/lib/YaST2/runme_at_boot -else - exit 1 -fi #======================================== # boot into system #---------------------------------------- +function continue_after_second_stage () { cat <<-EOF - continue with booting ... + + Continue with booting ... You can login with the (new?) root password or the new created user account in a few seconds ... + +EOF +} + +function reboot_during_second_stage () { +cat <<-EOF + + Your system has been updated and needs to reboot ... + + Reconnect to the system after it reboots and call + /usr/lib/YaST2/startup/YaST2.ssh again to continue + the installation ... + EOF +} + +function not_running_yast () { +cat <<-EOF + + File /var/lib/YaST2/runme_at_boot does not exist ... + + Not running YaST ... + +EOF +} #======================================== -# remove flag file +# call YaST2 if flag file exists #---------------------------------------- -rm -f /var/lib/YaST2/runme_at_boot +if [ -f /var/lib/YaST2/runme_at_boot ];then + + # running the second stage installation + /usr/lib/YaST2/startup/YaST2.call installation continue + + # second stage installation needs to reboot + if [ -f /var/lib/YaST2/reboot ]; then + reboot_during_second_stage + # second stage has just finished + else + continue_after_second_stage + fi +else + not_running_yast + + exit 1 +fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 evms
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package evms checked in at Thu Dec 7 19:56:14 CET 2006. -------- --- evms/evms.changes 2006-11-19 12:03:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/evms/evms.changes 2006-12-07 17:56:03.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 7 09:55:45 MST 2006 - cgao(a)novell.com + +- Modify MAC partition minor # to match that of the OS #219788 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evms.spec ++++++ --- /var/tmp/diff_new_pack.1tNRHe/_old 2006-12-07 19:55:20.000000000 +0100 +++ /var/tmp/diff_new_pack.1tNRHe/_new 2006-12-07 19:55:20.000000000 +0100 @@ -21,7 +21,7 @@ %endif Autoreqprov: on Version: 2.5.5 -Release: 62 +Release: 67 Summary: EVMS--Enterprise Volume Management System BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: http://prdownloads.sourceforge.net/evms/evms-%{version}.tar.bz2 @@ -206,6 +206,8 @@ /etc/ha.d/resource.d/evms_failover %changelog -n evms +* Thu Dec 07 2006 - cgao(a)novell.com +- Modify MAC partition minor # to match that of the OS #219788 * Sun Nov 19 2006 - olh(a)suse.de - evms does NOT need iptables during build * Wed Nov 01 2006 - cgao(a)novell.com ++++++ cli_query_segfault.patch ++++++ --- /var/tmp/diff_new_pack.1tNRHe/_old 2006-12-07 19:55:20.000000000 +0100 +++ /var/tmp/diff_new_pack.1tNRHe/_new 2006-12-07 19:55:20.000000000 +0100 @@ -26,3 +26,20 @@ } break; default: + +--- evms-2.5.5/plugins/mac/discovery.c 2004-06-04 15:48:10.000000000 -0600 ++++ evms-2.5.5/plugins/mac/discovery.c 2006-12-07 02:17:00.000000000 -0700 +@@ -258,7 +258,6 @@ + if (seg) { + rc = insert_mac_segment_into_list( ld->parent_objects, seg); + if (!rc) { +- ++minor; + ++seg_count; + } + } +@@ -267,6 +266,7 @@ + LOG_DEBUG(" Index (%d): unused pmap entry\n",i); + } + ++ ++minor; + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-firewall
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-firewall checked in at Thu Dec 7 19:56:02 CET 2006. -------- --- yast2-firewall/yast2-firewall.changes 2006-10-26 17:31:33.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-firewall/yast2-firewall.changes 2006-12-04 16:42:19.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 4 16:38:22 CET 2006 - locilka(a)suse.cz + +- A little help/description for firewall module in installation + proposal (using result of FATE #301151). +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-firewall-2.14.1.tar.bz2 New: ---- yast2-firewall-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firewall.spec ++++++ --- /var/tmp/diff_new_pack.s7l3qd/_old 2006-12-07 19:54:47.000000000 +0100 +++ /var/tmp/diff_new_pack.s7l3qd/_new 2006-12-07 19:54:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-firewall (Version 2.14.1) +# spec file for package yast2-firewall (Version 2.15.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-firewall -Version: 2.14.1 +Version: 2.15.0 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-firewall-2.14.1.tar.bz2 +Source0: yast2-firewall-2.15.0.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 >= 2.13.70 @@ -39,7 +39,7 @@ Lukas Ocilka <locilka(a)suse.de> %prep -%setup -n yast2-firewall-2.14.1 +%setup -n yast2-firewall-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,10 @@ %doc %{prefix}/share/doc/packages/yast2-firewall %changelog -n yast2-firewall +* Mon Dec 04 2006 - locilka(a)suse.cz +- A little help/description for firewall module in installation + proposal (using result of FATE #301151). +- 2.15.0 * Thu Oct 26 2006 - locilka(a)suse.cz - Added and fixed firewall.rnc for checking AutoYaST profile (#215248). ++++++ yast2-firewall-2.14.1.tar.bz2 -> yast2-firewall-2.15.0.tar.bz2 ++++++ ++++ 5157 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.14.1/Makefile.am new/yast2-firewall-2.15.0/Makefile.am --- old/yast2-firewall-2.14.1/Makefile.am 2006-10-26 17:39:03.000000000 +0200 +++ new/yast2-firewall-2.15.0/Makefile.am 2006-12-05 13:47:50.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.14.1/Makefile.am.common new/yast2-firewall-2.15.0/Makefile.am.common --- old/yast2-firewall-2.14.1/Makefile.am.common 2006-10-26 17:39:03.000000000 +0200 +++ new/yast2-firewall-2.15.0/Makefile.am.common 2006-12-05 13:47:50.000000000 +0100 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.14.1/VERSION new/yast2-firewall-2.15.0/VERSION --- old/yast2-firewall-2.14.1/VERSION 2006-10-26 16:55:52.000000000 +0200 +++ new/yast2-firewall-2.15.0/VERSION 2006-12-04 16:33:49.000000000 +0100 @@ -1 +1 @@ -2.14.1 +2.15.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.14.1/autodocs-ycp.ami new/yast2-firewall-2.15.0/autodocs-ycp.ami --- old/yast2-firewall-2.14.1/autodocs-ycp.ami 2006-10-26 17:39:03.000000000 +0200 +++ new/yast2-firewall-2.15.0/autodocs-ycp.ami 2006-12-05 13:47:50.000000000 +0100 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 32798 2006-09-11 11:25:01Z mvidner $ +# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.14.1/configure.in new/yast2-firewall-2.15.0/configure.in --- old/yast2-firewall-2.14.1/configure.in 2006-10-26 17:39:03.000000000 +0200 +++ new/yast2-firewall-2.15.0/configure.in 2006-12-05 13:47:50.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-firewall dnl -dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-firewall, 2.14.1, http://bugs.opensuse.org/, yast2-firewall) +AC_INIT(yast2-firewall, 2.15.0, http://bugs.opensuse.org/, yast2-firewall) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.1" +VERSION="2.15.0" RPMNAME="yast2-firewall" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -110,6 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -142,6 +144,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) AC_CONFIG_FILES(Makefile config/Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.14.1/src/firewall_proposal.ycp new/yast2-firewall-2.15.0/src/firewall_proposal.ycp --- old/yast2-firewall-2.14.1/src/firewall_proposal.ycp 2006-10-09 15:55:37.000000000 +0200 +++ new/yast2-firewall-2.15.0/src/firewall_proposal.ycp 2006-12-04 16:42:41.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Firewall configuration proposal * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: firewall_proposal.ycp 25584 2005-09-23 07:53:09Z locilka $ + * $Id: firewall_proposal.ycp 34735 2006-12-04 15:42:36Z locilka $ */ { @@ -22,6 +22,8 @@ import "Progress"; import "ProductFeatures"; +include "firewall/helps.ycp"; + boolean enable_firewall_init_default = ProductFeatures::GetBooleanFeature ("globals", "enable_firewall"); boolean enable_ssh_default = ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh"); @@ -70,6 +72,7 @@ "firewall--enable_ssh_in_proposal", "firewall--disable_ssh_in_proposal", "firewall--enable_vnc_in_proposal", "firewall--disable_vnc_in_proposal", ], + "help" : HelpForDialog ("installation_proposal"), ]; Progress::set (progress_orig); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.14.1/src/helps.ycp new/yast2-firewall-2.15.0/src/helps.ycp --- old/yast2-firewall-2.14.1/src/helps.ycp 2006-10-09 17:16:04.000000000 +0200 +++ new/yast2-firewall-2.15.0/src/helps.ycp 2006-12-04 16:42:41.000000000 +0100 @@ -6,7 +6,7 @@ * Summary: Firewall dialogs helps * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: helps.ycp 33291 2006-10-09 15:15:59Z locilka $ + * $Id: helps.ycp 34735 2006-12-04 15:42:36Z locilka $ * * File includes helps for yast2-firewall dialogs. */ @@ -178,7 +178,11 @@ // TRANSLATORS: Additional Services dialog help 6/6 _("The Port Name is a name assigned to a port number by the IANA organization. One port number can have multiple port names assigned. Find -the assignment currently in use in the <tt>/etc/services</tt> file.") +the assignment currently in use in the <tt>/etc/services</tt> file."), + + // TRANSLATORS: help for Installation Proposal Dialog + "installation_proposal" : _("<big>Firewall</big> +Firewall is a defensive mechanism that protects your computer from network attacks."), ]; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 evince
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package evince checked in at Thu Dec 7 19:55:14 CET 2006. -------- --- GNOME/evince/evince.changes 2006-11-13 19:15:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/evince/evince.changes 2006-12-07 13:00:35.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 7 13:00:35 CET 2006 - sbrabec(a)suse.cz + +- Fixed buffer overflow in DSC parsing (#225201, CVE-2006-5864). + +------------------------------------------------------------------- New: ---- evince-CVE-2006-5864.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evince.spec ++++++ --- /var/tmp/diff_new_pack.8acoYM/_old 2006-12-07 19:54:25.000000000 +0100 +++ /var/tmp/diff_new_pack.8acoYM/_new 2006-12-07 19:54:25.000000000 +0100 @@ -13,13 +13,14 @@ Name: evince BuildRequires: ghostscript-fonts-std ghostscript-x11 gnome-doc-utils-devel gnome-icon-theme gnutls-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libtiff-devel libwnck-devel mDNSResponder-devel perl-XML-Parser poppler-devel poppler-glib scrollkeeper update-desktop-files Version: 0.6.1 -Release: 16 +Release: 22 URL: http://www.gnome.org/projects/evince/ Group: System/GUI/GNOME -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Summary: GNOME Document Viewer Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.4/%{name}-%{version}.tar.bz2 Patch: evince-desktop.patch +Patch1: evince-CVE-2006-5864.patch Autoreqprov: on Requires: gnome-icon-theme BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,6 +43,7 @@ %prep %setup %patch +%patch1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -84,6 +86,8 @@ #/opt/gnome/share/locale/*/LC_MESSAGES/Evince.mo %changelog -n evince +* Thu Dec 07 2006 - sbrabec(a)suse.cz +- Fixed buffer overflow in DSC parsing (#225201, CVE-2006-5864). * Mon Nov 13 2006 - jhargadon(a)suse.de - re-enabling evince-desktop.patch to resolve bug #220232 * Tue Oct 17 2006 - jhargadon(a)suse.de ++++++ evince-CVE-2006-5864.patch ++++++ --- ps/ps.c +++ ps/ps.c @@ -1232,6 +1232,8 @@ quoted = 1; line++; while(*line && !(*line == ')' && level == 0)) { + if (cp - text >= PSLINELENGTH - 2) + return NULL; if(*line == '\\') { if(*(line + 1) == 'n') { *cp++ = '\n'; @@ -1302,8 +1304,11 @@ } } else { - while(*line && !(*line == ' ' || *line == '\t' || *line == '\n')) + while(*line && !(*line == ' ' || *line == '\t' || *line == '\n')) { + if (cp - text >= PSLINELENGTH - 2) + return NULL; *cp++ = *line++; + } } *cp = '\0'; if(next_char) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 epiphany-extensions
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package epiphany-extensions checked in at Thu Dec 7 19:54:20 CET 2006. -------- --- GNOME/epiphany-extensions/epiphany-extensions.changes 2006-11-07 19:20:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/epiphany-extensions/epiphany-extensions.changes 2006-12-05 17:13:18.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 1 12:57:52 CET 2006 - sbrabec(a)suse.cz + +- Fixed xulrunner dependencies for older products. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ epiphany-extensions.spec ++++++ --- /var/tmp/diff_new_pack.EX3a8k/_old 2006-12-07 19:51:04.000000000 +0100 +++ /var/tmp/diff_new_pack.EX3a8k/_new 2006-12-07 19:51:04.000000000 +0100 @@ -14,30 +14,30 @@ %define xulrunner_version 181 BuildRequires: epiphany epiphany-devel gcc-c++ gnome-common gnome-doc-utils-devel gnutls-devel gtk2 intltool libgnomeprintui-devel libwnck-devel libxml2-python mDNSResponder-devel mozilla-xulrunner181-devel opensp-devel perl-XML-Parser python-devel scrollkeeper update-desktop-files Version: 2.16.1 -Release: 20 +Release: 29 URL: http://www.gnome.org/projects/epiphany/ Prefix: /opt/gnome Group: Productivity/Networking/Web/Browsers -License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL) +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Summary: Extensions Collection for Epiphany Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.8/%{name}-%{version}.tar.bz2 Autoreqprov: on Provides: epiphany-plugins Obsoletes: epiphany-plugins -%if %suse_version < 1000 +%if %suse_version > 1010 || 0%{?opensuse_bs} +BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel +%define mozilla_ver %(rpm -q --qf '%%{version}' mozilla-xulrunner%{xulrunner_version}) +Requires: mozilla-xulrunner%{xulrunner_version} = %{mozilla_ver} +%else +%if %suse_version > 1000 && %suse_version <= 1010 +BuildRequires: gecko-sdk +%define mozilla_ver %(rpm -q --qf '%%{version}' mozilla-xulrunner) +Requires: mozilla-xulrunner = %{mozilla_ver} +%else BuildRequires: mozilla-devel %define mozilla_ver %(rpm -q --qf '%%{version}' mozilla) Requires: mozilla = %{mozilla_ver} %endif -%if %suse_version > 1000 && %suse_version < 1010 -BuildRequires: mozilla-xulrunner-devel -%define mozilla_ver %(rpm -q --qf '%%{version}' mozilla-xulrunner) -Requires: mozilla-xulrunner = %{mozilla_ver} -%endif -%if %suse_version > 1010 -BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel -%define mozilla_ver %(rpm -q --qf '%%{version}' mozilla-xulrunner%{xulrunner_version}) -Requires: mozilla-xulrunner%{xulrunner_version} = %{mozilla_ver} %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -105,6 +105,8 @@ %prefix/share/gnome/help/epiphany-extensions/C/* %changelog -n epiphany-extensions +* Fri Dec 01 2006 - sbrabec(a)suse.cz +- Fixed xulrunner dependencies for older products. * Tue Nov 07 2006 - sbrabec(a)suse.cz - Use exact xulrunner version 181 (#216100). * Tue Nov 07 2006 - meissner(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 yast2-bluetooth
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-bluetooth checked in at Thu Dec 7 19:54:14 CET 2006. -------- --- yast2-bluetooth/yast2-bluetooth.changes 2006-08-16 15:01:11.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-bluetooth/yast2-bluetooth.changes 2006-12-04 15:40:20.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Nov 29 16:26:36 CET 2006 - lslezak(a)suse.cz + +- display the bluetooth icon (#211565) +- help text: added description of %h and %d sequences in device + name (#144696) +- do not try to read non existing config files (#211902) +- use Progress:set() +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-bluetooth-2.14.0.tar.bz2 New: ---- yast2-bluetooth-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bluetooth.spec ++++++ --- /var/tmp/diff_new_pack.6V1x8P/_old 2006-12-07 19:53:04.000000000 +0100 +++ /var/tmp/diff_new_pack.6V1x8P/_new 2006-12-07 19:53:04.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bluetooth (Version 2.14.0) +# spec file for package yast2-bluetooth (Version 2.15.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-bluetooth -Version: 2.14.0 +Version: 2.15.0 Release: 1 -License: GPL +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bluetooth-2.14.0.tar.bz2 +Source0: yast2-bluetooth-2.15.0.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 @@ -34,7 +34,7 @@ Ladislav Slezak <lslezak(a)suse.cz> %prep -%setup -n yast2-bluetooth-2.14.0 +%setup -n yast2-bluetooth-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -70,6 +70,13 @@ %doc %{prefix}/share/doc/packages/yast2-bluetooth %changelog -n yast2-bluetooth +* Wed Nov 29 2006 - lslezak(a)suse.cz +- display the bluetooth icon (#211565) +- help text: added description of %%h and %%d sequences in device + name (#144696) +- do not try to read non existing config files (#211902) +- use Progress:set() +- 2.15.0 * Wed Aug 16 2006 - lslezak(a)suse.cz - adapted to bluez-3.1 - 2.14.0 ++++++ yast2-bluetooth-2.14.0.tar.bz2 -> yast2-bluetooth-2.15.0.tar.bz2 ++++++ ++++ 5148 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/Makefile.am new/yast2-bluetooth-2.15.0/Makefile.am --- old/yast2-bluetooth-2.14.0/Makefile.am 2006-08-16 13:53:38.000000000 +0200 +++ new/yast2-bluetooth-2.15.0/Makefile.am 2006-11-30 13:09:01.000000000 +0100 @@ -67,7 +67,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in +$(RPMNAME).pc: $(RPMNAME).pc.in config.status ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/Makefile.am.common new/yast2-bluetooth-2.15.0/Makefile.am.common --- old/yast2-bluetooth-2.14.0/Makefile.am.common 2006-08-16 13:53:38.000000000 +0200 +++ new/yast2-bluetooth-2.15.0/Makefile.am.common 2006-11-30 13:09:01.000000000 +0100 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/VERSION new/yast2-bluetooth-2.15.0/VERSION --- old/yast2-bluetooth-2.14.0/VERSION 2006-08-16 13:50:06.000000000 +0200 +++ new/yast2-bluetooth-2.15.0/VERSION 2006-11-30 10:09:58.000000000 +0100 @@ -1 +1 @@ -2.14.0 +2.15.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/configure.in new/yast2-bluetooth-2.15.0/configure.in --- old/yast2-bluetooth-2.14.0/configure.in 2006-08-16 13:53:38.000000000 +0200 +++ new/yast2-bluetooth-2.15.0/configure.in 2006-11-30 13:09:01.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-bluetooth dnl -dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-bluetooth, 2.14.0, http://bugs.opensuse.org/, yast2-bluetooth) +AC_INIT(yast2-bluetooth, 2.15.0, http://bugs.opensuse.org/, yast2-bluetooth) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.0" +VERSION="2.15.0" RPMNAME="yast2-bluetooth" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/src/Bluetooth.ycp new/yast2-bluetooth-2.15.0/src/Bluetooth.ycp --- old/yast2-bluetooth-2.14.0/src/Bluetooth.ycp 2006-08-16 14:56:32.000000000 +0200 +++ new/yast2-bluetooth-2.15.0/src/Bluetooth.ycp 2006-11-30 13:08:34.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Bluetooth settings, input and output functions * Authors: Ladislav Slezak <lslezak(a)suse.cz> * - * $Id: Bluetooth.ycp 32379 2006-08-16 12:58:07Z lslezak $ + * $Id: Bluetooth.ycp 34666 2006-11-30 12:08:31Z lslezak $ * * Representation of the configuration of bluetooth devices. * Input and output routines. @@ -127,13 +127,25 @@ * @return true on success */ global boolean Read() { + + // check whether the sysconfig file exists, if not then use the default values, + // bluez-utils package might not be installed at HW proposal in the 2nd stage + boolean read_sysconfig = true; + const string sysconfig_file = "/etc/sysconfig/bluetooth"; + + if (SCR::Read(.target.size, sysconfig_file) < 0) + { + y2warning("File %1 doesn't exist, using default values", sysconfig_file); + read_sysconfig = false; + } + // read sysconfig settings // read global setting - enabled = (SCR::Read(.sysconfig.bluetooth.START_SERVICES) == "yes"); + enabled = read_sysconfig ? (SCR::Read(.sysconfig.bluetooth.START_SERVICES) == "yes") : false; y2milestone("bluetooth enabled: %1", enabled); // search for all daemon variables - list<string> dir = (list<string>) SCR::Dir(.sysconfig.bluetooth); + list<string> dir = read_sysconfig ? (list<string>) SCR::Dir(.sysconfig.bluetooth) : []; y2debug("detected variables: %1", dir); list<string> detected_services = detect_services(dir); @@ -157,16 +169,28 @@ ); y2milestone("configuration of daemons: %1", daemons); + + // check whether the config file exists, if not then use the default values, + // bluez-utils package might not be installed at HW proposal in the 2nd stage + boolean read_hcid = true; + const string hcid_file = "/etc/bluetooth/hcid.conf"; + + if (SCR::Read(.target.size, hcid_file) < 0) + { + y2warning("File %1 doesn't exist, using default values", hcid_file); + read_hcid = false; + } + // read hcid.conf settings // read scan settings - inquiry_scan = (SCR::Read(.bluetooth.hcid.value.device.iscan) == ["enable"]); + inquiry_scan = read_hcid ? (SCR::Read(.bluetooth.hcid.value.device.iscan) == ["enable"]) : false; y2milestone("inquiry_scan: %1", inquiry_scan); - page_scan = (SCR::Read(.bluetooth.hcid.value.device.pscan) == ["enable"]); + page_scan = read_hcid ? (SCR::Read(.bluetooth.hcid.value.device.pscan) == ["enable"]) : false; y2milestone("page_scan: %1", page_scan); - security_manager = ((list<string>)SCR::Read(.bluetooth.hcid.value.options.security))[0]:"auto"; + security_manager = read_hcid ? (((list<string>)SCR::Read(.bluetooth.hcid.value.options.security))[0]:"auto") : "auto"; y2milestone("security_manager: %1", security_manager); - device_name = ((list<string>)SCR::Read(.bluetooth.hcid.value.device.name))[0]:"\"BlueZ %h (%d)\""; + device_name = read_hcid ? (((list<string>)SCR::Read(.bluetooth.hcid.value.device.name))[0]:"\"BlueZ %h (%d)\"") : "\"BlueZ %h (%d)\""; // remove leading and trailing double quotes string device_name_parsed = regexpsub(device_name, "^\"(.*)\"$", "\\1"); @@ -177,7 +201,7 @@ y2milestone("device_name: %1", device_name); // read device and service class - string class_str = ((list<string>)SCR::Read(.bluetooth.hcid.value.device.class))[0]:"0x100100"; + string class_str = read_hcid ? (((list<string>)SCR::Read(.bluetooth.hcid.value.device.class))[0]:"0x100100") : "0x100100"; y2milestone("class_str: %1", class_str); integer class = tointeger(class_str); @@ -187,7 +211,7 @@ y2milestone("service_class: %1", tohexstring(service_class)); // read PIN - pin = ((list<string>)SCR::Read(.bluetooth.hcid.value.options.passkey))[0]:"\"BlueZ\""; + pin = read_hcid ? (((list<string>)SCR::Read(.bluetooth.hcid.value.options.passkey))[0]:"\"BlueZ\"") : "\"BlueZ\""; // remove leading and trailing double quotes string pin_parsed = regexpsub(pin, "^\"(.*)\"$", "\\1"); @@ -195,7 +219,7 @@ { pin = pin_parsed; } - y2milestone("pin: %1", pin); + y2debug("pin: %1", pin); return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/src/bluetooth_proposal.ycp new/yast2-bluetooth-2.15.0/src/bluetooth_proposal.ycp --- old/yast2-bluetooth-2.14.0/src/bluetooth_proposal.ycp 2005-05-18 12:40:19.000000000 +0200 +++ new/yast2-bluetooth-2.15.0/src/bluetooth_proposal.ycp 2006-11-30 13:08:34.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Proposal function dispatcher. * Authors: Ladislav Slezak <lslezak(a)suse.cz> * - * $Id: bluetooth_proposal.ycp 22789 2005-03-24 14:32:08Z lslezak $ + * $Id: bluetooth_proposal.ycp 34666 2006-11-30 12:08:31Z lslezak $ * * Proposal function dispatcher for bluetooth configuration. * See source/installation/proposal/proposal-API.txt @@ -33,7 +33,7 @@ if(force_reset || !Bluetooth::proposal_valid) { Bluetooth::proposal_valid = true; - Progress::off(); + boolean progress = Progress::set(false); // open progress popup window UI::OpenDialog(`VBox(`Label(_("Detecting Bluetooth adapters...")))); @@ -43,7 +43,7 @@ // close progress popup UI::CloseDialog(); - Progress::on(); + Progress::set(progress); } string proposal = Bluetooth::Summary(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/src/helps.ycp new/yast2-bluetooth-2.15.0/src/helps.ycp --- old/yast2-bluetooth-2.14.0/src/helps.ycp 2006-08-16 14:56:32.000000000 +0200 +++ new/yast2-bluetooth-2.15.0/src/helps.ycp 2006-11-30 08:14:17.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Help texts of all the dialogs * Authors: Ladislav Slezak <lslezak(a)suse.cz> * - * $Id: helps.ycp 32379 2006-08-16 12:58:07Z lslezak $ + * $Id: helps.ycp 34660 2006-11-30 07:14:15Z lslezak $ */ { @@ -31,7 +31,10 @@ ") + /* Help text for global settings dialog 3/6*/ -_("Device Name is the name visible when remote devices ask for it.") + + +_("Device Name is the name visible when remote devices ask for it. +The name can contain sequence %h (which is replaced by the host name) or %d +(replaced by device ID of the bluetooth adapter).") + /* Help text for global settings dialog 4/6*/ _("Assign which services (or profiles as they are called in Bluetooth) are available diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/src/wizards.ycp new/yast2-bluetooth-2.15.0/src/wizards.ycp --- old/yast2-bluetooth-2.14.0/src/wizards.ycp 2005-01-21 18:37:04.000000000 +0100 +++ new/yast2-bluetooth-2.15.0/src/wizards.ycp 2006-11-29 16:35:27.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Wizards definitions * Authors: Ladislav Slezak <lslezak(a)suse.cz> * - * $Id: wizards.ycp 20674 2005-01-06 15:41:46Z lslezak $ + * $Id: wizards.ycp 34650 2006-11-29 15:35:25Z lslezak $ */ { @@ -87,6 +87,7 @@ ]; Wizard::CreateDialog(); + Wizard::SetDesktopIcon("bluetooth"); any ret = Sequencer::Run(aliases, sequence); @@ -102,6 +103,7 @@ any BluetoothAutoSequence() { Wizard::CreateDialog(); + Wizard::SetDesktopIcon("bluetooth"); any ret = MainSequence(); UI::CloseDialog(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xsp
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package xsp checked in at Thu Dec 7 19:54:01 CET 2006. -------- --- xsp/xsp.changes 2006-10-21 02:28:38.000000000 +0200 +++ /mounts/work_src_done/NOARCH/xsp/xsp.changes 2006-12-02 21:56:39.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Dec 2 21:48:34 CET 2006 - wberrier(a)suse.de + +- Update to 1.2.1 (Fate #301111) + -Bugfixes: + -close the connection if there's an error reading the headers + (including assembly loading exceptions due to a bad installation). + -kill the warning that everyone is worried about. + +------------------------------------------------------------------- Old: ---- xsp-1.1.18.tar.gz New: ---- xsp-1.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsp.spec ++++++ --- /var/tmp/diff_new_pack.tVaJOA/_old 2006-12-07 19:52:32.000000000 +0100 +++ /var/tmp/diff_new_pack.tVaJOA/_new 2006-12-07 19:52:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xsp (Version 1.1.18) +# spec file for package xsp (Version 1.2.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,12 +16,12 @@ %define prefix /usr %define gnome_prefix /opt/gnome %define sysconfdir /etc -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: Productivity/Networking/Web/Servers Autoreqprov: on Requires: gnome-filesystem -Version: 1.1.18 -Release: 1 +Version: 1.2.1 +Release: 2 Summary: Small Web Server Hosting ASP.NET Source: %{name}-%{version}.tar.gz #Patch: xsp-libexecdir.patch @@ -77,6 +77,12 @@ %doc NEWS README %changelog -n xsp +* Sat Dec 02 2006 - wberrier(a)suse.de +- Update to 1.2.1 (Fate #301111) + -Bugfixes: + -close the connection if there's an error reading the headers + (including assembly loading exceptions due to a bad installation). + -kill the warning that everyone is worried about. * Sat Oct 21 2006 - wberrier(a)suse.de - Update to 1.1.18 -2.0 updates ++++++ xsp-1.1.18.tar.gz -> xsp-1.2.1.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsp-1.1.18/ChangeLog new/xsp-1.2.1/ChangeLog --- old/xsp-1.1.18/ChangeLog 2006-10-12 22:03:48.000000000 +0200 +++ new/xsp-1.2.1/ChangeLog 2006-11-17 19:54:54.000000000 +0100 @@ -1,3 +1,16 @@ +2006-11-17 Wade Berrier <wberrier(a)novell.com> + + * configure.in: version bump -> 1.2.1 + +2006-11-16 Gonzalo Paniagua Javier <gonzalo(a)ximian.com> + + * src/Mono.WebServer/XSPWorkerRequest.cs: close the connection if + there's an error reading the headers (including assembly loading + exceptions due to a bad installation). + + * src/ModMonoApplicationHost.cs: kill the warning that everyone is + worried about. + 2006-09-11 Gonzalo Paniagua Javier <gonzalo(a)ximian.com> * src/Mono.WebServer/ApplicationServer.cs: don't run BeginAccept when diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsp-1.1.18/configure new/xsp-1.2.1/configure --- old/xsp-1.1.18/configure 2006-10-12 22:03:58.000000000 +0200 +++ new/xsp-1.2.1/configure 2006-11-17 19:55:08.000000000 +0100 @@ -1620,7 +1620,7 @@ # Define the identity of the package. PACKAGE=xsp - VERSION=1.1.18 + VERSION=1.2.1 cat >>confdefs.h <<_ACEOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsp-1.1.18/configure.in new/xsp-1.2.1/configure.in --- old/xsp-1.1.18/configure.in 2006-10-12 22:03:48.000000000 +0200 +++ new/xsp-1.2.1/configure.in 2006-11-17 19:54:54.000000000 +0100 @@ -1,7 +1,7 @@ AC_PREREQ(2.57) AC_INIT(src/server.cs) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(xsp, 1.1.18) +AM_INIT_AUTOMAKE(xsp, 1.2.1) AM_MAINTAINER_MODE AC_PROG_INSTALL diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsp-1.1.18/src/ModMonoApplicationHost.cs new/xsp-1.2.1/src/ModMonoApplicationHost.cs --- old/xsp-1.1.18/src/ModMonoApplicationHost.cs 2006-08-25 21:55:56.000000000 +0200 +++ new/xsp-1.2.1/src/ModMonoApplicationHost.cs 2006-11-17 19:54:54.000000000 +0100 @@ -53,7 +53,8 @@ try { locker = File.OpenWrite (lockfile); } catch { - Console.Error.WriteLine ("Another mod-mono-server with the same arguments is already running."); + // Silently exit. Many people confused about this harmless message. + //Console.Error.WriteLine ("Another mod-mono-server with the same arguments is already running."); Environment.Exit (1); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsp-1.1.18/src/Mono.WebServer/XSPApplicationHost.cs new/xsp-1.2.1/src/Mono.WebServer/XSPApplicationHost.cs --- old/xsp-1.1.18/src/Mono.WebServer/XSPApplicationHost.cs 2006-09-05 21:01:32.000000000 +0200 +++ new/xsp-1.2.1/src/Mono.WebServer/XSPApplicationHost.cs 2006-11-17 19:54:53.000000000 +0100 @@ -37,7 +37,6 @@ using System.Web; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; -using Mono.Security.Authenticode; using Mono.Security.Protocol.Tls; using SecurityProtocolType = Mono.Security.Protocol.Tls.SecurityProtocolType; using X509Certificate = System.Security.Cryptography.X509Certificates.X509Certificate; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsp-1.1.18/src/Mono.WebServer/XSPWorkerRequest.cs new/xsp-1.2.1/src/Mono.WebServer/XSPWorkerRequest.cs --- old/xsp-1.1.18/src/Mono.WebServer/XSPWorkerRequest.cs 2006-08-25 21:55:56.000000000 +0200 +++ new/xsp-1.2.1/src/Mono.WebServer/XSPWorkerRequest.cs 2006-11-17 19:54:53.000000000 +0100 @@ -184,7 +184,13 @@ position = 0; this.secure = secure; - GetRequestHeaders (); + try { + GetRequestHeaders (); + } catch { + CloseConnection (); + throw; + } + string cncHeader = (string) headers ["Connection"]; if (cncHeader != null) { cncHeader = cncHeader.ToLower (); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-backup
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-backup checked in at Thu Dec 7 19:52:59 CET 2006. -------- --- yast2-backup/yast2-backup.changes 2006-11-07 16:58:57.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-backup/yast2-backup.changes 2006-12-04 10:18:16.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Dec 4 09:27:07 CET 2006 - locilka(a)suse.cz + +- Calling client backup_get_packages via .target.bash_output + instead of WFM::call() in order to save memory occupied by ZYPP. + It saves more than 70 MB or RAM (#224899). +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-backup-2.14.1.tar.bz2 New: ---- yast2-backup-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-backup.spec ++++++ --- /var/tmp/diff_new_pack.2yKRv9/_old 2006-12-07 19:52:05.000000000 +0100 +++ /var/tmp/diff_new_pack.2yKRv9/_new 2006-12-07 19:52:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-backup (Version 2.14.1) +# spec file for package yast2-backup (Version 2.15.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-backup -Version: 2.14.1 +Version: 2.15.0 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-backup-2.14.1.tar.bz2 +Source0: yast2-backup-2.15.0.tar.bz2 prefix: /usr BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-network yast2-nfs-client yast2-testsuite yast2-tune yast2-update Summary: YaST2 - System Backup @@ -39,7 +39,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-backup-2.14.1 +%setup -n yast2-backup-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -79,6 +79,11 @@ %doc %{prefix}/share/doc/packages/yast2-backup %changelog -n yast2-backup +* Mon Dec 04 2006 - locilka(a)suse.cz +- Calling client backup_get_packages via .target.bash_output + instead of WFM::call() in order to save memory occupied by ZYPP. + It saves more than 70 MB or RAM (#224899). +- 2.15.0 * Tue Nov 07 2006 - locilka(a)suse.cz - Using Pkg::TargetInitialize instead of Pkg::TargetInit to initialize installed vs. available packages correctly (#199656). ++++++ yast2-backup-2.14.1.tar.bz2 -> yast2-backup-2.15.0.tar.bz2 ++++++ ++++ 5316 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-backup-2.14.1/Makefile.am new/yast2-backup-2.15.0/Makefile.am --- old/yast2-backup-2.14.1/Makefile.am 2006-11-07 17:03:20.000000000 +0100 +++ new/yast2-backup-2.15.0/Makefile.am 2006-12-05 13:27:05.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-backup-2.14.1/Makefile.am.common new/yast2-backup-2.15.0/Makefile.am.common --- old/yast2-backup-2.14.1/Makefile.am.common 2006-11-07 17:03:20.000000000 +0100 +++ new/yast2-backup-2.15.0/Makefile.am.common 2006-12-05 13:27:05.000000000 +0100 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-backup-2.14.1/VERSION new/yast2-backup-2.15.0/VERSION --- old/yast2-backup-2.14.1/VERSION 2006-11-07 16:59:01.000000000 +0100 +++ new/yast2-backup-2.15.0/VERSION 2006-12-04 09:34:47.000000000 +0100 @@ -1 +1 @@ -2.14.1 +2.15.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-backup-2.14.1/configure.in new/yast2-backup-2.15.0/configure.in --- old/yast2-backup-2.14.1/configure.in 2006-11-07 17:03:20.000000000 +0100 +++ new/yast2-backup-2.15.0/configure.in 2006-12-05 13:27:05.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-backup dnl -dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-backup, 2.14.1, http://bugs.opensuse.org/, yast2-backup) +AC_INIT(yast2-backup, 2.15.0, http://bugs.opensuse.org/, yast2-backup) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.1" +VERSION="2.15.0" RPMNAME="yast2-backup" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -110,6 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -142,6 +144,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) AC_CONFIG_FILES(Makefile agents/Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-backup-2.14.1/src/backup_get_packages.ycp new/yast2-backup-2.15.0/src/backup_get_packages.ycp --- old/yast2-backup-2.14.1/src/backup_get_packages.ycp 2006-11-07 15:30:14.000000000 +0100 +++ new/yast2-backup-2.15.0/src/backup_get_packages.ycp 2006-12-04 11:32:54.000000000 +0100 @@ -21,16 +21,25 @@ import "Mode"; /** - * Read packages available on the installation sources - * (Requires at least one installation source, otherwise return empty list) - * @return list<string> available packages + * Read packages available on the installation sources and writes them to the + * temporary file. Requires at least one installation source. + * + * @param string temporary file name */ y2milestone("Reading packages available on the installation sources..."); + string filename = nil; + if (is(WFM::Args(0), string)) { + string filename = (string) WFM::Args (0); + } else { + y2error ("Wrong parameter for script"); + return false; + } + // fake return for testsuites if (Mode::test()) { y2milestone("SKIPPING"); - return []; + return true; } Pkg::TargetInitialize ("/"); @@ -53,7 +62,7 @@ { foreach(integer source_id, sources, ``{ - map source_description = Pkg::SourceProduct(source_id); + map source_description = Pkg::SourceProductData (source_id); y2debug("Source %1 description: %2", source_id, source_description); @@ -132,5 +141,11 @@ size(installation_packages), installation_packages ); - return installation_packages; + // write the output to the temporary file + y2milestone ("Writing list of %1 packages into the %2 file", + size (installation_packages), filename + ); + SCR::Write (.target.ycp, filename, installation_packages); + + return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-backup-2.14.1/src/functions.ycp new/yast2-backup-2.15.0/src/functions.ycp --- old/yast2-backup-2.14.1/src/functions.ycp 2006-10-09 15:51:45.000000000 +0200 +++ new/yast2-backup-2.15.0/src/functions.ycp 2006-12-04 09:34:29.000000000 +0100 @@ -8,7 +8,7 @@ * Authors: * Ladislav Slezak <lslezak(a)suse.cz> * - * $Id: functions.ycp 32274 2006-08-09 13:26:24Z locilka $ + * $Id: functions.ycp 34709 2006-12-04 08:34:27Z locilka $ * * Functions used by backup module. */ @@ -24,6 +24,7 @@ import "FileUtils"; import "Mode"; import "FileUtils"; +import "Directory"; textdomain "backup"; @@ -696,10 +697,50 @@ * (Requires at least one installation source, otherwise return empty list) * @return list<string> available packages */ - define list<string> GetInstallPackages() { - y2milestone("---------------------------------------------"); - return (list <string>) WFM::call("backup_get_packages", []); - y2milestone("---------------------------------------------"); + define list <string> GetInstallPackages () { + y2milestone("--- backup_get_packages ---"); + // was: return (list <string>) WFM::call("backup_get_packages", []); + // bugzilla #224899, saves memory occupied by zypp data (packager) + + string temporary_file = sformat ("%1/backup-list-of-packages", Directory::tmpdir); + if (FileUtils::Exists (temporary_file)) { + SCR::Execute (.target.remove, temporary_file); + } + + string yastbin = ""; + if (FileUtils::Exists ("/sbin/yast")) + yastbin = "/sbin/yast"; + else if (FileUtils::Exists ("/sbin/yast2")) + yastbin = "/sbin/yast2"; + else { + y2error ("Neither /sbin/yast nor /sbin/yast2 exist"); + return []; + } + + string cmd = sformat("%1 backup_get_packages %2", yastbin, temporary_file); + y2milestone ("Running command: '%1'", cmd); + map command = (map) SCR::Execute(.target.bash_output, cmd); + + list <string> ret = nil; + + if (command["exit"]:nil != 0) { + y2error ("Unexpected error: %1", command); + return []; + } else { + if (FileUtils::Exists (temporary_file)) { + ret = (list <string>) SCR::Read (.target.ycp, temporary_file); + SCR::Execute (.target.remove, temporary_file); + if (ret == nil) { + return []; + y2error ("Error while reading %1", temporary_file); + } + } + } + y2debug ("Client returned %1", ret); + + y2milestone("--- backup_get_packages ---"); + + return ret; } /** ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 epiphany
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package epiphany checked in at Thu Dec 7 19:50:59 CET 2006. -------- --- GNOME/epiphany/epiphany.changes 2006-11-21 17:38:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/epiphany/epiphany.changes 2006-11-30 19:37:28.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 30 17:19:39 CET 2006 - sbrabec(a)suse.cz + +- Fixed xulrunner dependencies for older products. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ epiphany.spec ++++++ --- /var/tmp/diff_new_pack.0YAGHJ/_old 2006-12-07 19:50:31.000000000 +0100 +++ /var/tmp/diff_new_pack.0YAGHJ/_new 2006-12-07 19:50:31.000000000 +0100 @@ -15,26 +15,26 @@ BuildRequires: gcc-c++ gnome-common gnome-desktop-devel gnome-doc-utils-devel gnutls-devel iso-codes-devel kdelibs3-devel-doc libglade2-devel libgnomeprintui-devel libwnck-devel libxslt-devel mDNSResponder-devel perl-XML-Parser python-devel python-gnome-devel python-gtk-devel update-desktop-files %define prefix /opt/gnome %define sysconfdir /etc%{prefix} -%if %suse_version < 1000 +%if %suse_version > 1010 || 0%{?opensuse_bs} +BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel +%define mozilla_ver %(rpm -q --qf '%%{version}' mozilla-xulrunner%{xulrunner_version}) +Requires: mozilla-xulrunner%{xulrunner_version} = %{mozilla_ver} +%else +%if %suse_version > 1000 && %suse_version <= 1010 +BuildRequires: gecko-sdk +%define mozilla_ver %(rpm -q --qf '%%{version}' mozilla-xulrunner) +Requires: mozilla-xulrunner = %{mozilla_ver} +%else BuildRequires: mozilla-devel %define mozilla_ver %(rpm -q --qf '%%{version}' mozilla) Requires: mozilla = %{mozilla_ver} %endif -%if %suse_version > 1000 && %suse_version < 1010 -BuildRequires: mozilla-xulrunner-devel -%define mozilla_ver %(rpm -q --qf '%%{version}' mozilla-xulrunner) -Requires: mozilla-xulrunner = %{mozilla_ver} -%endif -%if %suse_version > 1010 -BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel -%define mozilla_ver %(rpm -q --qf '%%{version}' mozilla-xulrunner%{xulrunner_version}) -Requires: mozilla-xulrunner%{xulrunner_version} = %{mozilla_ver} %endif License: GNU General Public License (GPL) Group: Productivity/Networking/Web/Browsers Autoreqprov: on Version: 2.16.1 -Release: 27 +Release: 29 %define interface_version 2.16 Summary: GNOME Web Browser Based on the Mozilla Rendering Engine Source: %{name}-%{version}.tar.bz2 @@ -204,6 +204,8 @@ %{prefix}/share/gtk-doc/html/epiphany %changelog -n epiphany +* Thu Nov 30 2006 - sbrabec(a)suse.cz +- Fixed xulrunner dependencies for older products. * Tue Nov 21 2006 - jhargadon(a)suse.de - re-enabled patch epiphany-browser-plugins.patch (#222861) * Fri Nov 17 2006 - thoenig(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