November 2006 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-scanner
by root＠suse.de 29 Nov '06

29 Nov '06

Hello community, here is the log from the commit of package yast2-scanner checked in at Wed Nov 29 15:43:03 CET 2006. -------- --- yast2-scanner/yast2-scanner.changes 2006-11-20 11:44:44.000000000 +0100 +++ /mounts/work_src_done/NOARCH/NOARCH/yast2-scanner/yast2-scanner.changes 2006-11-29 14:51:57.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Nov 29 14:42:19 CET 2006 - jsmeix(a)suse.de + +- V 2.14.11 +- Fixed test_and_set_scanner_access_permissions to search only + in field 2 of the lsscsi output if it is SCSI type "scanner" and + to search only in field 3 if it is manufactuer "HP" or "EPSON" + (see Suse Bugzilla bug 223875). + +------------------------------------------------------------------- Old: ---- yast2-scanner-2.14.10.tar.bz2 New: ---- yast2-scanner-2.14.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-scanner.spec ++++++ --- /var/tmp/diff_new_pack.Xw1xyZ/_old 2006-11-29 15:42:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Xw1xyZ/_new 2006-11-29 15:42:27.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-scanner (Version 2.14.10) +# spec file for package yast2-scanner (Version 2.14.11) # # 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-scanner -Version: 2.14.10 +Version: 2.14.11 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-scanner-2.14.10.tar.bz2 +Source0: yast2-scanner-2.14.11.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 @@ -41,7 +41,7 @@ Johannes Meixner <jsmeix(a)suse.de> %prep -%setup -n yast2-scanner-2.14.10 +%setup -n yast2-scanner-2.14.11 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +75,12 @@ %doc %{prefix}/share/doc/packages/yast2-scanner %changelog -n yast2-scanner +* Wed Nov 29 2006 - jsmeix(a)suse.de +- V 2.14.11 +- Fixed test_and_set_scanner_access_permissions to search only + in field 2 of the lsscsi output if it is SCSI type "scanner" and + to search only in field 3 if it is manufactuer "HP" or "EPSON" + (see Suse Bugzilla bug 223875). * Mon Nov 20 2006 - jsmeix(a)suse.de - V 2.14.10 - Fixed OverviewDialog() regarding the 'net' meta-backend so that ++++++ yast2-scanner-2.14.10.tar.bz2 -> yast2-scanner-2.14.11.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.10/VERSION new/yast2-scanner-2.14.11/VERSION --- old/yast2-scanner-2.14.10/VERSION 2006-11-20 11:21:52.000000000 +0100 +++ new/yast2-scanner-2.14.11/VERSION 2006-11-29 14:42:11.000000000 +0100 @@ -1 +1 @@ -2.14.10 +2.14.11 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.10/configure new/yast2-scanner-2.14.11/configure --- old/yast2-scanner-2.14.10/configure 2006-11-20 11:36:07.000000000 +0100 +++ new/yast2-scanner-2.14.11/configure 2006-11-29 14:45:02.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-scanner 2.14.10. +# Generated by GNU Autoconf 2.59 for yast2-scanner 2.14.11. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-scanner' PACKAGE_TARNAME='yast2-scanner' -PACKAGE_VERSION='2.14.10' -PACKAGE_STRING='yast2-scanner 2.14.10' +PACKAGE_VERSION='2.14.11' +PACKAGE_STRING='yast2-scanner 2.14.11' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,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-scanner 2.14.10 to adapt to many kinds of systems. +\`configure' configures yast2-scanner 2.14.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-scanner 2.14.10:";; + short | recursive ) echo "Configuration of yast2-scanner 2.14.11:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-scanner configure 2.14.10 +yast2-scanner configure 2.14.11 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,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-scanner $as_me 2.14.10, which was +It was created by yast2-scanner $as_me 2.14.11, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-scanner' - VERSION='2.14.10' + VERSION='2.14.11' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.14.10" +VERSION="2.14.11" RPMNAME="yast2-scanner" MAINTAINER="Johannes Meixner <jsmeix(a)suse.de>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-scanner $as_me 2.14.10, which was +This file was extended by yast2-scanner $as_me 2.14.11, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2748,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-scanner config.status 2.14.10 +yast2-scanner config.status 2.14.11 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.10/configure.in new/yast2-scanner-2.14.11/configure.in --- old/yast2-scanner-2.14.10/configure.in 2006-11-20 11:36:03.000000000 +0100 +++ new/yast2-scanner-2.14.11/configure.in 2006-11-29 14:44:57.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-scanner, 2.14.10, http://bugs.opensuse.org/, yast2-scanner) +AC_INIT(yast2-scanner, 2.14.11, http://bugs.opensuse.org/, yast2-scanner) 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.14.11" RPMNAME="yast2-scanner" MAINTAINER="Johannes Meixner <jsmeix(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.10/src/Scanner.ycp new/yast2-scanner-2.14.11/src/Scanner.ycp --- old/yast2-scanner-2.14.10/src/Scanner.ycp 2006-11-20 11:44:21.000000000 +0100 +++ new/yast2-scanner-2.14.11/src/Scanner.ycp 2006-11-29 14:51:31.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Scanner settings, input and output functions * Authors: Johannes Meixner <jsmeix(a)suse.de> * - * $Id: Scanner.ycp 34463 2006-11-20 10:44:16Z jsmeix $ + * $Id: Scanner.ycp 34636 2006-11-29 13:51:29Z jsmeix $ * * Representation of the configuration of scanner. * Input and output routines. @@ -892,7 +892,8 @@ foreach( map< string, string > active_scanner, active_scanners, { if( issubstring( active_scanner["sane_device"]:"unknown", device ) - && "net" != active_scanner["backend"]:"" ) + && "net" != active_scanner["backend"]:"" + ) { show_as_detected_scanner = false; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.10/tools/test_and_set_scanner_access_permissions new/yast2-scanner-2.14.11/tools/test_and_set_scanner_access_permissions --- old/yast2-scanner-2.14.10/tools/test_and_set_scanner_access_permissions 2006-11-06 15:32:20.000000000 +0100 +++ new/yast2-scanner-2.14.11/tools/test_and_set_scanner_access_permissions 2006-11-29 14:41:55.000000000 +0100 @@ -106,9 +106,9 @@ # (because those devices do not support the SCSI scanner protocol # but only some kind of generic SCSI protocol): LSSCSI_LINE=$( lsscsi -g | grep $LINE ) - if ! echo $LSSCSI_LINE | grep -q -i 'scanner' + if ! echo $LSSCSI_LINE | tr -s ' ' | cut -d ' ' -f2 | grep -q -i 'scanner' then # Test for the particular manufacturer: - if echo $LSSCSI_LINE | grep -q -i 'HP' + if echo $LSSCSI_LINE | tr -s ' ' | cut -d ' ' -f3 | grep -q -i 'HP' then # Write a HP entry to the local HAL file: echo ' <match key="info.category" string="scsi_generic">' >>$HAL_LOCAL_FILE echo ' <match key="@info.parent:scsi.type" string="processor">' >>$HAL_LOCAL_FILE @@ -119,7 +119,7 @@ echo ' </match>' >>$HAL_LOCAL_FILE echo '' >>$HAL_LOCAL_FILE fi - if echo $LSSCSI_LINE | grep -q -i 'EPSON' + if echo $LSSCSI_LINE | tr -s ' ' | cut -d ' ' -f3 | grep -q -i 'EPSON' then # Write an EPSON entry to the local HAL file: echo ' <match key="info.category" string="scsi_generic">' >>$HAL_LOCAL_FILE echo ' <match key="@info.parent:scsi.type" string="processor">' >>$HAL_LOCAL_FILE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 perl-Bootloader
by root＠suse.de 29 Nov '06

29 Nov '06

Hello community, here is the log from the commit of package perl-Bootloader checked in at Wed Nov 29 14:21:18 CET 2006. -------- --- perl-Bootloader/perl-Bootloader.changes 2006-11-27 17:46:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/perl-Bootloader/perl-Bootloader.changes 2006-11-29 13:39:53.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 29 13:34:40 CET 2006 - jplack(a)suse.de + +- handle xen sections correctly in update-bootloader (#224330) + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.4.4.tar.bz2 New: ---- perl-Bootloader-0.4.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.rtQ49d/_old 2006-11-29 14:20:51.000000000 +0100 +++ /var/tmp/diff_new_pack.rtQ49d/_new 2006-11-29 14:20:51.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.4.4) +# spec file for package perl-Bootloader (Version 0.4.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: perl-Bootloader -Version: 0.4.4 +Version: 0.4.5 Release: 1 Requires: perl >= %{perl_version} Requires: perl-gettext @@ -25,7 +25,7 @@ Source1: update-bootloader Source2: bootloader_entry BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: -e2fsprogs -limal-bootloader -mdadm +#!BuildIgnore: mdadm e2fsprogs limal-bootloader %description Perl modules for configuring various boot loaders. @@ -64,6 +64,8 @@ /usr/lib/bootloader %changelog -n perl-Bootloader +* Wed Nov 29 2006 - jplack(a)suse.de +- handle xen sections correctly in update-bootloader (#224330) * Mon Nov 27 2006 - od(a)suse.de - do not specify the name of a bootloader entry when removing it with bootloader_entry, thus removing all sections matching the ++++++ perl-Bootloader-0.4.4.tar.bz2 -> perl-Bootloader-0.4.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.4/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.4.5/lib/Bootloader/Core/GRUB.pm --- old/perl-Bootloader-0.4.4/lib/Bootloader/Core/GRUB.pm 2006-11-21 18:13:46.000000000 +0100 +++ new/perl-Bootloader-0.4.5/lib/Bootloader/Core/GRUB.pm 2006-11-27 19:58:44.000000000 +0100 @@ -163,14 +163,14 @@ # # boot from any primary partition with PReP or FAT partition id - @bootpart = map { - my ($device, $disk, $nr, $fsid, $fstype, - $part_type, $start_cyl, $size_cyl) = @$_; - ($fstype ne "xfs" and bootable($fsid)) - ? $device : (); - } @partinfo; - - my $boot_partitions = join(":", @bootpart); + my $boot_partitions = join(":", + map { + my ($device, $disk, $nr, $fsid, $fstype, + $part_type, $start_cyl, $size_cyl) = @$_; + ($fstype ne "xfs" and bootable($fsid)) + ? $device : (); + } @partinfo + ); # give a list of possible root devices: all MD devices # and all 'Linux' devices above 20 cylinders @@ -186,6 +186,15 @@ # FIXME this does no longer include raid0 and raid5 devices ); + # give a list of all other partitions possibly ready for chain loading + my $other_partitions = join(":", + map { + my ($device, $disk, $nr, $fsid, $fstype, + $part_type, $start_cyl, $size_cyl) = @$_; + ($size_cyl >= 20) ? $device : (); + } @partinfo + ); + # FIXME: does it make sense to distinguish between x86_64 and x86? $exports{"arch"} = "x86"; $exports{"global_options"} = { @@ -234,14 +243,7 @@ type_other => "bool:Chainloader section", other_lock => "bool:Use password protection:false", - other_chainloader => "selectdevice:Other system::" . - join(":", - map { - my ($device, $disk, $nr, $fsid, $fstype, - $part_type, $start_cyl, $size_cyl) = @$_; - ($size_cyl >= 20) ? $device : (); - } @partinfo - ), + other_chainloader => "selectdevice:Other system::" . $other_partitions, other_noverifyroot=> "bool:Do not verify filesystem before booting:false", other_makeactive => "bool:Activate this partition when selected for boot:false", other_blockoffset => "int:Block offset for chainloading:1:0:32", ++++++ update-bootloader ++++++ --- perl-Bootloader/update-bootloader 2006-09-19 17:32:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/perl-Bootloader/update-bootloader 2006-11-29 13:39:53.000000000 +0100 @@ -242,7 +242,7 @@ unless $opt_name and $opt_image; my @params = ( - type => $type eq "xen" ? "image" : $type, + type => $type, image => $opt_image, ); if (CountSections(@params) != 0) @@ -261,7 +261,7 @@ if (defined $oper{remove}) { my @params = ( - type => $type eq "xen" ? "image" : $type, + type => $type, image => $opt_image, ); push @params, xen => $opt_xen_kernel if $type eq "xen"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 release-notes
by root＠suse.de 29 Nov '06

29 Nov '06

Hello community, here is the log from the commit of package release-notes checked in at Wed Nov 29 12:06:29 CET 2006. -------- --- release-notes/release-notes.changes 2006-11-28 17:56:28.000000000 +0100 +++ /mounts/work_src_done/NOARCH/NOARCH/release-notes/release-notes.changes 2006-11-29 10:30:37.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 29 10:30:16 CET 2006 - ke(a)suse.de + +- 10.2.14: +* Booting with HPET Timer Problems<[#171517]. + +------------------------------------------------------------------- Old: ---- release-notes-10.2.13.tar.bz2 New: ---- release-notes-10.2.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ release-notes.spec ++++++ --- /var/tmp/diff_new_pack.orfyPh/_old 2006-11-29 12:05:06.000000000 +0100 +++ /var/tmp/diff_new_pack.orfyPh/_new 2006-11-29 12:05:06.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package release-notes (Version 10.2.13) +# spec file for package release-notes (Version 10.2.14) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,7 +18,7 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: kdebase-SuSE:/usr/share/doc/RELEASE_NOTES.en.html -Version: 10.2.13 +Version: 10.2.14 Release: 1 Source0: %{name}-%{version}.tar.bz2 Source8: %{name}.desktop.in @@ -81,6 +81,9 @@ %doc /usr/share/doc/release-notes %changelog -n release-notes +* Wed Nov 29 2006 - ke(a)suse.de +- 10.2.14: + * Booting with HPET Timer Problems<[#171517]. * Tue Nov 28 2006 - ke(a)suse.de - 10.2.13: * Availability of Manuals and description of the openSUSE media set by ++++++ release-notes-10.2.13.tar.bz2 -> release-notes-10.2.14.tar.bz2 ++++++ ++++ 8419 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libzypp-zmd-backend
by root＠suse.de 29 Nov '06

29 Nov '06

Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Wed Nov 29 12:04:22 CET 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-11-27 18:05:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-11-28 22:36:28.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 28 22:35:10 CET 2006 - kkaempf(a)suse.de + +- honor licenseToConfirm in patch (#224192) +- r4701 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.SCl1YS/_old 2006-11-29 12:03:49.000000000 +0100 +++ /var/tmp/diff_new_pack.SCl1YS/_new 2006-11-29 12:03:49.000000000 +0100 @@ -12,7 +12,7 @@ Name: libzypp-zmd-backend Version: 7.1.1.0_0.5 -Release: 1 +Release: 4 License: GNU General Public License (GPL) Group: System/Management Summary: ZMD backend for Package, Patch, Pattern, and Product Management @@ -73,6 +73,9 @@ /etc/logrotate.d/zmd-backend %changelog -n libzypp-zmd-backend +* Tue Nov 28 2006 - kkaempf(a)suse.de +- honor licenseToConfirm in patch (#224192) +- r4701 * Mon Nov 27 2006 - dmacvicar(a)suse.de - replace spaces for underscores in product name at reading - require libzypp 2.8.7 ++++++ zmd-backend-7.1.1.0_0.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0_0.5/src/dbsource/DbAccess.cc new/zmd-backend-7.1.1.0_0.5/src/dbsource/DbAccess.cc --- old/zmd-backend-7.1.1.0_0.5/src/dbsource/DbAccess.cc 2006-11-20 11:50:06.000000000 +0100 +++ new/zmd-backend-7.1.1.0_0.5/src/dbsource/DbAccess.cc 2006-11-28 22:31:16.000000000 +0100 @@ -1281,6 +1281,15 @@ else if (patch != NULL) { sqlite3_bind_text( handle, 11, patch->category().c_str(), -1, SQLITE_STATIC ); + license = patch->licenseToConfirm(); + if (license.empty()) + { + sqlite3_bind_text( handle, 12, NULL, -1, SQLITE_STATIC ); + } + else + { + sqlite3_bind_text( handle, 12, license.c_str(), -1, SQLITE_STATIC ); + } } else if (product != NULL) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 MozillaFirefox
by root＠suse.de 29 Nov '06

29 Nov '06

Hello community, here is the log from the commit of package MozillaFirefox checked in at Wed Nov 29 12:03:45 CET 2006. -------- --- MozillaFirefox/MozillaFirefox.changes 2006-11-28 08:10:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/MozillaFirefox/MozillaFirefox.changes 2006-11-29 11:59:43.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 29 11:45:47 CET 2006 - aj(a)suse.de + +- Change download bookmark (#224431). +- Rename bookmark folder to openSUSE. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.niayaA/_old 2006-11-29 12:03:22.000000000 +0100 +++ /var/tmp/diff_new_pack.niayaA/_new 2006-11-29 12:03:22.000000000 +0100 @@ -26,7 +26,7 @@ Obsoletes: mozilla %endif Version: 2.0 -Release: 24 +Release: 26 Summary: Mozilla Firefox Web Browser URL: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -532,6 +532,9 @@ %endif %changelog -n MozillaFirefox +* Wed Nov 29 2006 - aj(a)suse.de +- Change download bookmark (#224431). +- Rename bookmark folder to openSUSE. * Tue Nov 28 2006 - aj(a)suse.de - Sync from Buildservice with following critical fixes (thanks Wolfgang Rosenauer!): ++++++ bookmarks.html.suse ++++++ --- MozillaFirefox/bookmarks.html.suse 2006-11-28 08:08:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/MozillaFirefox/bookmarks.html.suse 2006-11-29 11:59:11.000000000 +0100 @@ -12,13 +12,13 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3> <DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar <DL><p> - <DT><H3 ID="rdf:#$HNakM2">SUSE Linux</H3> + <DT><H3 ID="rdf:#$HNakM2">openSUSE</H3> <DL><p> <DT><A HREF="http://www.opensuse.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACS3LlfreXK/5Lcuf+E2LD/W8uW/1vLlv9by5b/ac+e/5Lcuf+f4MH/1vLk//////////////////////////9fJbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8yvnv/dtOn/+P27f///////////yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/ac+e//H69v8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/0DChP+E2LD/kty5/5Lcuf9206f/Mr57/yW6c/+f4MH/Jbpz/yW6c/8lunP/Jbpz/yW6c/8yvnv/dtOn/9by5P/W8uT/n+DB/3bTp/9pz57/kty5/9by5P+t5cr/hNiw/yW6c/8lunP/Jbpz/zK+e/+S3Ln/8fr2/63lyv9Nxo3/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/W8uW/+P27f8lunP/Jbpz/yW6c/+S3Ln/uunT/0DChP8lunP/Mr57/5/gwf/I7dz/yO3c/5Lcuf8lunP/Jbpz/yW6c/9AwoT/Jbpz/yW6c/8lunP/QMKE/yW6c/8lunP/Jbpz/63lyv9by5b/Jbpz/yW6c/9206f/n+DB/yW6c/8lunP/ac+e/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/0DChP+t5cr/Jbpz/yW6c/8lunP/Jbpz/8jt3P8lunP/Jbpz/63lyv8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/9by5b/kty5/yW6c/9pz57/yO3 c/0DChP/I7dz/Jbpz/yW6c//x+vb/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/8jt3P8lunP/Jbpz/1vLlv8yvnv/reXK/yW6c/9206f//////yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/9Nxo3/uunT/2nPnv9206f/uunT/03Gjf8lunP/4/bt//////8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/zK+e/9206f/ac+e/zK+e/8yvnv/reXK////////////Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/0DChP+S3Ln/8fr2/////////////////63lyv9Nxo3/Jbpz/yW6c/8lunP/Jbpz/yW6c/9by5b/kty5/9by5P////////////////////////////////////9fW8uW/1vLlv9206f/n+DB/8jt3P////////////////////////////////////////////////////9fgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAEAAA==" LAST_CHARSET="UTF-8" ID="rdf:#$n8c6+2">openSUSE</A> + <DT><A HREF="http://en.opensuse.org/Released_Version" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACS3LlfreXK/5Lcuf+E2LD/W8uW/1vLlv9by5b/ac+e/5Lcuf+f4MH/1vLk//////////////////////////9fJbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8yvnv/dtOn/+P27f///////////yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/ac+e//H69v8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/0DChP+E2LD/kty5/5Lcuf9206f/Mr57/yW6c/+f4MH/Jbpz/yW6c/8lunP/Jbpz/yW6c/8yvnv/dtOn/9by5P/W8uT/n+DB/3bTp/9pz57/kty5/9by5P+t5cr/hNiw/yW6c/8lunP/Jbpz/zK+e/+S3Ln/8fr2/63lyv9Nxo3/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/W8uW/+P27f8lunP/Jbpz/yW6c/+S3Ln/uunT/0DChP8lunP/Mr57/5/gwf/I7dz/yO3c/5Lcuf8lunP/Jbpz/yW6c/9AwoT/Jbpz/yW6c/8lunP/QMKE/yW6c/8lunP/Jbpz/63lyv9by5b/Jbpz/yW6c/9206f/n+DB/yW6c/8lunP/ac+e/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/0DChP+t5cr/Jbpz/yW6c/8lunP/Jbpz/8jt3P8lunP/Jbpz/63lyv8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/9by5b/kty5 /yW6c/9pz57/yO3c/0DChP/I7dz/Jbpz/yW6c//x+vb/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/8jt3P8lunP/Jbpz/1vLlv8yvnv/reXK/yW6c/9206f//////yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/9Nxo3/uunT/2nPnv9206f/uunT/03Gjf8lunP/4/bt//////8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/zK+e/9206f/ac+e/zK+e/8yvnv/reXK////////////Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/yW6c/8lunP/Jbpz/0DChP+S3Ln/8fr2/////////////////63lyv9Nxo3/Jbpz/yW6c/8lunP/Jbpz/yW6c/9by5b/kty5/9by5P////////////////////////////////////9fW8uW/1vLlv9206f/n+DB/8jt3P////////////////////////////////////////////////////9fgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAEAAA==" LAST_CHARSET="UTF-8" ID="rdf:#$n8c6+2">openSUSE Download</A> <DT><A HREF="http://www.novell.com/linux/" ICON="data:image/x-icon;base64,AAABAAIAICAQAAEABADoAgAAJgAAABAQEAABAAQAKAEAAA4DAAAoAAAAIAAAAEAAAAABAAQAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAFgIAABcDAwACAgIAAAAD/AAD/AAAA//8A/wAAAP8A/wX//wAF////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8oAAAAEAAAACAAAAABAAQAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAA////AAAAgAAAgAAAAICAAIAAAICAAICAgIAAgMDAwMCAgICAAAD/AAD/AAAA//8A/wAA//8A/////wD/AAAA////////////////////+f//mZ////+Z//+Zn///+Zn//5mf//+Zmf//mZ//+ZmZ//+Zn/+ZmZn//5mf+ZmZmf//mZ+ZmfmZ//+ZmZmf+Zn//5mZmf/5mf//mZmf//mZ//+Zmf//+Zn//5mf///5mf//mf////////////////////9BgP/7///H8//7x+PH88fDx+PHg8fDxwPHg8YDxwPEI8YDwGPEI8DjwGPB48Djw+PB48fjw+PP/8fj///P/w==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$NNakM2">Novell / Linux</A> <DT><A HREF="http://www.novell.com/coolsolutions/slp/" ICON="data:image/x-icon;base64,AAABAAIAICAQAAEABADoAgAAJgAAABAQEAABAAQAKAEAAA4DAAAoAAAAIAAAAEAAAAABAAQAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAFgIAABcDAwACAgIAAAAD/AAD/AAAA//8A/wAAAP8A/wX//wAF////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8oAAAAEAAAACAAAAABAAQAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAA////AAAAgAAAgAAAAICAAIAAAICAAICAgIAAgMDAwMCAgICAAAD/AAD/AAAA//8A/wAA//8A/////wD/AAAA////////////////////+f//mZ////+Z//+Zn///+Zn//5mf//+Zmf//mZ//+ZmZ//+Zn/+ZmZn//5mf+ZmZmf//mZ+ZmfmZ//+ZmZmf+Zn//5mZmf/5mf//mZmf//mZ//+Zmf//+Zn//5mf///5mf//mf////////////////////9BgP/7///H8//7x+PH88fDx+PHg8fDxwPHg8YDxwPEI8YDwGPEI8DjwGPB48Djw+PB48fjw+PP/8fj///P/w==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$ONakM2">SUSE Linux Cool Solutions</A> <DT><A HREF="http://www.novell.com/support/products/suselinux/" ICON="data:image/x-icon;base64,AAABAAIAICAQAAEABADoAgAAJgAAABAQEAABAAQAKAEAAA4DAAAoAAAAIAAAAEAAAAABAAQAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAFgIAABcDAwACAgIAAAAD/AAD/AAAA//8A/wAAAP8A/wX//wAF////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8oAAAAEAAAACAAAAABAAQAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAA////AAAAgAAAgAAAAICAAIAAAICAAICAgIAAgMDAwMCAgICAAAD/AAD/AAAA//8A/wAA//8A/////wD/AAAA////////////////////+f//mZ////+Z//+Zn///+Zn//5mf//+Zmf//mZ//+ZmZ//+Zn/+ZmZn//5mf+ZmZmf//mZ+ZmfmZ//+ZmZmf+Zn//5mZmf/5mf//mZmf//mZ//+Zmf//+Zn//5mf///5mf//mf////////////////////9BgP/7///H8//7x+PH88fDx+PHg8fDxwPHg8YDxwPEI8YDwGPEI8DjwGPB48Djw+PB48fjw+PP/8fj///P/w==" LAST_CHARSET="windows-1252" ID="rdf:#$PNakM2">SUSE Linux Support</A> - <DT><A HREF="http://www.novell.com/products/suselinux/downloads/suse_linux/" ICON="data:image/x-icon;base64,AAABAAIAICAQAAEABADoAgAAJgAAABAQEAABAAQAKAEAAA4DAAAoAAAAIAAAAEAAAAABAAQAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAFgIAABcDAwACAgIAAAAD/AAD/AAAA//8A/wAAAP8A/wX//wAF////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAA//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8oAAAAEAAAACAAAAABAAQAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAA////AAAAgAAAgAAAAICAAIAAAICAAICAgIAAgMDAwMCAgICAAAD/AAD/AAAA//8A/wAA//8A/////wD/AAAA////////////////////+f//mZ////+Z//+Zn///+Zn//5mf//+Zmf//mZ//+ZmZ//+Zn/+ZmZn//5mf+ZmZmf//mZ+ZmfmZ//+ZmZmf+Zn//5mZmf/5mf//mZmf//mZ//+Zmf//+Zn//5mf///5mf//mf////////////////////9BgP/7///H8//7x+PH88fDx+PHg8fDxwPHg8YDxwPEI8YDwGPEI8DjwGPB48Djw+PB48fjw+PP/8fj///P/w==" LAST_CHARSET="windows-1252" ID="rdf:#$QNakM2">SUSE Linux Downloads</A> </DL><p> <DL><p> <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/central/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$GvPhC3">Getting Started</A> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org
by root＠suse.de 29 Nov '06

29 Nov '06

Hello community, here is the log from the commit of package OpenOffice_org checked in at Wed Nov 29 07:41:12 CET 2006. -------- --- arch/i386/OpenOffice_org/OpenOffice_org.changes 2006-11-20 22:51:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/OpenOffice_org/OpenOffice_org.changes 2006-11-28 21:31:28.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 28 21:30:33 CET 2006 - pmladek(a)suse.cz + +- hot fix: gij32 must be checked before gij to be found [#222708] + +------------------------------------------------------------------- Old: ---- minmem New: ---- ooo-build-2.0.4.7-find-gij32.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org.spec ++++++ --- /var/tmp/diff_new_pack.8RjXKJ/_old 2006-11-29 07:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.8RjXKJ/_new 2006-11-29 07:39:17.000000000 +0100 @@ -89,7 +89,7 @@ License: Artistic License, Other License(s), see package Group: Productivity/Office/Suite Version: 2.0.4 -Release: 34 +Release: 36 Autoreqprov: on PreReq: coreutils /usr/bin/update-mime-database Prereq: %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq} @@ -170,6 +170,8 @@ # obsolete wrapper, removed in openSUSE 10.2 Source600: OOo-wrapper %endif +# Hot fix, gij32 must be checked before gij to be found [n#222708] +Patch: ooo-build-2.0.4.7-find-gij32.diff Patch100: extra_localizations_sources-about.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1130,6 +1132,7 @@ %setup -D -T -q -n ooo-build-%ooo_build_version %else %setup -q -n ooo-build-%ooo_build_version +%patch install -m 644 %{S:1} %{S:2} %{S:3} %{S:6} %{S:7} %{S:8} %{S:9} %{S:10} %{S:11} %{S:12} %{S:13} %{S:14} %{S:15} src/ %if %suse_version <= 930 # some more libraries for older distributions where the system versions are @@ -2061,6 +2064,8 @@ %endif %changelog -n OpenOffice_org +* Tue Nov 28 2006 - pmladek(a)suse.cz +- hot fix: gij32 must be checked before gij to be found [#222708] * Mon Nov 20 2006 - pmladek(a)suse.cz - updated ooo-build to version 2.0.4.7: * wrong calculation in Calc, r1c1 stuff [i#71455, i#221421] ++++++ ooo-build-2.0.4.7-find-gij32.diff ++++++ --- patches/src680/apply +++ patches/src680/apply @@ -595,6 +595,7 @@ # search also gij32, ..., so the 32-bit package works on 64-bit jvmfwk-gij32.diff, n#222708, pmladek +jvmfwk-gij32-2.diff, n#222708, pmladek [ NotDebian ] --- patches/src680/jvmfwk-gij32-2.diff +++ patches/src680/jvmfwk-gij32-2.diff @@ -0,0 +1,31 @@ +--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx.old 2006-11-20 22:58:39.000000000 +0100 ++++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 2006-11-28 20:57:36.000000000 +0100 +@@ -53,21 +53,20 @@ + char const* const* GnuInfo::getJavaExePaths(int * size) + { + static char const * ar[] = { +- "gij", +- "bin/gij", +- "gij-4.1", +- "bin/gij-4.1", +- "gij-4.2", +- "bin/gij-4.2" + #if defined(__i386__) +- , + "gij32", + "bin/gij32", + "gij32-4.1", + "bin/gij32-4.1", + "gij32-4.2", +- "bin/gij32-4.2" ++ "bin/gij32-4.2," + #endif ++ "gij", ++ "bin/gij", ++ "gij-4.1", ++ "bin/gij-4.1", ++ "gij-4.2", ++ "bin/gij-4.2" + }; + *size = sizeof (ar) / sizeof (char*); + return ar; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ntfsprogs
by root＠suse.de 28 Nov '06

28 Nov '06

Hello community, here is the log from the commit of package ntfsprogs checked in at Tue Nov 28 21:21:22 CET 2006. -------- --- ntfsprogs/ntfsprogs.changes 2006-03-28 12:01:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/ntfsprogs/ntfsprogs.changes 2006-11-28 21:12:45.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Nov 28 17:07:06 CET 2006 - cadaha(a)suse.de + +- vista resizing hotfix (#218948) + +------------------------------------------------------------------- +Tue Nov 28 17:06:37 CET 2006 - cadaha(a)suse.de + +- update to 1.13.1 + +------------------------------------------------------------------- Old: ---- ntfsprogs-1.11.2.tar.bz2 New: ---- ntfsprogs-1.13.1-rename-MS_.diff ntfsprogs-1.13.1-vistahotfix.diff ntfsprogs-1.13.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.nJS8eC/_old 2006-11-28 21:21:09.000000000 +0100 +++ /var/tmp/diff_new_pack.nJS8eC/_new 2006-11-28 21:21:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package ntfsprogs (Version 1.11.2) +# spec file for package ntfsprogs (Version 1.13.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,15 +11,18 @@ # norootforbuild Name: ntfsprogs -BuildRequires: fuse-devel libgcrypt-devel pkgconfig -License: GPL +BuildRequires: fuse-devel gnutls gnutls-devel libgcrypt-devel pkgconfig +License: GNU General Public License (GPL) Group: System/Filesystems +Requires: gnutls Autoreqprov: on -Version: 1.11.2 -Release: 9 +Version: 1.13.1 +Release: 1 Summary: NTFS filesystem libraries and utilities -URL: http://linux-ntfs.sf.net/ +URL: http://www.linux-ntfs.org/ Source: %name-%version.tar.bz2 +Patch: %{name}-%{version}-rename-MS_.diff +Patch1: %{name}-%{version}-vistahotfix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -87,6 +90,8 @@ %prep %setup -q -n %name-%version +%patch -p1 +%patch1 -p0 %build autoreconf -i -f @@ -96,6 +101,7 @@ --mandir=%_mandir \ --libdir=%_libdir \ --prefix=/usr/ \ + --exec-prefix=/usr/ \ --disable-gnome-vfs \ --enable-fuse-module @@ -123,7 +129,9 @@ /usr/bin/ntfsfix /usr/bin/ntfsinfo /usr/bin/ntfsls +/usr/bin/ntfscmp /usr/sbin/* +/sbin/mkfs.ntfs /%{_libdir}/libntfs.so.* %{_mandir}/man8/* @@ -139,8 +147,13 @@ %files fuse %defattr(-,root,root) /usr/bin/ntfsmount +/sbin/mount.ntfs-fuse %changelog -n ntfsprogs +* Tue Nov 28 2006 - cadaha(a)suse.de +- vista resizing hotfix (#218948) +* Tue Nov 28 2006 - cadaha(a)suse.de +- update to 1.13.1 * Tue Mar 28 2006 - adrian(a)suse.de - move ntfsmount into own sub package * Mon Mar 27 2006 - adrian(a)suse.de ++++++ ntfsprogs-1.13.1-rename-MS_.diff ++++++ diff -urN ntfsprogs-1.13.1-orig/include/ntfs/volume.h ntfsprogs-1.13.1/include/ntfs/volume.h --- ntfsprogs-1.13.1-orig/include/ntfs/volume.h 2006-01-08 16:53:28.000000000 +0100 +++ ntfsprogs-1.13.1/include/ntfs/volume.h 2006-11-28 19:39:22.000000000 +0100 @@ -41,25 +41,6 @@ #include <mntent.h> #endif -/* - * Under Cygwin, DJGPP and FreeBSD we do not have MS_RDONLY and MS_NOATIME, - * so we define them ourselves. - */ -#ifndef MS_RDONLY -#define MS_RDONLY 1 -#endif -/* - * Solaris defines MS_RDONLY but not MS_NOATIME thus we need to carefully - * define MS_NOATIME. - */ -#ifndef MS_NOATIME -#if (MS_RDONLY != 1) -# define MS_NOATIME 1 -#else -# define MS_NOATIME 2 -#endif -#endif - /* Forward declaration */ typedef struct _ntfs_volume ntfs_volume; @@ -69,6 +50,12 @@ #include "inode.h" #include "attrib.h" +enum { + NTFS_MNT_RDONLY = 1, + NTFS_MNT_NOATIME = 2, + NTFS_MNT_CASE_SENSITIVE = 4, +}; + /** * enum ntfs_mount_flags - * diff -urN ntfsprogs-1.13.1-orig/libntfs/gnome-vfs-method.c ntfsprogs-1.13.1/libntfs/gnome-vfs-method.c --- ntfsprogs-1.13.1-orig/libntfs/gnome-vfs-method.c 2006-02-03 23:19:19.000000000 +0100 +++ ntfsprogs-1.13.1/libntfs/gnome-vfs-method.c 2006-11-28 19:29:04.000000000 +0100 @@ -162,7 +162,7 @@ return GNOME_VFS_ERROR_INVALID_URI; } - if (!(volume = ntfs_mount(uri->parent->text, MS_RDONLY))) { + if (!(volume = ntfs_mount(uri->parent->text, NTFS_MNT_RDONLY))) { g_free(uri_parent_string); return GNOME_VFS_ERROR_WRONG_FORMAT; } diff -urN ntfsprogs-1.13.1-orig/libntfs/volume.c ntfsprogs-1.13.1/libntfs/volume.c --- ntfsprogs-1.13.1-orig/libntfs/volume.c 2006-03-28 00:43:09.000000000 +0200 +++ ntfsprogs-1.13.1/libntfs/volume.c 2006-11-28 19:29:48.000000000 +0100 @@ -429,9 +429,9 @@ } ntfs_upcase_table_build(vol->upcase, vol->upcase_len * sizeof(ntfschar)); - if (flags & MS_RDONLY) + if (flags & NTFS_MNT_RDONLY) NVolSetReadOnly(vol); - if (flags & MS_NOATIME) + if (flags & NTFS_MNT_NOATIME) NVolSetNoATime(vol); ntfs_log_debug("Reading bootsector... "); if (dev->d_ops->open(dev, NVolReadOnly(vol) ? O_RDONLY: O_RDWR)) { @@ -745,8 +745,8 @@ * @flags is an optional second parameter. The same flags are used as for * the mount system call (man 2 mount). Currently only the following flags * are implemented: - * MS_RDONLY - mount volume read-only - * MS_NOATIME - do not update access time + * NTFS_MNT_RDONLY - mount volume read-only + * NTFS_MNT_NOATIME - do not update access time * * The function opens the device @dev and verifies that it contains a valid * bootsector. Then, it allocates an ntfs_volume structure and initializes @@ -1116,7 +1116,7 @@ * Check for dirty logfile and hibernated Windows. * We care only about read-write mounts. */ - if (!(flags & MS_RDONLY)) { + if (!(flags & NTFS_MNT_RDONLY)) { if (ntfs_volume_check_logfile(vol) < 0) goto error_exit; if (ntfs_volume_check_hiberfile(vol) < 0) @@ -1148,8 +1148,8 @@ * @flags is an optional second parameter. The same flags are used as for * the mount system call (man 2 mount). Currently only the following flags * are implemented: - * MS_RDONLY - mount volume read-only - * MS_NOATIME - do not update access time + * NTFS_MNT_RDONLY - mount volume read-only + * NTFS_MNT_NOATIME - do not update access time * * The function opens the device or file @name and verifies that it contains a * valid bootsector. Then, it allocates an ntfs_volume structure and initializes diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfscat.c ntfsprogs-1.13.1/ntfsprogs/ntfscat.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfscat.c 2006-04-05 14:43:07.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfscat.c 2006-11-28 19:29:04.000000000 +0100 @@ -399,7 +399,7 @@ utils_set_locale(); - vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force); + vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force); if (!vol) { ntfs_log_perror("ERROR: couldn't mount volume"); return 1; diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfsclone.c ntfsprogs-1.13.1/ntfsprogs/ntfsclone.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfsclone.c 2006-06-21 09:59:19.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfsclone.c 2006-11-28 19:29:48.000000000 +0100 @@ -1487,7 +1487,7 @@ { s64 device_size; - mount_volume(MS_RDONLY); + mount_volume(NTFS_MNT_RDONLY); device_size = ntfs_device_size_get(vol->dev, 1); if (device_size <= 0) @@ -1716,7 +1716,7 @@ /* 'force' again mount for dirty volumes (e.g. after resize). FIXME: use mount flags to avoid potential side-effects in future */ opt.force++; - mount_volume(MS_NOATIME); + mount_volume(NTFS_MNT_NOATIME); free(lcn_bitmap.bm); setup_lcn_bitmap(); diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfscluster.c ntfsprogs-1.13.1/ntfsprogs/ntfscluster.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfscluster.c 2006-04-05 14:43:07.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfscluster.c 2006-11-28 19:29:04.000000000 +0100 @@ -492,7 +492,7 @@ utils_set_locale(); - vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force); + vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force); if (!vol) return 1; diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfscmp.c ntfsprogs-1.13.1/ntfsprogs/ntfscmp.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfscmp.c 2006-04-05 14:43:07.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfscmp.c 2006-11-28 19:29:04.000000000 +0100 @@ -829,7 +829,7 @@ "You must 'umount' it first.\n", volume); } - vol = ntfs_mount(volume, MS_RDONLY); + vol = ntfs_mount(volume, NTFS_MNT_RDONLY); if (vol == NULL) { int err = errno; diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfscp.c ntfsprogs-1.13.1/ntfsprogs/ntfscp.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfscp.c 2006-04-05 14:43:07.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfscp.c 2006-11-28 19:29:04.000000000 +0100 @@ -312,7 +312,7 @@ } if (opts.noaction) - flags = MS_RDONLY; + flags = NTFS_MNT_RDONLY; vol = utils_mount_volume(opts.device, flags, opts.force); if (!vol) { diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfsdecrypt.c ntfsprogs-1.13.1/ntfsprogs/ntfsdecrypt.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfsdecrypt.c 2006-04-20 00:03:58.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfsdecrypt.c 2006-11-28 19:29:04.000000000 +0100 @@ -1313,7 +1313,7 @@ return 1; } /* Mount the ntfs volume. */ - vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force); + vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force); if (!vol) { ntfs_log_error("Failed to mount ntfs volume. Aborting.\n"); ntfs_rsa_private_key_release(rsa_key); diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfsdump_logfile.c ntfsprogs-1.13.1/ntfsprogs/ntfsdump_logfile.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfsdump_logfile.c 2005-11-20 15:15:33.000000000 +0100 +++ ntfsprogs-1.13.1/ntfsprogs/ntfsdump_logfile.c 2006-11-28 19:29:04.000000000 +0100 @@ -197,7 +197,7 @@ ntfs_inode *ni; ntfs_attr *na; - vol = ntfs_mount(filename, MS_RDONLY); + vol = ntfs_mount(filename, NTFS_MNT_RDONLY); if (!vol) log_err_exit(NULL, "Failed to mount %s: %s\n", filename, strerror(errno)); diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfsinfo.c ntfsprogs-1.13.1/ntfsprogs/ntfsinfo.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfsinfo.c 2006-05-20 23:27:15.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfsinfo.c 2006-11-28 19:29:04.000000000 +0100 @@ -1967,7 +1967,7 @@ utils_set_locale(); - vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force); + vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force); if (!vol) return 1; diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfslabel.c ntfsprogs-1.13.1/ntfsprogs/ntfslabel.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfslabel.c 2006-04-05 14:43:07.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfslabel.c 2006-11-28 19:29:04.000000000 +0100 @@ -394,7 +394,7 @@ if (!opts.label) opts.noaction++; - vol = utils_mount_volume(opts.device, opts.noaction ? MS_RDONLY : 0, + vol = utils_mount_volume(opts.device, opts.noaction ? NTFS_MNT_RDONLY : 0, opts.force); if (!vol) return 1; diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfsls.c ntfsprogs-1.13.1/ntfsprogs/ntfsls.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfsls.c 2006-04-05 14:43:07.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfsls.c 2006-11-28 19:29:04.000000000 +0100 @@ -651,7 +651,7 @@ utils_set_locale(); - vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force); + vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force); if (!vol) { // FIXME: Print error... (AIA) return 2; diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfsmftalloc.c ntfsprogs-1.13.1/ntfsprogs/ntfsmftalloc.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfsmftalloc.c 2005-11-20 15:15:33.000000000 +0100 +++ ntfsprogs-1.13.1/ntfsprogs/ntfsmftalloc.c 2006-11-28 19:29:04.000000000 +0100 @@ -313,7 +313,7 @@ /* Mount the device. */ if (opts.no_action) { ntfs_log_quiet("Running in READ-ONLY mode!\n"); - ul = MS_RDONLY; + ul = NTFS_MNT_RDONLY; } else ul = 0; vol = ntfs_mount(dev_name, ul); diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfsmount.c ntfsprogs-1.13.1/ntfsprogs/ntfsmount.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfsmount.c 2006-05-19 06:22:53.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfsmount.c 2006-11-28 19:29:48.000000000 +0100 @@ -1420,8 +1420,8 @@ { ntfs_volume *vol; - vol = utils_mount_volume(device, ((ctx->ro) ? MS_RDONLY : 0) | - ((ctx->noatime) ? MS_NOATIME : 0), ctx->force); + vol = utils_mount_volume(device, ((ctx->ro) ? NTFS_MNT_RDONLY : 0) | + ((ctx->noatime) ? NTFS_MNT_NOATIME : 0), ctx->force); if (!vol) { ntfs_log_error("Mount failed.\n"); return -1; diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfsmove.c ntfsprogs-1.13.1/ntfsprogs/ntfsmove.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfsmove.c 2006-04-05 14:43:07.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfsmove.c 2006-11-28 19:29:05.000000000 +0100 @@ -873,7 +873,7 @@ utils_set_locale(); if (opts.noaction) - flags |= MS_RDONLY; + flags |= NTFS_MNT_RDONLY; vol = utils_mount_volume(opts.device, flags, opts.force); if (!vol) { diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfsresize.c ntfsprogs-1.13.1/ntfsprogs/ntfsresize.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfsresize.c 2006-04-19 00:03:09.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfsresize.c 2006-11-28 19:29:48.000000000 +0100 @@ -486,7 +486,7 @@ opt.info++; break; case 'n': - opt.ro_flag = MS_RDONLY; + opt.ro_flag = NTFS_MNT_RDONLY; break; case 'P': opt.show_progress = 0; @@ -522,7 +522,7 @@ err++; } if (opt.info) { - opt.ro_flag = MS_RDONLY; + opt.ro_flag = NTFS_MNT_RDONLY; if (opt.bytes) { printf(NERR_PREFIX "Options --info and --size " "can't be used together.\n"); @@ -2238,7 +2238,7 @@ "You must 'umount' it first.\n", opt.volume); } - if (!(vol = ntfs_mount(opt.volume, opt.ro_flag | MS_NOATIME))) { + if (!(vol = ntfs_mount(opt.volume, opt.ro_flag | NTFS_MNT_NOATIME))) { int err = errno; diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfsrm.c ntfsprogs-1.13.1/ntfsprogs/ntfsrm.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfsrm.c 2006-04-05 14:43:08.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfsrm.c 2006-11-28 19:29:05.000000000 +0100 @@ -1027,7 +1027,7 @@ #endif if (opts.noaction) - flags |= MS_RDONLY; + flags |= NTFS_MNT_RDONLY; //ntfs_log_set_levels (NTFS_LOG_LEVEL_DEBUG | NTFS_LOG_LEVEL_TRACE); //ntfs_log_set_levels (NTFS_LOG_LEVEL_DEBUG); diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfstruncate.c ntfsprogs-1.13.1/ntfsprogs/ntfstruncate.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfstruncate.c 2006-04-05 04:45:56.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfstruncate.c 2006-11-28 19:29:05.000000000 +0100 @@ -738,7 +738,7 @@ /* Mount the device. */ if (opts.no_action) { ntfs_log_quiet("Running in READ-ONLY mode!\n"); - ul = MS_RDONLY; + ul = NTFS_MNT_RDONLY; } else ul = 0; vol = ntfs_mount(dev_name, ul); diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfsundelete.c ntfsprogs-1.13.1/ntfsprogs/ntfsundelete.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfsundelete.c 2006-04-05 14:43:08.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfsundelete.c 2006-11-28 19:29:05.000000000 +0100 @@ -2123,7 +2123,7 @@ utils_set_locale(); - vol = utils_mount_volume(opts.device, MS_RDONLY, opts.force); + vol = utils_mount_volume(opts.device, NTFS_MNT_RDONLY, opts.force); if (!vol) return 1; diff -urN ntfsprogs-1.13.1-orig/ntfsprogs/ntfswipe.c ntfsprogs-1.13.1/ntfsprogs/ntfswipe.c --- ntfsprogs-1.13.1-orig/ntfsprogs/ntfswipe.c 2006-04-05 14:43:08.000000000 +0200 +++ ntfsprogs-1.13.1/ntfsprogs/ntfswipe.c 2006-11-28 19:29:05.000000000 +0100 @@ -1340,7 +1340,7 @@ print_summary(); if (opts.info || opts.noaction) - flags = MS_RDONLY; + flags = NTFS_MNT_RDONLY; vol = utils_mount_volume(opts.device, flags, opts.force); if (!vol) ++++++ ntfsprogs-1.13.1-vistahotfix.diff ++++++ Index: include/ntfs/volume.h =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/volume.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- include/ntfs/volume.h 25 Nov 2006 17:37:37 -0000 1.26 +++ include/ntfs/volume.h 28 Nov 2006 10:09:57 -0000 1.27 @@ -54,6 +54,11 @@ NTFS_MNT_RDONLY = 1, NTFS_MNT_NOATIME = 2, NTFS_MNT_CASE_SENSITIVE = 4, + NTFS_MNT_NOT_EXCLUSIVE = 8, + NTFS_MNT_FORENSIC = 16, /* Mount for forensic purposes, i.e. do + not do any writing at all during the + mount, i.e. no journal emptying, no + dirty bit setting, etc. */ }; /** @@ -79,6 +83,10 @@ NV_CaseSensitive, /* 1: Volume is mounted case-sensitive. */ NV_LogFileEmpty, /* 1: $logFile journal is empty. */ NV_NoATime, /* 1: Do not update access time. */ + NV_WasDirty, /* 1: Volume was marked dirty before we mounted + it. */ + NV_ForensicMount, /* 1: Mount is forensic, i.e. no modifications + are to be done by mount/umount. */ } ntfs_volume_state_bits; #define test_nvol_flag(nv, flag) test_bit(NV_##flag, (nv)->state) @@ -101,6 +109,14 @@ #define NVolSetNoATime(nv) set_nvol_flag(nv, NoATime) #define NVolClearNoATime(nv) clear_nvol_flag(nv, NoATime) +#define NVolWasDirty(nv) test_nvol_flag(nv, WasDirty) +#define NVolSetWasDirty(nv) set_nvol_flag(nv, WasDirty) +#define NVolClearWasDirty(nv) clear_nvol_flag(nv, WasDirty) + +#define NVolForensicMount(nv) test_nvol_flag(nv, ForensicMount) +#define NVolSetForensicMount(nv) set_nvol_flag(nv, ForensicMount) +#define NVolClearForensicMount(nv) clear_nvol_flag(nv, ForensicMount) + /* * NTFS version 1.1 and 1.2 are used by Windows NT4. * NTFS version 2.x is used by Windows 2000 Beta Index: libntfs/volume.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/volume.c,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- libntfs/volume.c 25 Nov 2006 21:35:39 -0000 1.81 +++ libntfs/volume.c 28 Nov 2006 10:09:57 -0000 1.82 @@ -88,6 +88,14 @@ */ static void __ntfs_volume_release(ntfs_volume *v) { + /* + * Clear the dirty bit if it was not set before we mounted and this is + * not a forensic mount. + */ + if (!NVolReadOnly(v) && !NVolWasDirty(v) && !NVolForensicMount(v)) { + v->flags &= ~VOLUME_IS_DIRTY; + (void)ntfs_volume_write_flags(v, v->flags); + } if (v->lcnbmp_ni && NInoDirty(v->lcnbmp_ni)) ntfs_inode_sync(v->lcnbmp_ni); if (v->vol_ni) @@ -780,7 +788,9 @@ ntfs_log_perror("Failed to startup volume"); return NULL; } - + /* Record whether this is a forensic mount. */ + if (flags & NTFS_MNT_FORENSIC) + NVolSetForensicMount(vol); /* Load data from $MFT and $MFTMirr and compare the contents. */ m = (u8*)malloc(vol->mftmirr_size << vol->mft_record_size_bits); m2 = (u8*)malloc(vol->mftmirr_size << vol->mft_record_size_bits); @@ -997,9 +1007,14 @@ /* Setup vol from the volume information attribute value. */ vol->major_ver = vinf->major_ver; vol->minor_ver = vinf->minor_ver; - /* Do not use le16_to_cpu() macro here as our VOLUME_FLAGS are - defined using cpu_to_le16() macro and hence are consistent. */ + /* + * Do not use le16_to_cpu() macro here as our VOLUME_FLAGS are defined + * using cpu_to_le16() macro and hence are consistent. + */ vol->flags = vinf->flags; + /* Record whether the volume was dirty or not. */ + if (vol->flags & VOLUME_IS_DIRTY) + NVolSetWasDirty(vol); /* * Reinitialize the search context for the $Volume/$VOLUME_NAME lookup. */ @@ -1115,12 +1130,26 @@ /* * Check for dirty logfile and hibernated Windows. * We care only about read-write mounts. + * + * If all is ok, reset the logfile and set the dirty bit on the volume. + * + * But do not do that if this is a FORENSIC mount. */ if (!(flags & NTFS_MNT_RDONLY)) { if (ntfs_volume_check_logfile(vol) < 0) goto error_exit; if (ntfs_volume_check_hiberfile(vol) < 0) goto error_exit; + if (!NVolForensicMount(vol)) { + if (ntfs_logfile_reset(vol) < 0) + goto error_exit; + if (!NVolWasDirty(vol)) { + vol->flags |= VOLUME_IS_DIRTY; + if (ntfs_volume_write_flags(vol, vol->flags) < + 0) + goto error_exit; + } + } } return vol; Index: ntfsprogs/ntfsclone.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- ntfsprogs/ntfsclone.c 12 Nov 2006 22:46:50 -0000 1.94 +++ ntfsprogs/ntfsclone.c 28 Nov 2006 10:09:57 -0000 1.95 @@ -1328,7 +1328,7 @@ exit(1); } - if (vol->flags & VOLUME_IS_DIRTY) + if (NVolWasDirty(vol)) if (opt.force-- <= 0) err_exit(dirty_volume_msg, opt.volume); Index: ntfsprogs/ntfscp.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- ntfsprogs/ntfscp.c 12 Nov 2006 22:46:50 -0000 1.39 +++ ntfsprogs/ntfscp.c 28 Nov 2006 10:09:57 -0000 1.40 @@ -320,7 +320,7 @@ return 1; } - if ((vol->flags & VOLUME_IS_DIRTY) && (!opts.force)) + if (NVolWasDirty(vol) && !opts.force) goto umount; { Index: ntfsprogs/ntfsdump_logfile.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdump_logfile.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- ntfsprogs/ntfsdump_logfile.c 12 Nov 2006 22:46:50 -0000 1.35 +++ ntfsprogs/ntfsdump_logfile.c 28 Nov 2006 10:09:57 -0000 1.36 @@ -197,7 +197,7 @@ ntfs_inode *ni; ntfs_attr *na; - vol = ntfs_mount(filename, NTFS_MNT_RDONLY); + vol = ntfs_mount(filename, NTFS_MNT_RDONLY | NTFS_MNT_FORENSIC); if (!vol) log_err_exit(NULL, "Failed to mount %s: %s\n", filename, strerror(errno)); Index: ntfsprogs/ntfsfix.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ntfsprogs/ntfsfix.c 5 Apr 2006 12:43:07 -0000 1.33 +++ ntfsprogs/ntfsfix.c 28 Nov 2006 10:09:57 -0000 1.34 @@ -82,8 +82,6 @@ static const char *EXEC_NAME = "ntfsfix"; static const char *OK = "OK\n"; static const char *FAILED = "FAILED\n"; -static BOOL vol_is_dirty = FALSE; -static BOOL journal_is_empty = FALSE; struct { char *volume; @@ -247,9 +245,8 @@ { u16 flags; - if (vol_is_dirty == TRUE) + if (NVolWasDirty(vol)) return 0; - ntfs_log_info("Setting required flags on partition... "); /* * Set chkdsk flag, i.e. mark the partition dirty so chkdsk will run @@ -264,37 +261,9 @@ ntfs_log_error("Error setting volume flags.\n"); return -1; } + vol->flags = flags; ntfs_log_info(OK); - vol_is_dirty = TRUE; - return 0; -} - -/** - * set_dirty_flag_mount - */ -static int set_dirty_flag_mount(ntfs_volume *vol) -{ - u16 flags; - - if (vol_is_dirty == TRUE) - return 0; - - ntfs_log_info("Setting required flags on partition... "); - /* - * Set chkdsk flag, i.e. mark the partition dirty so chkdsk will run - * and fix it for us. - */ - flags = vol->flags | VOLUME_IS_DIRTY; - /* If NTFS volume version >= 2.0 then set mounted on NT4 flag. */ - if (vol->major_ver >= 2) - flags |= VOLUME_MOUNTED_ON_NT4; - if (ntfs_volume_write_flags(vol, flags)) { - ntfs_log_info(FAILED); - ntfs_log_error("Error setting volume flags.\n"); - return -1; - } - ntfs_log_info(OK); - vol_is_dirty = TRUE; + NVolSetWasDirty(vol); return 0; } @@ -303,9 +272,8 @@ */ static int empty_journal(ntfs_volume *vol) { - if (journal_is_empty == TRUE) + if (NVolLogFileEmpty(vol)) return 0; - ntfs_log_info("Going to empty the journal ($LogFile)... "); if (ntfs_logfile_reset(vol)) { ntfs_log_info(FAILED); @@ -313,7 +281,6 @@ return -1; } ntfs_log_info(OK); - journal_is_empty = TRUE; return 0; } @@ -475,13 +442,13 @@ ntfs_log_info("Attempting to correct errors... "); - dev = ntfs_device_alloc(opt.volume, 0, &ntfs_device_default_io_ops, NULL); + dev = ntfs_device_alloc(opt.volume, 0, &ntfs_device_default_io_ops, + NULL); if (!dev) { ntfs_log_info(FAILED); ntfs_log_perror("Failed to allocate device"); return -1; } - vol = ntfs_volume_startup(dev, 0); if (!vol) { ntfs_log_info(FAILED); @@ -490,17 +457,12 @@ ntfs_device_free(dev); return -1; } - if (fix_mftmirr(vol) < 0) goto error_exit; - - /* FIXME: Will this fail? Probably... */ if (set_dirty_flag(vol) < 0) goto error_exit; - if (empty_journal(vol) < 0) goto error_exit; - ret = 0; error_exit: /* ntfs_umount() will invoke ntfs_device_free() for us. */ @@ -550,7 +512,8 @@ exit(1); } } - + /* So the unmount does not clear it again. */ + NVolSetWasDirty(vol); /* Check NTFS version is ok for us (in $Volume) */ ntfs_log_info("NTFS volume version is %i.%i.\n", vol->major_ver, vol->minor_ver); @@ -558,22 +521,13 @@ ntfs_log_error("Error: Unknown NTFS version.\n"); goto error_exit; } - - if (set_dirty_flag_mount(vol) < 0) - goto error_exit; - - if (empty_journal(vol) < 0) - goto error_exit; - if (vol->major_ver >= 3) { - /* FIXME: If on NTFS 3.0+, check for presence of the usn journal and - disable it (if present) as Win2k might be unhappy otherwise and Bad - Things(TM) could happen depending on what applications are actually - using it for. */ + /* + * FIXME: If on NTFS 3.0+, check for presence of the usn + * journal and stamp it if present. + */ } - - /* FIXME: Should we be marking the quota out of date, too? */ - + /* FIXME: We should be marking the quota out of date, too. */ /* That's all for now! */ ntfs_log_info("NTFS partition %s was processed successfully.\n", vol->dev->d_name); Index: ntfsprogs/ntfsinfo.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- ntfsprogs/ntfsinfo.c 25 Nov 2006 18:38:47 -0000 1.154 +++ ntfsprogs/ntfsinfo.c 28 Nov 2006 10:09:57 -0000 1.155 @@ -1165,7 +1165,7 @@ runlist *rlc = rl; printf("\tRunlist:\tVCN\t\tLCN\t\tLength\n"); while (rlc->length) { - printf("\t\t\t%lld\t\t%lld\t\t%lld\n", + printf("\t\t\t0x%llx\t\t0x%llx\t\t0x%llx\n", rlc->vcn, rlc->lcn, rlc->length); rlc++; } Index: ntfsprogs/ntfsmove.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmove.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ntfsprogs/ntfsmove.c 12 Nov 2006 22:46:50 -0000 1.24 +++ ntfsprogs/ntfsmove.c 28 Nov 2006 10:09:57 -0000 1.25 @@ -889,10 +889,7 @@ count = move_file(vol, inode, opts.location, 0); if ((count > 0) && (!opts.nodirty)) { - if (ntfs_volume_write_flags(vol, vol->flags | VOLUME_IS_DIRTY) < - 0) { - ntfs_log_error("Couldn't mark volume dirty\n"); - } + NVolSetWasDirty(vol); ntfs_log_info("Relocated %lld bytes\n", count); } if (count >= 0) Index: ntfsprogs/ntfsresize.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- ntfsprogs/ntfsresize.c 12 Nov 2006 22:46:50 -0000 1.123 +++ ntfsprogs/ntfsresize.c 28 Nov 2006 10:09:57 -0000 1.124 @@ -2256,7 +2256,7 @@ exit(1); } - if (vol->flags & VOLUME_IS_DIRTY) + if (NVolWasDirty(vol)) if (opt.force-- <= 0) err_exit("Volume is scheduled for check.\nRun chkdsk /f" " and please try again, or see option -f.\n"); @@ -2280,32 +2280,16 @@ /** * prepare_volume_fixup * - * Set the volume's dirty flag and wipe the filesystem journal. When Windows - * boots it will automatically run chkdsk to check for any problems. If the - * read-only command line option was given, this function will do nothing. + * Make sure the volume's dirty flag does not get cleared at umount time. When + * Windows boots it will automatically run chkdsk to check for any problems. + * If the read-only command line option was given, this function will do + * nothing. */ static void prepare_volume_fixup(ntfs_volume *vol) { - u16 flags; - - flags = vol->flags | VOLUME_IS_DIRTY; - if (vol->major_ver >= 2) - flags |= VOLUME_MOUNTED_ON_NT4; - printf("Schedule chkdsk for NTFS consistency check at Windows " "boot time ...\n"); - - if (ntfs_volume_write_flags(vol, flags)) - perr_exit("Failed to set $Volume dirty"); - - if (vol->dev->d_ops->sync(vol->dev) == -1) - perr_exit("Failed to sync device"); - - printf("Resetting $LogFile ... (this might take a while)\n"); - - if (ntfs_logfile_reset(vol)) - perr_exit("Failed to reset $LogFile"); - + NVolSetWasDirty(vol); if (vol->dev->d_ops->sync(vol->dev) == -1) perr_exit("Failed to sync device"); } Index: ntfsprogs/ntfswipe.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfswipe.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- ntfsprogs/ntfswipe.c 12 Nov 2006 22:46:51 -0000 1.45 +++ ntfsprogs/ntfswipe.c 28 Nov 2006 10:09:57 -0000 1.46 @@ -1346,7 +1346,7 @@ if (!vol) goto free; - if ((vol->flags & VOLUME_IS_DIRTY) && (!opts.force)) + if (NVolWasDirty(vol) && !opts.force) goto umount; if (opts.info) { Index: ntfsprogs/utils.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- ntfsprogs/utils.c 25 Nov 2006 21:44:36 -0000 1.69 +++ ntfsprogs/utils.c 28 Nov 2006 10:09:57 -0000 1.70 @@ -196,7 +196,7 @@ return NULL; } - if (vol->flags & VOLUME_IS_DIRTY) { + if (NVolWasDirty(vol)) { ntfs_log_warning("Volume is dirty.\n"); if (!force) { ntfs_log_error("Run chkdsk and try again, or use the " "force option.\n"); ++++++ ntfsprogs-1.11.2.tar.bz2 -> ntfsprogs-1.13.1.tar.bz2 ++++++ ++++ 90889 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit release-notes
by root＠suse.de 28 Nov '06

28 Nov '06

Hello community, here is the log from the commit of package release-notes checked in at Tue Nov 28 18:24:43 CET 2006. -------- --- release-notes/release-notes.changes 2006-11-28 11:46:27.000000000 +0100 +++ /mounts/work_src_done/NOARCH/NOARCH/release-notes/release-notes.changes 2006-11-28 17:56:28.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Nov 28 17:56:10 CET 2006 - ke(a)suse.de + +- 10.2.13: +* Availability of Manuals and description of the openSUSE media set by +Tanja Roth. + +------------------------------------------------------------------- Old: ---- release-notes-10.2.12.tar.bz2 New: ---- release-notes-10.2.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ release-notes.spec ++++++ --- /var/tmp/diff_new_pack.8GE3qL/_old 2006-11-28 18:24:36.000000000 +0100 +++ /var/tmp/diff_new_pack.8GE3qL/_new 2006-11-28 18:24:36.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package release-notes (Version 10.2.12) +# spec file for package release-notes (Version 10.2.13) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,7 +18,7 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: kdebase-SuSE:/usr/share/doc/RELEASE_NOTES.en.html -Version: 10.2.12 +Version: 10.2.13 Release: 1 Source0: %{name}-%{version}.tar.bz2 Source8: %{name}.desktop.in @@ -82,6 +82,10 @@ %changelog -n release-notes * Tue Nov 28 2006 - ke(a)suse.de +- 10.2.13: + * Availability of Manuals and description of the openSUSE media set by + Tanja Roth. +* Tue Nov 28 2006 - ke(a)suse.de - 10.2.12: * Using extra installation sources; by Andreas Jaeger [#223578]. * Mon Nov 27 2006 - ke(a)suse.de ++++++ release-notes-10.2.12.tar.bz2 -> release-notes-10.2.13.tar.bz2 ++++++ ++++ 8503 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit at
by root＠suse.de 28 Nov '06

28 Nov '06

Hello community, here is the log from the commit of package at checked in at Tue Nov 28 17:23:52 CET 2006. -------- --- at/at.changes 2006-09-01 14:17:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/at/at.changes 2006-11-28 17:17:52.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 28 17:17:39 CET 2006 - mrueckert(a)suse.de + +- remove at-3.1.8-pam.diff it just breaks at. + +------------------------------------------------------------------- Old: ---- at-3.1.8-pam.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at.spec ++++++ --- /var/tmp/diff_new_pack.hiPuJ9/_old 2006-11-28 17:23:45.000000000 +0100 +++ /var/tmp/diff_new_pack.hiPuJ9/_new 2006-11-28 17:23:45.000000000 +0100 @@ -13,11 +13,11 @@ Name: at BuildRequires: pam-devel postfix URL: ftp://ftp.debian.org/debian/pool/main/a/at -License: GPL +License: GNU General Public License (GPL) Group: System/Daemons Autoreqprov: on Version: 3.1.8 -Release: 923 +Release: 942 Summary: A Job Manager Source: at_3.1.8-11.tar.gz Source1: atd.init @@ -31,7 +31,6 @@ Patch7: at-%{version}-pie.patch Patch8: at-%{version}-eal3-manpages.dif Patch9: at-%{version}-formatbugs.dif -Patch10: at-3.1.8-pam.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Prereq: /usr/sbin/useradd /usr/sbin/groupadd %fillup_prereq %insserv_prereq @@ -58,7 +57,6 @@ %patch7 -p1 %patch8 %patch9 -%patch10 -p1 -b .pam %build %{?suse_update_config:%{suse_update_config -f}} @@ -131,6 +129,8 @@ %attr(600,at,at) /var/spool/atjobs/.SEQ %changelog -n at +* Tue Nov 28 2006 - mrueckert(a)suse.de +- remove at-3.1.8-pam.diff it just breaks at. * Fri Sep 01 2006 - kukuk(a)suse.de - Add pam_loginuid.so to atd.pamd * Wed Jan 25 2006 - mls(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 xterm
by root＠suse.de 28 Nov '06

28 Nov '06

Hello community, here is the log from the commit of package xterm checked in at Tue Nov 28 17:20:35 CET 2006. -------- --- xterm/xterm.changes 2006-10-18 11:36:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/xterm/xterm.changes 2006-11-28 06:06:47.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Nov 28 06:02:04 CET 2006 - sndirsch(a)suse.de + +- bug220728.diff: + * Essentially the problem reported is that xterm #216 does a more + complete job of applying modifier parameters to cursor-, + function- and other keys. Some users would like to disable the + feature. Patch to allow modifyCursorKeys to be disabled. + Currently the resource accepts values 0 to 3. This adds a -1 to + disable the feature. Most users won't want to do this. + (Bug #220728) + +------------------------------------------------------------------- New: ---- bug220728.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.7sO69G/_old 2006-11-28 17:19:43.000000000 +0100 +++ /var/tmp/diff_new_pack.7sO69G/_new 2006-11-28 17:19:43.000000000 +0100 @@ -13,12 +13,12 @@ Name: xterm BuildRequires: freetype2-devel update-desktop-files utempter xorg-x11-devel URL: http://invisible-island.net/xterm/ -License: Other License(s), see package +License: X11/MIT Group: System/X11/Utilities Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm Autoreqprov: on Version: 222 -Release: 1 +Release: 12 Summary: The basic X terminal program Source: %name.tar.gz Source1: luitx @@ -33,6 +33,7 @@ Patch: p_xterm-config.diff Patch1: p_xterm-settings.diff Patch2: p_xterm-sigwinch.diff +Patch3: bug220728.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -42,58 +43,119 @@ Authors: -------- + Thomas E Dickey + Adam Sulmicki + Alan Hourihane + Alexander Pohoyda + Alexander V Lukyanov + Andrew Sumner + Andrew Tipton + Anton Kovalenko + Ben Yoshino + Bernhard Rosenkraenzer + Bill Nottingham + Bob Maynard + Bradd W. Szonye + Bram Moolenaar + Bruno Haible + Christian Biere + Christian Weisgerber + Chuck Blake + D Roland Walker + David Dawes + David Madore + David Martinez Moreno + David Mathog + David Yeo + Dennis Schneider + Derek Foreman + Dr Werner Fink + Eddy De Greef Egbert Eich + Emanuele Giaquinta + Eugene Konev + Fabrice Bellard + Frank Giessler + Frank Guangxin Liu + Frank Liu + Gael Roualland + George Peter Staplin + Greg Klanderman + Greg Smith + H Merijn Brand + Harold Hunt + Holger Veit + Ilya Zakharevich + Jason Vas Dias + Jeff Uphoff + Jens Schweikhardt + Jeremy Buhler + Jeroen Ruigrok + Jess Thrysoee + Joe Allen + Juergen Keil + Juliusz Chroboczek + Jungshik Shin + Kean Johnston Keith Packard - Roland Mainz - Alan Coopersmith - Russ Blaine - Alexander Gottwald - Alan Hourihane - Chisato Yamauchi - Eric Anholt - Nolan Leake - Stefan Dirsch - Rik Faith - Daniel Berrange + Ken Martin + Kevin Buhr + Kiyokazu Suto + Larry Riedel + Lee Olsen + Marc La France + Mark Waggoner + Markus Kuhn + Matthias Scheler Matthieu Herrb - John Heasley - Ryan Underwood - Alex Deucher - Ty Sarna - Torrey T Lyons Darwin - Stuart Kreitman - Kevin E. Martin - Greg Parker - John Harper - Adam Jackson - Peter Kunzman - Aaron Plattner - Chisato Yamauchi - Michel Daenzer - Kristian Høgsberg - Søren Sandmann - Owen Taylor - Mike A. Harris - Ivan Kokshaysky - Bryan Stine - Guy Martin - Paul Anderson - Yu Shao - David Dawes - Harold L. Hunt II - Andreas Luik - Travis Tilley - Ryan Lortie - Ryan Breen - Deron Johnson - Ronny Vindenes - Jim Gettys + Michael Rohleder + Michael Schroeder + Mike Fabian + Mike Hopkirk + Min Sik Kim + Nam SungHyun + Nelson Beebe + Nicolas George + Paul Gilmartin + Paul Giordano + Paul Szabo + Paul Vojta + Paul Williams + Pavel Roskin + Peter Berg Larsen + Peter Chubb + Phil Sidler + Ray Neuman + Richard Griswold + Robert Brady + Robert Earl + Robin Cutshaw + Ross Paterson + Sam Stephenson + Scott Sewall + Semen A Ustimenko + Sergei Laskavy + Steve Wall + Stuart Lissaman + Suhaib Siddiqi + Sven Verdoolaege + Taneli Huuskonen + Tim Adye + Todd Larason + Todd Miller + Tomasz Cholewo + Tomohiro Kubota + Tor Lillqvist + Torrey T. Lyons + Yong Li + Zarick Lau %prep %setup -n xterm-%version -b7 %patch -p2 -b .xterm-config %patch1 -p0 -b .xterm-settings %patch2 -p0 -b .xterm-sigwinch +%patch3 cp $RPM_SOURCE_DIR/*bdf.bz2 . bunzip2 *.bdf.bz2 @@ -183,6 +245,15 @@ /usr/share/pixmaps/terminal.png %changelog -n xterm +* Tue Nov 28 2006 - sndirsch(a)suse.de +- bug220728.diff: + * Essentially the problem reported is that xterm #216 does a more + complete job of applying modifier parameters to cursor-, + function- and other keys. Some users would like to disable the + feature. Patch to allow modifyCursorKeys to be disabled. + Currently the resource accepts values 0 to 3. This adds a -1 to + disable the feature. Most users won't want to do this. + (Bug #220728) * Wed Oct 18 2006 - sndirsch(a)suse.de - updated to xterm-222 * minor optimization for recoloring cursor via dynamic colors. @@ -367,9 +438,9 @@ "maximize" in Gnome or KDE which do not use the window manager hints for this case (Debian #289123, Novell #61153). * fixes for Novell #113277: -- specify weight for wide font which may be derived from normal + - specify weight for wide font which may be derived from normal fontname. -- cache the derived wide- and widebolt-fontnames. + - cache the derived wide- and widebolt-fontnames. - obsoletes bugzilla-99564.patch * Sat Aug 27 2005 - sndirsch(a)suse.de - added vttest; useful for testing terminals @@ -383,7 +454,7 @@ immediate match is found by asking for a bold variant of the wide-font. The result was to use overstriking rather than the actual bold font (Debian #318162, patch by Eugene Konev). ---> obsoletes mfabian's patch mentioned below + --> obsoletes mfabian's patch mentioned below * Mon Aug 01 2005 - mfabian(a)suse.de - Bugzilla #99564: fix the problem that bold fonts were not used unless the resource boldMode was set to "false". ++++++ bug220728.diff ++++++ --- input.c.orig 2006-09-02 00:15:55.000000000 +0000 +++ input.c 2006-11-27 03:10:42.000000000 +0000 @@ -303,19 +303,13 @@ allowModifierParm(XtermWidget xw, KEY_DA Bool result = False; (void) screen; - if (1 -#if OPT_SUNPC_KBD || OPT_VT52 - && !(((IsKeypadKey(kd->keysym) && keypad_mode) - || kd->is_fkey) - && (0 + if (!(IsKeypadKey(kd->keysym) && keypad_mode) #if OPT_SUNPC_KBD - || (keyboard->type == keyboardIsVT220) + && keyboard->type != keyboardIsVT220 #endif #if OPT_VT52_MODE - || (screen->vtXX_level == 0) + && screen->vtXX_level != 0 #endif - )) -#endif /* OPT_SUNPC_KBD || OPT_VT52 */ ) { result = True; } =================================================================== RCS file: RCS/input.c,v retrieving revision 1.267 diff -u -r1.267 input.c --- input.c 2006/11/26 22:33:06 1.267 +++ input.c 2006/11/28 01:24:26 @@ -608,10 +608,13 @@ } static void -modifyCursorKey(ANSI * reply, int modify, int modify_parm) +modifyCursorKey(ANSI * reply, int modify, int *modify_parm) { - if (modify_parm > 1) { - if (modify) { + if (*modify_parm > 1) { + if (modify < 0) { + *modify_parm = 0; + } + if (modify > 0) { reply->a_type = CSI; /* SS3 should not have params */ } if (modify > 1 && reply->a_nparam == 0) { @@ -742,7 +745,7 @@ int key = False; ANSI reply; int dec_code; - short modify_parm = 0; + int modify_parm = 0; int keypad_mode = ((keyboard->flags & MODE_DECKPAM) != 0); unsigned evt_state = event->state; unsigned mod_state; @@ -1016,7 +1019,7 @@ || IsEditFunctionKey(kd.keysym)) ? keyboard->modify_now.function_keys : keyboard->modify_now.cursor_keys), - modify_parm); + &modify_parm); MODIFIER_PARM; unparseseq(xw, &reply); } else if (((kd.is_fkey @@ -1049,7 +1052,7 @@ reply.a_final = A2E(dec_code - 11 + E2A('P')); modifyCursorKey(&reply, keyboard->modify_now.function_keys, - modify_parm); + &modify_parm); MODIFIER_PARM; unparseseq(xw, &reply); } @@ -1075,7 +1078,7 @@ if (kd.is_fkey) { modifyCursorKey(&reply, keyboard->modify_now.function_keys, - modify_parm); + &modify_parm); } MODIFIER_PARM; #endif @@ -1111,7 +1114,7 @@ } else { reply.a_type = CSI; } - modifyCursorKey(&reply, keyboard->modify_now.cursor_keys, modify_parm); + modifyCursorKey(&reply, keyboard->modify_now.cursor_keys, &modify_parm); reply.a_final = curfinal[kd.keysym - XK_Home]; VT52_CURSOR_KEYS; MODIFIER_PARM; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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