From 97eec2c52c9d6e798e94b740c06b7497db760ee90676f5829b64a7d4bfe7bb67 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 12 Oct 2009 15:04:50 +0000 Subject: [PATCH 1/7] tag mediaplayers correctly in the new style UDEV model. OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=14 --- 03_udev_rules_media_player | 17 +++++++++++++++++ libgphoto2.changes | 5 +++++ libgphoto2.spec | 2 ++ 3 files changed, 24 insertions(+) create mode 100644 03_udev_rules_media_player diff --git a/03_udev_rules_media_player b/03_udev_rules_media_player new file mode 100644 index 0000000..c70c74c --- /dev/null +++ b/03_udev_rules_media_player @@ -0,0 +1,17 @@ +# Description: Fix udev rules to identify media players +# Ubuntu: https://launchpad.net/bugs/444083 +# Upstream: https://sourceforge.net/tracker/?func=detail&aid=2877064&group_id=8874&atid=308874 +Index: libgphoto2-2.4.6/packaging/generic/print-camera-list.c +=================================================================== +--- libgphoto2-2.4.6.orig/packaging/generic/print-camera-list.c 2009-10-12 15:57:56.000000000 +0200 ++++ libgphoto2-2.4.6/packaging/generic/print-camera-list.c 2009-10-12 15:58:01.000000000 +0200 +@@ -582,6 +582,9 @@ + } + } + if (has_valid_rule != 0) { ++ if (a->device_type & GP_DEVICE_AUDIO_PLAYER) ++ printf(", ENV{ID_MEDIA_PLAYER}=\"1\""); ++ + if (pdata->script != NULL || pdata->mode != NULL || pdata->owner != NULL || pdata->group != NULL) + printf(", "); + diff --git a/libgphoto2.changes b/libgphoto2.changes index e412dad..c372d68 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 12 17:04:31 CEST 2009 - meissner@suse.de + +- tag mediaplayers correctly in the new style UDEV model. + ------------------------------------------------------------------- Sat Sep 26 11:34:46 CEST 2009 - meissner@suse.de diff --git a/libgphoto2.spec b/libgphoto2.spec index 060682c..50fb3f9 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -33,6 +33,7 @@ Summary: A Digital Camera Library Version: 2.4.7.1 Release: 1 Source0: libgphoto2-%{version}.tar.bz2 +Patch0: 03_udev_rules_media_player BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -151,6 +152,7 @@ Authors: %lang_package %prep %setup -q +%patch0 -p0 %build %{?suse_update_config:%{suse_update_config -f . libgphoto2_port}} From 12a8bace4278563498952a03de9a04e84e019376c6a1162ccee94943c5490eeb Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 14 Oct 2009 10:06:50 +0000 Subject: [PATCH 2/7] patch p0->p1 OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=15 --- libgphoto2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgphoto2.spec b/libgphoto2.spec index 50fb3f9..1ad516e 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -152,7 +152,7 @@ Authors: %lang_package %prep %setup -q -%patch0 -p0 +%patch0 -p1 %build %{?suse_update_config:%{suse_update_config -f . libgphoto2_port}} From ba755f330a401b460e3357e5c06ee993ad56f33f031cc97f4d971f2da4409eec Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Oct 2009 23:13:47 +0000 Subject: [PATCH 3/7] checked in OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=16 --- 03_udev_rules_media_player | 17 ----------------- libgphoto2.changes | 5 ----- libgphoto2.spec | 2 -- 3 files changed, 24 deletions(-) delete mode 100644 03_udev_rules_media_player diff --git a/03_udev_rules_media_player b/03_udev_rules_media_player deleted file mode 100644 index c70c74c..0000000 --- a/03_udev_rules_media_player +++ /dev/null @@ -1,17 +0,0 @@ -# Description: Fix udev rules to identify media players -# Ubuntu: https://launchpad.net/bugs/444083 -# Upstream: https://sourceforge.net/tracker/?func=detail&aid=2877064&group_id=8874&atid=308874 -Index: libgphoto2-2.4.6/packaging/generic/print-camera-list.c -=================================================================== ---- libgphoto2-2.4.6.orig/packaging/generic/print-camera-list.c 2009-10-12 15:57:56.000000000 +0200 -+++ libgphoto2-2.4.6/packaging/generic/print-camera-list.c 2009-10-12 15:58:01.000000000 +0200 -@@ -582,6 +582,9 @@ - } - } - if (has_valid_rule != 0) { -+ if (a->device_type & GP_DEVICE_AUDIO_PLAYER) -+ printf(", ENV{ID_MEDIA_PLAYER}=\"1\""); -+ - if (pdata->script != NULL || pdata->mode != NULL || pdata->owner != NULL || pdata->group != NULL) - printf(", "); - diff --git a/libgphoto2.changes b/libgphoto2.changes index c372d68..e412dad 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Oct 12 17:04:31 CEST 2009 - meissner@suse.de - -- tag mediaplayers correctly in the new style UDEV model. - ------------------------------------------------------------------- Sat Sep 26 11:34:46 CEST 2009 - meissner@suse.de diff --git a/libgphoto2.spec b/libgphoto2.spec index 1ad516e..060682c 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -33,7 +33,6 @@ Summary: A Digital Camera Library Version: 2.4.7.1 Release: 1 Source0: libgphoto2-%{version}.tar.bz2 -Patch0: 03_udev_rules_media_player BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -152,7 +151,6 @@ Authors: %lang_package %prep %setup -q -%patch0 -p1 %build %{?suse_update_config:%{suse_update_config -f . libgphoto2_port}} From 1d62b5627283e26ff337a25791868a6344dc2f5edb20d06e707f747e462636f4 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 21 Nov 2009 19:43:43 +0000 Subject: [PATCH 4/7] Accepting request 24841 from home:msmeissn:branches:graphics Copy from home:msmeissn:branches:graphics/libgphoto2 via accept of submit request 24841 revision 2. Request was accepted with message: reviewed, ok OBS-URL: https://build.opensuse.org/request/show/24841 OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=17 --- libgphoto2-2.4.7.1.tar.bz2 | 3 --- libgphoto2-2.4.7.3.tar.bz2 | 3 +++ libgphoto2.changes | 10 ++++++++++ libgphoto2.spec | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 libgphoto2-2.4.7.1.tar.bz2 create mode 100644 libgphoto2-2.4.7.3.tar.bz2 diff --git a/libgphoto2-2.4.7.1.tar.bz2 b/libgphoto2-2.4.7.1.tar.bz2 deleted file mode 100644 index 262840a..0000000 --- a/libgphoto2-2.4.7.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ddcfc1d62c21d2076c0a91fc0c525119ae2b944ff5aeba92995537d6efc86f6e -size 5304472 diff --git a/libgphoto2-2.4.7.3.tar.bz2 b/libgphoto2-2.4.7.3.tar.bz2 new file mode 100644 index 0000000..d3efd2d --- /dev/null +++ b/libgphoto2-2.4.7.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3a4db58d8ca5b79f5d787fae812f6b2ebe41d482911351c99f1b70f30388ff5 +size 5351024 diff --git a/libgphoto2.changes b/libgphoto2.changes index e412dad..6781d6f 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Nov 21 19:42:05 CET 2009 - meissner@novell.com + +- 2.4.7.3 tempsnapshot + +------------------------------------------------------------------- +Mon Oct 12 17:04:31 CEST 2009 - meissner@suse.de + +- tag mediaplayers correctly in the new style UDEV model. + ------------------------------------------------------------------- Sat Sep 26 11:34:46 CEST 2009 - meissner@suse.de diff --git a/libgphoto2.spec b/libgphoto2.spec index 060682c..5d734e4 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -30,8 +30,8 @@ Obsoletes: libgphoto2-64bit License: LGPL v2.1 or later Group: Hardware/Camera Summary: A Digital Camera Library -Version: 2.4.7.1 -Release: 1 +Version: 2.4.7.3 +Release: 2 Source0: libgphoto2-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} From 16d83651057a491d1eafe7ed3527a85d1694f5b5b3551a0c197bd362a4b60a64 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 9 Jan 2010 12:20:48 +0000 Subject: [PATCH 5/7] Accepting request 28085 from home:jengelh:branches:graphics Copy from home:jengelh:branches:graphics/libgphoto2 via accept of submit request 28085 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/28085 OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=18 --- libgphoto2.changes | 5 +++++ libgphoto2.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/libgphoto2.changes b/libgphoto2.changes index 6781d6f..eeaeb0c 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 22 19:03:10 CET 2009 - jengelh@medozas.de + +- package baselibs.conf + ------------------------------------------------------------------- Sat Nov 21 19:42:05 CET 2009 - meissner@novell.com diff --git a/libgphoto2.spec b/libgphoto2.spec index 5d734e4..5dc7456 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -33,6 +33,7 @@ Summary: A Digital Camera Library Version: 2.4.7.3 Release: 2 Source0: libgphoto2-%{version}.tar.bz2 +Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} From b70a4cd5b2e634613f6cbc96a4df86aa7681844b2a6d60f4a9663ac3cc332006 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 25 Jan 2010 10:33:12 +0000 Subject: [PATCH 6/7] Accepting request 30376 from home:msmeissn:branches:graphics Copy from home:msmeissn:branches:graphics/libgphoto2 via accept of submit request 30376 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/30376 OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=19 --- libgphoto2-2.4.7.3.tar.bz2 | 3 -- libgphoto2-2.4.8.tar.bz2 | 3 ++ libgphoto2.changes | 10 +++++ libgphoto2.spec | 90 ++------------------------------------ 4 files changed, 16 insertions(+), 90 deletions(-) delete mode 100644 libgphoto2-2.4.7.3.tar.bz2 create mode 100644 libgphoto2-2.4.8.tar.bz2 diff --git a/libgphoto2-2.4.7.3.tar.bz2 b/libgphoto2-2.4.7.3.tar.bz2 deleted file mode 100644 index d3efd2d..0000000 --- a/libgphoto2-2.4.7.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3a4db58d8ca5b79f5d787fae812f6b2ebe41d482911351c99f1b70f30388ff5 -size 5351024 diff --git a/libgphoto2-2.4.8.tar.bz2 b/libgphoto2-2.4.8.tar.bz2 new file mode 100644 index 0000000..b39da2e --- /dev/null +++ b/libgphoto2-2.4.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69d7e0723b40e8a0c4fa897b96f6aecb5ae5548c3cce98c48e37b70623d9ffc3 +size 5371128 diff --git a/libgphoto2.changes b/libgphoto2.changes index eeaeb0c..513d680 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jan 25 11:21:22 CET 2010 - meissner@suse.de + +- updated to version 2.4.8 + - Lots of improvements to EOS and Nikon capture support + - fuji s5 pro capture support + - several new ids + - stability fixes + - translation updates + ------------------------------------------------------------------- Tue Dec 22 19:03:10 CET 2009 - jengelh@medozas.de diff --git a/libgphoto2.spec b/libgphoto2.spec index 5dc7456..2bf9484 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -30,7 +30,7 @@ Obsoletes: libgphoto2-64bit License: LGPL v2.1 or later Group: Hardware/Camera Summary: A Digital Camera Library -Version: 2.4.7.3 +Version: 2.4.8 Release: 2 Source0: libgphoto2-%{version}.tar.bz2 Source1: baselibs.conf @@ -50,56 +50,14 @@ and capturing images from a range of supported digital cameras to your local hard drive. It does not support digital cameras based on the USB storage protocol. Those can be mounted by Linux directly. -As of this time, gPhoto supports around 500 cameras, listed on: +As of this time, gPhoto supports around 1200 cameras, listed on: -http://gphoto.sourceforge.net/proj/libgphoto2/support.php +http://gphoto.org/proj/libgphoto2/support.php or by running gphoto2 --list-cameras - - -Authors: --------- - Scott Fritzinger - Lutz Müller - - Eugene Crosser - Matt Martin - Gary Ross - M. Adam Kendall - Del Simmons - Bob Paauwe - Cliff Wright - Phill Hugo - Beat Christen - Warren Baird - Brent D. Metz - Brian Hirt - Mandrake - Randy D. Scott - Paul S. Jenner - Tuomas Kuosmanen - Ole Aamot - Mariusz Zynel - Johannes Erdfelt - Werner Almesberger - Ole W. Saastad - Veros Kaplan - Wolfgang Reissnegger - Philippe Marzouk - Edouard Lafargue - Bart van Leeuwen - M. Adam Kendall - Mark Davies - Beat Christen - Gus Hartmann - Raymond Penners - Marcus Meissner - Hans Ulrich Niedermann - Colin Marquardt - %description devel gPhoto (GNU Photo) is a set of libraries for previewing, retrieving, and capturing images from a range of supported digital cameras to your @@ -107,48 +65,6 @@ local hard drive. These are its development libraries and headers. - - -Authors: --------- - Scott Fritzinger - Lutz Müller - - Eugene Crosser - Matt Martin - Gary Ross - M. Adam Kendall - Del Simmons - Bob Paauwe - Cliff Wright - Phill Hugo - Beat Christen - Warren Baird - Brent D. Metz - Brian Hirt - Mandrake - Randy D. Scott - Paul S. Jenner - Tuomas Kuosmanen - Ole Aamot - Mariusz Zynel - Johannes Erdfelt - Werner Almesberger - Ole W. Saastad - Veros Kaplan - Wolfgang Reissnegger - Philippe Marzouk - Edouard Lafargue - Bart van Leeuwen - M. Adam Kendall - Mark Davies - Beat Christen - Gus Hartmann - Raymond Penners - Marcus Meissner - Hans Ulrich Niedermann - Colin Marquardt - %lang_package %prep %setup -q From 5d9a49970c764b6120cdcbc08a9d802920890921bd5a50c99348476ed700e9b6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 27 Jan 2010 16:36:52 +0000 Subject: [PATCH 7/7] checked in (request 30378) OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=20 --- libgphoto2.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libgphoto2.spec b/libgphoto2.spec index 2bf9484..144d765 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -1,7 +1,7 @@ # -# spec file for package libgphoto2 (Version 2.4.7.1) +# spec file for package libgphoto2 (Version 2.4.8) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -27,19 +27,19 @@ Obsoletes: libgphoto2-64bit %endif # %define prefix /usr -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: Hardware/Camera Summary: A Digital Camera Library Version: 2.4.8 -Release: 2 +Release: 1 Source0: libgphoto2-%{version}.tar.bz2 -Source1: baselibs.conf +Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} %package devel Summary: Development headers for libgphoto2 -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: Hardware/Camera Requires: libgphoto2 = %version libusb-devel Requires: libexif-devel