diff --git a/conf.diff b/conf.diff index dfff3b1..a00249b 100644 --- a/conf.diff +++ b/conf.diff @@ -22,25 +22,3 @@ # report on compiler/libtool setup -@@ -337,7 +338,7 @@ dnl libusb - dnl --------------------------------------------------------------------------- - GP_CONFIG_MSG([USB ports]) - GP_CHECK_LIBRARY([LIBUSB],[libusb],[>= 0.1.5], -- [usb.h],[usb_busses],[ -+ [usb.h],[usb_open],[ - IOLIB_SUBDIRS="$IOLIB_SUBDIRS usb" - ],[], - [disable-explicitly], -Index: gphoto2-port-info-list.c -=================================================================== ---- libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c (Revision 11060) -+++ libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c (Arbeitskopie) -@@ -21,6 +21,8 @@ - * Boston, MA 02111-1307, USA. - */ - -+#define _GNU_SOURCE -+ - #include "config.h" - - #include diff --git a/libgphoto2-2.4.1.2.tar.bz2 b/libgphoto2-2.4.1.2.tar.bz2 deleted file mode 100644 index f777b9e..0000000 --- a/libgphoto2-2.4.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e93310e0caa223911c0592b8b5c5593d15974c9a83570d117f53f8393768c610 -size 3472639 diff --git a/libgphoto2-2.4.1.3.tar.bz2 b/libgphoto2-2.4.1.3.tar.bz2 new file mode 100644 index 0000000..0abd917 --- /dev/null +++ b/libgphoto2-2.4.1.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9dc0c2e4ec51e09208257d54ed23daa36f595d59b1acc2fba88e46c9e9c5960c +size 3498466 diff --git a/libgphoto2.changes b/libgphoto2.changes index 6ce3d29..b1dbccc 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Jun 28 10:04:02 CEST 2008 - meissner@suse.de + +- updated to current 2.4.1.3 branch state + - ptp2 driver backmerged + - bugfixes for new libtool/automake/autoconf + - bugfixes and translations + ------------------------------------------------------------------- Sun Apr 13 18:34:15 CEST 2008 - meissner@suse.de diff --git a/libgphoto2.spec b/libgphoto2.spec index c6eefd7..ebbe30e 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -1,5 +1,5 @@ # -# spec file for package libgphoto2 (Version 2.4.1.2) +# spec file for package libgphoto2 (Version 2.4.1.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,8 +18,8 @@ Url: http://gphoto.org/ License: LGPL v2.1 or later Group: Hardware/Camera Summary: A Digital Camera Library -Version: 2.4.1.2 -Release: 3 +Version: 2.4.1.3 +Release: 1 Source0: libgphoto2-%{version}.tar.bz2 Patch0: conf.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -226,6 +226,11 @@ rm -rf $RPM_BUILD_ROOT /sbin/ldconfig %changelog +* Sat Jun 28 2008 meissner@suse.de +- updated to current 2.4.1.3 branch state + - ptp2 driver backmerged + - bugfixes for new libtool/automake/autoconf + - bugfixes and translations * Sun Apr 13 2008 meissner@suse.de - fixed glibc 2.8 problem with re_compile_pattern. - fixed one topfield problem