Hello community, here is the log from the commit of package gphotofs checked in at Mon Nov 3 12:08:45 CET 2008. -------- --- GNOME/gphotofs/gphotofs.changes 2007-08-10 19:39:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/gphotofs/gphotofs.changes 2008-10-31 14:05:08.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Oct 31 14:04:46 CET 2008 - meissner@suse.de + +- fixed implicit get*id and a typo in return handling bnc#439324 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gphotofs-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gphotofs.spec ++++++ --- /var/tmp/diff_new_pack.k27684/_old 2008-11-03 12:08:32.000000000 +0100 +++ /var/tmp/diff_new_pack.k27684/_new 2008-11-03 12:08:32.000000000 +0100 @@ -1,26 +1,35 @@ # # spec file for package gphotofs (Version 0.4.0) # -# Copyright (c) 2007 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. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: gphotofs BuildRequires: fuse-devel glib2-devel libgphoto2-devel libjpeg-devel Requires: fuse -URL: http://gphoto.sourceforge.net +Url: http://gphoto.sourceforge.net %define prefix /usr License: GPL v2 or later Group: Hardware/Camera Summary: User Level File System for gphoto-Based Cameras Version: 0.4.0 -Release: 8 +Release: 160 Source0: gphotofs-%{version}.tar.bz2 +Patch0: gphotofs-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -71,15 +80,15 @@ %prep %setup -q +%patch0 -p0 %build -CFLAGS="$RPM_OPT_FLAGS" ./configure \ - --prefix=%{prefix} \ - --libdir=%{_libdir} +%configure make %install [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT +mkdir $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %files @@ -87,21 +96,23 @@ /usr/bin/gphotofs %changelog -* Fri Aug 10 2007 - bk@suse.de +* Fri Oct 31 2008 meissner@suse.de +- fixed implicit get*id and a typo in return handling bnc#439324 +* Fri Aug 10 2007 bk@suse.de - Add "Requires: fuse" to ensure that fuse is present (285101#c29) -* Mon Jul 30 2007 - meissner@suse.de +* Mon Jul 30 2007 meissner@suse.de - sync to upstream 0.4.0 - ported code to work with fuse 2.5 too. - some small bugfixes -* Mon Jan 15 2007 - meissner@suse.de +* Mon Jan 15 2007 meissner@suse.de - upgraded to current trunk. - write support, mkdir, rmdir added -* Sun Oct 22 2006 - meissner@suse.de +* Sun Oct 22 2006 meissner@suse.de - buildrequires libgphoto2-devel -* Mon Sep 04 2006 - meissner@suse.de +* Mon Sep 04 2006 meissner@suse.de - upstream 0.3: - Command line options to select a specific camera, like gphoto2. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Mon Jan 09 2006 - meissner@suse.de +* Mon Jan 09 2006 meissner@suse.de - initial gphotofs import. ++++++ gphotofs-fixes.patch ++++++ --- gphotofs.c +++ gphotofs.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <stdlib.h> +#include <unistd.h> #include <string.h> #include <errno.h> #include <fcntl.h> @@ -757,7 +758,7 @@ "'serial:' or 'usb:')."), sPort); g_fprintf(stderr, "\n"); goto error; - } else if (p < 0) { + } else if (i < GP_OK) { ret = i; goto error; } else { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org