Hello community, here is the log from the commit of package xsane checked in at Tue Mar 11 18:15:50 CET 2008. -------- --- xsane/xsane.changes 2007-11-28 15:43:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/xsane/xsane.changes 2008-03-11 11:08:22.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Mar 11 11:07:48 CET 2008 - jsmeix@suse.de + +- Enhanced and re-enabled no-eula.patch: + It suppresses the disclaimer of warranty and liability dialog + and adds a modification note and adds a openSUSE Bugzilla URL + to make the change obvious for the user and direct bug reports + to us (see Novell/Suse Bugzilla bnc#183725). +- xdg-open-as-default-browser.patch sets DEFAULT_BROWSER xdg-open + to get the right browser launched for KDE and Gnome users to + show the XSane documentation. Therefore xdg-utils is required. +- remove-non-working-help.patch removes the items in the help + menue regarding backend documentation because the referred + files do not exist (dead URLs with "sane-<backend>-doc.html" + in sane-backends-doc.html). + +------------------------------------------------------------------- @@ -9 +25 @@ - https://bugzilla.novell.com/show_bug.cgi?id=183725#c12 + comment 12 in Novell/Suse Bugzilla bnc#183725. @@ -22 +38 @@ - liability (see Novell/Suse Bugzilla bug 183725). + liability (see Novell/Suse Bugzilla bnc#183725). @@ -74 +90 @@ - (see Suse bugzilla bug #224882). + (see Suse bugzilla bnc##224882). New: ---- remove-non-working-help.patch xdg-open-as-default-browser.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsane.spec ++++++ --- /var/tmp/diff_new_pack.Kf9877/_old 2008-03-11 18:11:38.000000000 +0100 +++ /var/tmp/diff_new_pack.Kf9877/_new 2008-03-11 18:11:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xsane (Version 0.995) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,15 +10,22 @@ # norootforbuild + Name: xsane BuildRequires: gimp-devel libgphoto2-devel liblcms-devel libtiff-devel sane-backends update-desktop-files License: GPL v2 or later Group: Hardware/Scanner -Requires: sane-backends +# Require the SANE base system in sane-backends explicitely to be on the safe side +# because whatever third-party scanner driver package (e.g. a third-party Iscan RPM) +# could provide libsane.so.1 by accident via RPM Autoreqprov, see our iscan-free.spec +# and iscan.spec how to exclude libsane from the provide-list of Autoreqprov. +# Require xdg-utils because Patch101 sets the DEFAULT_BROWSER to "xdg-open" +# to get the right browser launched for KDE and Gnome users. +Requires: sane-backends, xdg-utils AutoReqProv: on Summary: A GTK-Based Graphical Scanning Front-End for SANE Version: 0.995 -Release: 1 +Release: 41 Url: http://www.xsane.org/ # URL for Source0: http://www.xsane.org/download/xsane-0.995.tar.gz Source0: xsane-%{version}.tar.bz2 @@ -29,8 +36,16 @@ # I don't want to have kdelibs3 in neededforbuild because xsane doesn't need KDE stuff for build Source2: scanner_32x32.png # Patch100... is SUSE specific stuff: -# Patch100 suppresses the disclaimer of warranty and liability dialog: +# Patch100 suppresses the disclaimer of warranty and liability dialog +# and adds a modification note and adds a openSUSE Bugzilla URL +# to make the change obvious for the user and direct bug reports to us: Patch100: no-eula.patch +# Patch101 sets DEFAULT_BROWSER "xdg-open" in xsane.h +# to get the right browser launched for KDE and Gnome users: +Patch101: xdg-open-as-default-browser.patch +# Patch102 removes the items in the help menue regarding backend documentation +# because the referred files do not exist (dead URLs in sane-backends-doc.html): +Patch102: remove-non-working-help.patch # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,11 +73,16 @@ %prep # Be quiet when unpacking: %setup -q -# Patch100 suppresses the disclaimer of warranty and liability dialog. -# Currently this patch is disabled to be on the safe side because of -# https://bugzilla.novell.com/show_bug.cgi?id=183725#c12 -# until there is a final decission regarding the issue. -#%patch100 -p1 +# Patch100 suppresses the disclaimer of warranty and liability dialog +# and adds a modification note and adds a openSUSE Bugzilla URL +# to make the change obvious for the user and direct bug reports to us: +%patch100 +# Patch101 sets DEFAULT_BROWSER "xdg-open" in xsane.h +# to get the right browser launched for KDE and Gnome users: +%patch101 +# Patch102 removes the items in the help menue regarding backend documentation +# because the referred files do not exist (dead URLs in sane-backends-doc.html): +%patch102 %build %{?suse_update_config:%{suse_update_config -f}} @@ -108,28 +128,41 @@ %{_datadir}/pixmaps/scanner_32x32.png %changelog -* Wed Nov 28 2007 - jsmeix@suse.de +* Tue Mar 11 2008 jsmeix@suse.de +- Enhanced and re-enabled no-eula.patch: + It suppresses the disclaimer of warranty and liability dialog + and adds a modification note and adds a openSUSE Bugzilla URL + to make the change obvious for the user and direct bug reports + to us (see Novell/Suse Bugzilla bnc#183725). +- xdg-open-as-default-browser.patch sets DEFAULT_BROWSER xdg-open + to get the right browser launched for KDE and Gnome users to + show the XSane documentation. Therefore xdg-utils is required. +- remove-non-working-help.patch removes the items in the help + menue regarding backend documentation because the referred + files do not exist (dead URLs with "sane-<backend>-doc.html" + in sane-backends-doc.html). +* Wed Nov 28 2007 jsmeix@suse.de - Updated to version 0.995: Several layout changes. Multiple mail receivers are allowed in email mode. Scanning and conversion speed is increased. - Disabled no-eula.patch to be on the safe side because of - https://bugzilla.novell.com/show_bug.cgi?id=183725#c12 + comment 12 in Novell/Suse Bugzilla bnc#183725. until there is a final decission regarding the issue. -* Fri Nov 02 2007 - ro@suse.de +* Fri Nov 02 2007 ro@suse.de - Removed liblcms from BuildRequires because liblcms-devel requires it via RPM dependency. -* Wed Oct 24 2007 - mauro@suse.de +* Wed Oct 24 2007 mauro@suse.de - no-eula.patch suppresses the disclaimer of warranty and - liability (see Novell/Suse Bugzilla bug 183725). -* Wed Jul 04 2007 - jsmeix@suse.de + liability (see Novell/Suse Bugzilla bnc#183725). +* Wed Jul 04 2007 jsmeix@suse.de - Added liblcms and liblcms-devel to BuildRequires to enable LCMS (color management) support. -* Mon Mar 05 2007 - jsmeix@suse.de +* Mon Mar 05 2007 jsmeix@suse.de - Updated to version 0.994 (a bugfix release for 0.993): Fixed crash when no ICC/ICM profile was defined. Fixed PostScript output which did not work for printing. -* Mon Feb 26 2007 - jsmeix@suse.de +* Mon Feb 26 2007 jsmeix@suse.de - Updated to version 0.993 (this is a beta-test release): 12 bits/channel support for PostScript. Usage of new gtk_file_chooser. @@ -138,159 +171,159 @@ A lot of color management improvements (CMS still in beta test): Embedded profiles for PostScript and PDF, convert to sRGB, convert to working color space. -* Wed Jan 31 2007 - jsmeix@suse.de +* Wed Jan 31 2007 jsmeix@suse.de - Package 'sane' was renamed to 'sane-backends'. Adapted it so that it works with 'sane-backends' -* Wed Jan 31 2007 - ro@suse.de +* Wed Jan 31 2007 ro@suse.de - GNOME moved to /usr therefore the GIMP plugin link was changed accordingly -* Fri Jan 26 2007 - jsmeix@suse.de +* Fri Jan 26 2007 jsmeix@suse.de - Updated to version 0.992: Some bugs and compiler warnings have been fixed. New rudimentary color management support. This version may crash or produce unexpected results, especially with color management enabled. -* Thu Dec 07 2006 - jsmeix@suse.de +* Thu Dec 07 2006 jsmeix@suse.de - Changed /usr/X11R6/bin/xsane to /usr/bin/xsane - (see Suse bugzilla bug #224882). -* Sat Oct 28 2006 - meissner@suse.de + (see Suse bugzilla bnc##224882). +* Sat Oct 28 2006 meissner@suse.de - buildrequires: libgphoto2-devel -* Tue Sep 05 2006 - aj@suse.de +* Tue Sep 05 2006 aj@suse.de - Cleanup BuildRequires. -* Fri Jul 14 2006 - jsmeix@suse.de +* Fri Jul 14 2006 jsmeix@suse.de - Updated to version 0.991: This version contains some bugfixes (in particular for the multipage mode which was introduced in version 0.99). - Removed obsolete BuildRequires for hp-officeJet. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Tue Jan 10 2006 - jsmeix@suse.de +* Tue Jan 10 2006 jsmeix@suse.de - Updated to version 0.99 -* Tue Jan 03 2006 - jsmeix@suse.de +* Tue Jan 03 2006 jsmeix@suse.de - Updated to version 0.98b -* Wed Nov 23 2005 - jsmeix@suse.de +* Wed Nov 23 2005 jsmeix@suse.de - Updated to version 0.98a -* Mon Jan 24 2005 - jsmeix@suse.de +* Mon Jan 24 2005 jsmeix@suse.de - Updated to version 0.97 This version contains some bugfixes. -* Mon Nov 22 2004 - jsmeix@suse.de +* Mon Nov 22 2004 jsmeix@suse.de - Added scanner_32x32.png as icon file for xsane.desktop. -* Wed Nov 17 2004 - jsmeix@suse.de +* Wed Nov 17 2004 jsmeix@suse.de - Updated to version 0.96 This version contains several bugfixes and improvements, especially for the fax mode and the email mode. -* Mon Aug 16 2004 - jsmeix@suse.de +* Mon Aug 16 2004 jsmeix@suse.de - Updated to version 0.95 (has gimp-2.0.x support included) -* Wed Jul 21 2004 - jsmeix@suse.de +* Wed Jul 21 2004 jsmeix@suse.de - Added libieee1284 as needed for build because sane is needed to build xsane and as sane has now libieee1284 support it is also needed to build xsane. -* Tue Mar 23 2004 - jsmeix@suse.de +* Tue Mar 23 2004 jsmeix@suse.de - gimp plugins are now in .../2.0/... -* Mon Feb 23 2004 - ro@suse.de +* Mon Feb 23 2004 ro@suse.de - update to 0.92 - build with gtk2 stuff - added patch from debian maintainer to support gimp2 - gettext stuff doesn't work yet -* Sat Jan 10 2004 - adrian@suse.de +* Sat Jan 10 2004 adrian@suse.de - build as user -* Mon Nov 10 2003 - ro@suse.de +* Mon Nov 10 2003 ro@suse.de - use net-snmp instead of ucdsnmp -* Fri Aug 15 2003 - adrian@suse.de +* Fri Aug 15 2003 adrian@suse.de - add desktop file -* Tue Jul 29 2003 - coolo@suse.de +* Tue Jul 29 2003 coolo@suse.de - use %%find_lang -* Mon Jun 30 2003 - freitag@suse.de +* Mon Jun 30 2003 freitag@suse.de - fixed 64bit libpath problem with gimp plugin -* Fri Jun 06 2003 - freitag@suse.de +* Fri Jun 06 2003 freitag@suse.de - update to version 0.91 -* Mon Feb 03 2003 - freitag@suse.de +* Mon Feb 03 2003 freitag@suse.de - added libtiff for tiff support again. -* Mon Feb 03 2003 - ro@suse.de +* Mon Feb 03 2003 ro@suse.de - blow up neededforbuild again to make it build -* Fri Jan 24 2003 - freitag@suse.de +* Fri Jan 24 2003 freitag@suse.de - update to version 0.90 cleaned up neededforbuild a bit, removed gimp etc. added libgphoto, now required for SANE -* Thu Oct 31 2002 - freitag@suse.de +* Thu Oct 31 2002 freitag@suse.de - update to version 0.89 -* Tue Oct 22 2002 - ro@suse.de +* Tue Oct 22 2002 ro@suse.de - added pkgconfig and libusb to neededforbuild -* Tue Sep 17 2002 - ro@suse.de +* Tue Sep 17 2002 ro@suse.de - removed bogus self-provides -* Sat Jul 27 2002 - adrian@suse.de +* Sat Jul 27 2002 adrian@suse.de - fix neededforbuild -* Wed Jul 17 2002 - freitag@suse.de +* Wed Jul 17 2002 freitag@suse.de - update to version 0.87 -* Wed May 08 2002 - freitag@suse.de +* Wed May 08 2002 freitag@suse.de - update to version 0.86 small bugfixing and functional updates -* Wed Apr 24 2002 - freitag@suse.de +* Wed Apr 24 2002 freitag@suse.de - update to v. 0.85 changed default help browser to konqueror since that is the SuSE default browser. -* Fri Feb 01 2002 - ro@suse.de +* Fri Feb 01 2002 ro@suse.de - changed neededforbuild <libpng> to <libpng-devel-packages> -* Thu Jan 24 2002 - egmont@suselinux.hu +* Thu Jan 24 2002 egmont@suselinux.hu - fixed URL -* Thu Jan 10 2002 - freitag@suse.de +* Thu Jan 10 2002 freitag@suse.de - update to v. 0.83 -* Mon Nov 12 2001 - freitag@suse.de +* Mon Nov 12 2001 freitag@suse.de - update to version 0.80, which provides a build-in viewer to see the scan results immediately, some bugfixes and new and updated translations: cs, de, fr, ja, ru, tr -* Sat Sep 15 2001 - kukuk@suse.de +* Sat Sep 15 2001 kukuk@suse.de - Remove netscape from requires -* Fri Aug 31 2001 - ro@suse.de +* Fri Aug 31 2001 ro@suse.de - added <hp-officeJet> to neededforbuild (for sane) -* Wed Aug 22 2001 - freitag@suse.de +* Wed Aug 22 2001 freitag@suse.de - update to version 0.79, which include: * (still experimental) email functionality improved * preview improvement * medium selection for negatives * security enhancement when xsane is running with suid=root -* Fri Jun 29 2001 - freitag@suse.de +* Fri Jun 29 2001 freitag@suse.de - update to version 0.78 -* Tue Apr 24 2001 - egger@suse.de +* Tue Apr 24 2001 egger@suse.de - Updated to version 0.75. - Use BuildRooting - Use better paths for data. - Should fix bug 7088. -* Mon Apr 02 2001 - freitag@suse.de +* Mon Apr 02 2001 freitag@suse.de - update to version 0.74, source in bzip2-format. -* Mon Mar 05 2001 - freitag@suse.de +* Mon Mar 05 2001 freitag@suse.de - update to version 0.72 -* Thu Jan 18 2001 - freitag@suse.de +* Thu Jan 18 2001 freitag@suse.de - update to version 0.70 to fix a bug with gimp plugin mode. -* Mon Dec 18 2000 - freitag@suse.de +* Mon Dec 18 2000 freitag@suse.de - update to version 0.67 -* Fri Dec 08 2000 - freitag@suse.de +* Fri Dec 08 2000 freitag@suse.de - update to version 0.64 -* Mon Nov 06 2000 - freitag@suse.de +* Mon Nov 06 2000 freitag@suse.de - changed License/Copyright in spec-File -* Thu Nov 02 2000 - freitag@suse.de +* Thu Nov 02 2000 freitag@suse.de - update to version 0.62 neededforbuild needs gimp-devel, not gimp-dev -* Wed Nov 01 2000 - egger@suse.de +* Wed Nov 01 2000 egger@suse.de - Updated specfile to new long packagenames. - Reworked specfile. - Probably needs some more work; I'm taking care of that. -* Mon Sep 25 2000 - ro@suse.de +* Mon Sep 25 2000 ro@suse.de - make it compile -* Tue Sep 19 2000 - egger@suse.de +* Tue Sep 19 2000 egger@suse.de - Use -p for makedir. - Buildproofed on i386. -* Tue Sep 05 2000 - egger@suse.de +* Tue Sep 05 2000 egger@suse.de - update to version 0.61 -* Wed Jun 07 2000 - freitag@suse.de +* Wed Jun 07 2000 freitag@suse.de - update to version 0.57 -* Sat Mar 04 2000 - ro@suse.de +* Sat Mar 04 2000 ro@suse.de - removed libgimp from neededforbuild -* Mon Feb 28 2000 - freitag@suse.de +* Mon Feb 28 2000 freitag@suse.de - inserted group tag -* Mon Feb 14 2000 - freitag@suse.de +* Mon Feb 14 2000 freitag@suse.de - update to version 0.55 -* Mon Jan 10 2000 - freitag@suse.de +* Mon Jan 10 2000 freitag@suse.de - update to version 0.49 -* Tue Oct 26 1999 - freitag@suse.de +* Tue Oct 26 1999 freitag@suse.de - initial verison 0.40 ++++++ no-eula.patch ++++++ --- /var/tmp/diff_new_pack.Kf9877/_old 2008-03-11 18:11:38.000000000 +0100 +++ /var/tmp/diff_new_pack.Kf9877/_new 2008-03-11 18:11:38.000000000 +0100 @@ -1,7 +1,6 @@ -diff -Naur xsane-0.994/src/xsane.c xsane-0.994-mp/src/xsane.c ---- xsane-0.994/src/xsane.c 2007-02-25 23:21:06.000000000 +0100 -+++ xsane-0.994-mp/src/xsane.c 2007-10-24 21:35:08.442836000 +0200 -@@ -5817,15 +5817,8 @@ +--- src/xsane.c.orig 2007-09-28 17:24:56.000000000 +0200 ++++ src/xsane.c 2008-03-05 12:22:56.000000000 +0100 +@@ -5795,19 +5795,7 @@ static int xsane_init(int argc, char **a xsane.xsane_rc_set_filename = strdup("xsane"); /* ".rc" is appended later */ } @@ -13,9 +12,27 @@ - DBG(DBG_info, "user did not accept eula, we abort\n"); - return 1; /* User did not accept eula */ - } +- else /* User did accept eula */ +- { +- xsane_pref_save(); +- } - } -+ -+ xsane_pref_restore(); /* Restore preferences */ ++ xsane_pref_restore(); /* restore preferences */ xsane_pref_restore_media(); +--- src/xsane.h.orig 2007-08-13 09:20:32.000000000 +0200 ++++ src/xsane.h 2008-03-06 13:48:05.000000000 +0100 +@@ -93,9 +93,9 @@ + + #define XSANE_VERSION "0.995" + #define XSANE_AUTHOR "Oliver Rauch" +-#define XSANE_COPYRIGHT "Oliver Rauch" +-#define XSANE_DATE "1998-2007" +-#define XSANE_EMAIL_ADR "Oliver.Rauch@xsane.org" ++#define XSANE_COPYRIGHT "Oliver Rauch (modified by Novell, Inc.)" ++#define XSANE_DATE "1998-2008" ++#define XSANE_EMAIL_ADR "Oliver.Rauch@xsane.org (bug reports: http://bugs.opensuse.org)" + #define XSANE_HOMEPAGE "http://www.xsane.org" + #define XSANE_COPYRIGHT_TXT XSANE_DATE " " XSANE_COPYRIGHT + ++++++ remove-non-working-help.patch ++++++ --- src/xsane.c.orig2 2008-03-05 12:22:56.000000000 +0100 +++ src/xsane.c 2008-03-05 15:46:57.000000000 +0100 @@ -4247,27 +4247,6 @@ static GtkWidget *xsane_help_build_menu( gtk_widget_show(item); - /* Backend doc -> html viewer */ - - if (xsane.backend) - { - item = gtk_menu_item_new_with_label(MENU_ITEM_BACKEND_DOC); - gtk_menu_append(GTK_MENU(menu), item); - g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_show_doc, (void *) xsane.backend); - gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_F2, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); - gtk_widget_show(item); - } - - - /* available backends -> html viewer */ - - item = gtk_menu_item_new_with_label(MENU_ITEM_AVAILABLE_BACKENDS); - gtk_menu_append(GTK_MENU(menu), item); - g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_show_doc, (void *) "sane-backends"); - gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_F3, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); - gtk_widget_show(item); - - /* problems -> html viewer */ item = gtk_menu_item_new_with_label(MENU_ITEM_PROBLEMS); ++++++ xdg-open-as-default-browser.patch ++++++ --- src/xsane.h.orig2 2008-03-05 14:21:38.000000000 +0100 +++ src/xsane.h 2008-03-05 14:30:58.000000000 +0100 @@ -251,7 +251,7 @@ # elif defined(HAVE_OS2_H) # define DEFAULT_BROWSER "netscape" # else -# define DEFAULT_BROWSER "netscape" +# define DEFAULT_BROWSER "xdg-open" # endif #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org