SPECS (AC-branch): libgphoto2.spec - merged from HEAD: update to 2...

[glen]

Author: glen                         Date: Mon Jan 22 21:36:21 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD: update to 2.3.1

---- Files affected:
SPECS:
   libgphoto2.spec (1.58 -> 1.58.2.1) 

---- Diffs:

================================================================
Index: SPECS/libgphoto2.spec
diff -u SPECS/libgphoto2.spec:1.58 SPECS/libgphoto2.spec:1.58.2.1
--- SPECS/libgphoto2.spec:1.58	Mon Dec 18 12:06:18 2006
+++ SPECS/libgphoto2.spec	Mon Jan 22 22:36:15 2007
@@ -11,24 +11,25 @@
 Summary(pl):	Biblioteki obsługi kamer cyfrowych
 Summary(pt_BR):	GNU Photo - programa GNU para câmeras digitais
 Name:		libgphoto2
-Version:	2.3.0
-Release:	2
+Version:	2.3.1
+Release:	3
 License:	LGPL
 Group:		Applications
-Source0:	http://dl.sourceforge.net/gphoto/%{name}-%{version}.tar.gz
-# Source0-md5:	93c0369020fa4c8fe904cd195e74b319
+Source0:	http://dl.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
+# Source0-md5:	37f85e34e5b6031ddf6cac8b8782ac4f
 Patch0:		%{name}-pmake.patch
-Patch1:		%{name}-print_dev_rules.patch
-Patch2:		%{name}-pl.po-update.patch
 URL:		http://www.gphoto.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
+BuildRequires:	mDNSResponder-devel
+BuildRequires:	dbus-devel >= 0.31
 BuildRequires:	gettext-devel >= 0.14.1
 %{?with_apidocs:BuildRequires:	gtk-doc >= 0.10}
+BuildRequires:	hal-devel >= 0.5.0
 BuildRequires:	libexif-devel >= 1:0.6.13
 BuildRequires:	libltdl-devel
 BuildRequires:	libtool >= 1:1.4.2-9
-BuildRequires:	libusb-devel
+BuildRequires:	libusb-devel >= 0.1.5
 %{?with_baudboy:BuildRequires:	lockdev-baudboy-devel}
 %{!?with_baudboy:BuildRequires:	lockdev-devel >= 1.0.2}
 BuildRequires:	pkgconfig
@@ -122,11 +123,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-rm -f libgphoto2_port/po/stamp-po
-rm -f po/stamp-po
 
 %build
 # supplied libtool is broken (relink)
@@ -157,6 +153,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgconfigdir=%{_pkgconfigdir} \
+	udevscriptdir=%{_libdir}/libgphoto2 \
 	%{?with_apidocs:apidocdir=%{_gtkdocdir}}
 
 %find_lang %{name} --all-name
@@ -254,8 +251,7 @@
 %{_libdir}/libgphoto2_port/*/usb.la
 
 # utilities
-%attr(755,root,root) %{_libdir}/libgphoto2/print-udev-rules
-%attr(755,root,root) %{_libdir}/libgphoto2/print-usb-usermap
+%attr(755,root,root) %{_libdir}/libgphoto2/check-ptp-camera
 %attr(755,root,root) %{_libdir}/libgphoto2/print-camera-list
 
 %dir %{_datadir}/libgphoto2
@@ -293,6 +289,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58.2.1  2007/01/22 21:36:15  glen
+- merged from HEAD: update to 2.3.1
+
 Revision 1.58  2006/12/18 11:06:18  qboosh
 - updated libexif deps (>= 0.6.13), release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libgphoto2.spec?r1=1.58&r2=1.58.2.1&f=u