rpms/gphoto2/devel gphoto2.spec,1.38,1.39

[fedora-cvs-commits at redhat.com]

Author: johnp

Update of /cvs/dist/rpms/gphoto2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20862

Modified Files:
	gphoto2.spec 
Log Message:
- Remove hotplug scripts



Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gphoto2.spec	11 Nov 2005 22:21:51 -0000	1.38
+++ gphoto2.spec	11 Nov 2005 22:35:04 -0000	1.39
@@ -15,8 +15,6 @@
 Patch2: gphoto2-gcc4.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
-# For /etc/hotplug/usb..
-PreReq: hotplug >= 2001_04_24-13
 PreReq: /sbin/ldconfig, grep, fileutils
 Provides: libgphoto2
 Requires: lockdev
@@ -146,7 +144,6 @@
 %defattr(-,root,root)
 %doc AUTHORS README COPYING
 %{_bindir}/gphoto2
-/etc/hotplug/usb/usbcam
 %{_datadir}/libgphoto2
 %dir %{_libdir}/gphoto2_port
 %dir %{_libdir}/gphoto2_port/*
@@ -163,10 +160,6 @@
 
 ####################################
 %post
-# add supported cameras to /etc/hotplug/usb.usermap
-grep -v '^usbcam' /etc/hotplug/usb.usermap > /etc/hotplug/usb.usermap.tmp
-%{_libdir}/libgphoto2/print-usb-usermap >> /etc/hotplug/usb.usermap.tmp
-mv /etc/hotplug/usb.usermap.tmp /etc/hotplug/usb.usermap
 # register libraries
 /sbin/ldconfig
 
@@ -174,11 +167,6 @@
 %postun
 # unregister libraries
 /sbin/ldconfig
-if [ "$1" = 0 ]; then
-    # remove supported cameras from /etc/hotplug/usb.usermap
-    grep -v '^usbcam' /etc/hotplug/usb.usermap > /etc/hotplug/usb.usermap.new
-    mv /etc/hotplug/usb.usermap.new /etc/hotplug/usb.usermap
-fi
 
 ########################################################################
 # file list and installation for -devel subpackage
@@ -203,6 +191,8 @@
 * Fri Nov 11 2005 John (J5) Palmieri <johnp at redhat.com> 2.1.6-4
 - Add gphoto-set-procperm and 90-gphoto-camera-policy.fdi to
   have HAL set permissions on the usb cameras
+- Remove hotplug support since we don't use it anymore (udev takes care
+  of devices and HAL takes care of permissions)
 
 * Mon Nov 07 2005 Radek Vokal <rvokal at redhat.com> 2.1.6-3
 - become self-hosting, don't depend on installed libs (#106442,#172519)