Hello community, here is the log from the commit of package xsane checked in at Thu Oct 25 02:27:58 CEST 2007. -------- --- xsane/xsane.changes 2007-07-04 07:56:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/xsane/xsane.changes 2007-10-24 23:01:56.770272000 +0200 @@ -1,0 +2,5 @@ +Wed Oct 24 22:42:35 CEST 2007 - mauro@suse.de + +- Created no-eula.patch to solve bnc # 183725 + +------------------------------------------------------------------- New: ---- no-eula.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsane.spec ++++++ --- /var/tmp/diff_new_pack.zp5524/_old 2007-10-25 02:26:40.000000000 +0200 +++ /var/tmp/diff_new_pack.zp5524/_new 2007-10-25 02:26:41.000000000 +0200 @@ -15,11 +15,11 @@ License: GPL v2 or later Group: Hardware/Scanner Requires: sane-backends -Autoreqprov: on +AutoReqProv: on Summary: A GTK-Based Graphical Scanning Front-End for SANE Version: 0.994 -Release: 41 -URL: http://www.xsane.org/ +Release: 98 +Url: http://www.xsane.org/ # URL for Source0: http://www.xsane.org/download/xsane-0.994.tar.gz Source0: xsane-%{version}.tar.bz2 # Source1 is the primary source for the suse_update_desktop_file stuff @@ -28,6 +28,7 @@ # It is the 32x32 scanner.png from the kdelibs3-3.3.0 package. # I don't want to have kdelibs3 in neededforbuild because xsane doesn't need KDE stuff for build Source2: scanner_32x32.png +Patch: no-eula.patch # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,6 +56,7 @@ %prep # Be quiet when unpacking: %setup -q +%patch0 -p1 # Remove an outdated backup file which must not be installed: rm xsane.CHANGES~ @@ -98,8 +100,9 @@ %{_libdir}/gimp/2.0/plug-ins/xsane %{_datadir}/applications/%name.desktop %{_datadir}/pixmaps/scanner_32x32.png - %changelog +* Wed Oct 24 2007 - mauro@suse.de +- Created no-eula.patch to solve bnc # 183725 * Wed Jul 04 2007 - jsmeix@suse.de - Added liblcms and liblcms-devel to BuildRequires to enable LCMS (color management) support. ++++++ no-eula.patch ++++++ 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 @@ xsane.xsane_rc_set_filename = strdup("xsane"); /* ".rc" is appended later */ } - - if (xsane_pref_restore()) /* restore preferences, returns TRUE if license is not accpted yet */ - { - if (xsane_display_eula(1)) /* show license and ask for accept/not accept */ - { - DBG(DBG_info, "user did not accept eula, we abort\n"); - return 1; /* User did not accept eula */ - } - } + + xsane_pref_restore(); /* Restore preferences */ xsane_pref_restore_media(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de