diff --git a/hal.diff b/hal.diff deleted file mode 100644 index 9e63f06..0000000 --- a/hal.diff +++ /dev/null @@ -1,22 +0,0 @@ -Index: print-camera-list.c -=================================================================== ---- packaging/generic/print-camera-list.c (Revision 10966) -+++ packaging/generic/print-camera-list.c (Revision 10967) -@@ -790,7 +790,7 @@ - print_version_comment(stdout, " | ", "\n", "\n"); - printf("\n"); - printf(" \n"); -- printf(" \n"); -+ printf(" \n"); - return 0; - } - -@@ -909,7 +909,7 @@ - print_version_comment(stdout, " | ", "\n", "\n"); - printf("\n"); - printf(" \n"); -- printf(" \n"); -+ printf(" \n"); - return 0; - } - diff --git a/libgphoto2-2.4.0.99.tar.bz2 b/libgphoto2-2.4.0.99.tar.bz2 new file mode 100644 index 0000000..f54eb6f --- /dev/null +++ b/libgphoto2-2.4.0.99.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a9ea7e801fb011fe16f7d42f13449b27ab77b84a82c43beda03e4cdb5a37247 +size 3374638 diff --git a/libgphoto2-2.4.0.tar.bz2 b/libgphoto2-2.4.0.tar.bz2 deleted file mode 100644 index 0d6ce60..0000000 --- a/libgphoto2-2.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7a1954cbedecb0ee4307c3a6f5dab1344ebd553b24b034629ffdd527c7276d7 -size 3223128 diff --git a/libgphoto2.changes b/libgphoto2.changes index a8c553e..5ef5d60 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Mar 19 16:31:18 CET 2008 - meissner@suse.de + +- updated to current 2.4.0.99 BRANCH state + - ptp2 driver lots of bugfixes and lots of new ids + - canon driver timeout fix + - disk.so suppression of known network fs + - suppress Olympus mass storage id + - hal patch upstreamed + ------------------------------------------------------------------- Tue Mar 11 21:25:28 CET 2008 - schwab@suse.de diff --git a/libgphoto2.spec b/libgphoto2.spec index 4045b0c..9cdf8ca 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -1,5 +1,5 @@ # -# spec file for package libgphoto2 (Version 2.4.0) +# spec file for package libgphoto2 (Version 2.4.0.99) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,12 +18,12 @@ Url: http://gphoto.org/ License: LGPL v2.1 or later Group: Hardware/Camera Summary: A Digital Camera Library -Version: 2.4.0 -Release: 85 +Version: 2.4.0.99 +Release: 1 Source0: libgphoto2-%{version}.tar.bz2 -Patch0: hal.diff -Patch1: conf.diff +Patch0: conf.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: %{name}-lang = %{version} %package devel Summary: Development headers for libgphoto2 @@ -31,7 +31,6 @@ License: LGPL v2.1 or later Group: Hardware/Camera Requires: libgphoto2 = %version libusb-devel Requires: libexif-devel -Requires: %{name}-lang = %{version} %description gPhoto (GNU Photo) is a set of libraries for previewing, retrieving, @@ -142,7 +141,6 @@ Authors: %prep %setup -q %patch0 -%patch1 %build %{?suse_update_config:%{suse_update_config -f . libgphoto2_port}} @@ -228,6 +226,13 @@ rm -rf $RPM_BUILD_ROOT /sbin/ldconfig %changelog +* Wed Mar 19 2008 meissner@suse.de +- updated to current 2.4.0.99 BRANCH state + - ptp2 driver lots of bugfixes and lots of new ids + - canon driver timeout fix + - disk.so suppression of known network fs + - suppress Olympus mass storage id + - hal patch upstreamed * Tue Mar 11 2008 schwab@suse.de - Fix configure script. * Tue Mar 04 2008 meissner@suse.de