From 6df6c89c515ad388f3a5522ec105aeefebdf2cf8c48882e83237c4996780f5dd Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 11 Dec 2011 13:00:24 +0000 Subject: [PATCH 1/2] fixed explicit libusb dep OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=53 --- libgphoto2-2.4.11.2.tar.bz2 | 4 ++-- libgphoto2.spec | 21 +++++++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/libgphoto2-2.4.11.2.tar.bz2 b/libgphoto2-2.4.11.2.tar.bz2 index 2f053ad..4ce9366 100644 --- a/libgphoto2-2.4.11.2.tar.bz2 +++ b/libgphoto2-2.4.11.2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1e014bd3ba8adec8c54c7a2c2f3debb57b308941b5eb721fe3e7cb47f0b5103 -size 5975382 +oid sha256:6af322c92d0a9c0b25b1f694b28ddd915a1cc8dade47721284621721fc9be0c3 +size 5922756 diff --git a/libgphoto2.spec b/libgphoto2.spec index 270b640..d1ac19d 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -15,12 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libgphoto2 -BuildRequires: doxygen fdupes gcc-c++ gd-devel libexif-devel libjpeg-devel libusb-1_0-devel lockdev-devel pkg-config udev +BuildRequires: doxygen +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: gd-devel +BuildRequires: libexif-devel +BuildRequires: libjpeg-devel BuildRequires: libtool +BuildRequires: libusb-1_0-devel +BuildRequires: lockdev-devel +BuildRequires: pkg-config +BuildRequires: udev Url: http://gphoto.org/ # bug437293 %ifarch ppc64 @@ -28,11 +35,11 @@ Obsoletes: libgphoto2-64bit %endif # %define prefix /usr -License: LGPLv2.1+ -Group: Hardware/Camera Summary: A Digital Camera Library +License: LGPL-2.1+ +Group: Hardware/Camera Version: 2.4.11.2 -Release: 4 +Release: 0 Source0: libgphoto2-%{version}.tar.bz2 Source1: baselibs.conf Patch1: libgphoto2-4096files.patch @@ -41,8 +48,6 @@ Recommends: %{name}-lang = %{version} %package devel Summary: Development headers for libgphoto2 -License: LGPLv2.1+ -Group: Hardware/Camera Requires: libgphoto2 = %version libusb-1_0-devel Requires: libexif-devel From 5a64247628b438a7312e56db42516f73ee3fbd72b8f6c1dbe3b76d2cfbac99d0 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 11 Dec 2011 13:13:33 +0000 Subject: [PATCH 2/2] - do not explicitly require libusb 0.1 in pkgconfig file - some more bugfixes OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=54 --- libgphoto2.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libgphoto2.changes b/libgphoto2.changes index a5cf84b..9d033b2 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Dec 11 14:13:06 CET 2011 - meissner@suse.de + +- do not explicitly require libusb 0.1 in pkgconfig file +- some more bugfixes + ------------------------------------------------------------------- Tue Nov 29 11:39:03 CET 2011 - meissner@suse.de