SPECS: hotplug.spec - updated -digicam for libgphoto2 2.3.1+ and /...

[qboosh]

Author: qboosh                       Date: Thu Nov 29 21:29:28 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated -digicam for libgphoto2 2.3.1+ and /etc/hotplug/addons.d dir
- dropped unused /lib/hotplug

---- Files affected:
SPECS:
   hotplug.spec (1.71 -> 1.72) 

---- Diffs:

================================================================
Index: SPECS/hotplug.spec
diff -u SPECS/hotplug.spec:1.71 SPECS/hotplug.spec:1.72
--- SPECS/hotplug.spec:1.71	Thu Nov 29 22:14:43 2007
+++ SPECS/hotplug.spec	Thu Nov 29 22:29:22 2007
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# TODO
-# - define _libdir as /lib for all arch?
 Summary:	Linux Hotplug Scripts
 Summary(pl.UTF-8):	Linuksowe skrypty do urządzeń hotplug
 Name:		hotplug
@@ -29,14 +27,13 @@
 # Requires wc
 Requires:	textutils
 Requires:	usbutils
-# it is _not_ noarch as it contains %{_libdir}/hotplug directory
+# it is _not_ noarch as -digicam uses /usr/%{_lib}/libgphoto2 directory
 #BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_exec_prefix	/
-%define		_libdir			/%{_lib}
-%define		_sbindir		/sbin
-%define		_gphoto_lib		/usr/%{_lib}/libgphoto2
+%define		_sbindir	/sbin
+%define		_gphoto_lib	/usr/%{_lib}/libgphoto2
 
 %description
 This package contains the scripts necessary for hotplug Linux support.
@@ -105,7 +102,7 @@
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires:	%{name} = %{version}-%{release}
-Requires:	libgphoto2
+Requires:	libgphoto2 >= 2.3.1
 Requires:	util-linux
 Provides:	group(digicam)
 Obsoletes:	udev-digicam
@@ -127,19 +124,20 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_sbindir},%{_sysconfdir}/hotplug,/etc/rc.d/init.d,%{_mandir}/man8}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/hotplug/addons.d/digicam,/etc/rc.d/init.d,%{_mandir}/man8}
 
 %{__make} install \
 	prefix=$RPM_BUILD_ROOT
 
-install etc/hotplug/{dasd.permissions,pnp.distmap,tape.permissions} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/
+install etc/hotplug/{dasd.permissions,pnp.distmap,tape.permissions} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sbindir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man8
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/hotplug
-ln -s %{_sysconfdir}/hotplug.d $RPM_BUILD_ROOT%{_libdir}/%{name}
 install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/digicam
 
+:> $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/addons.d/digicam/usb.usermap
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -161,31 +159,29 @@
 
 %post digicam
 if [ "$1" = "1" ]; then
-	usermap="%{_sysconfdir}/hotplug/usb.usermap"
-	if [ -f "$usermap" ]; then
-		%{__sed} -i -e '/digicam/d' $usermap
-		%{_gphoto_lib}/print-usb-usermap digicam | grep -v '#' >> "$usermap"
-	else
-		umask 022
-		%{_gphoto_lib}/print-usb-usermap digicam | grep -v '#' > "$usermap"
-	fi
+	usermap="%{_sysconfdir}/hotplug/addons.d/digicam/usb.usermap"
+	%{_gphoto_lib}/print-camera-list usb-usermap > "$usermap"
+	/sbin/hotplug-update-usb.usermap >/dev/null
 fi
 
 %postun digicam
 if [ "$1" = "0" ]; then
-	usermap="%{_sysconfdir}/hotplug/usb.usermap"
+	usermap="%{_sysconfdir}/hotplug/addons.d/digicam/usb.usermap"
 	if [ -f "$usermap" ]; then
-		%{__sed} -i -e '/digicam/d' "$usermap"
+		rm -f "$usermap"
 	fi
+	/sbin/hotplug-update-usb.usermap >/dev/null
 	%groupremove digicam
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc README ChangeLog
-%attr(755,root,root) %{_sbindir}/*
-%attr(754,root,root) /etc/rc.d/init.d/*
+%attr(755,root,root) %{_sbindir}/hotplug
+%attr(755,root,root) %{_sbindir}/hotplug-update-usb.usermap
+%attr(754,root,root) /etc/rc.d/init.d/hotplug
 %dir %{_sysconfdir}/hotplug
+%dir %{_sysconfdir}/hotplug/addons.d
 %exclude %{_sysconfdir}/hotplug/pci.*
 %exclude %{_sysconfdir}/hotplug/input.*
 %exclude %{_sysconfdir}/hotplug/pnp.*
@@ -200,7 +196,6 @@
 %dir %{_sysconfdir}/hotplug.d
 %dir %{_sysconfdir}/hotplug.d/default
 %attr(755,root,root) %{_sysconfdir}/hotplug.d/default/*.hotplug
-%{_libdir}/hotplug
 %{_mandir}/man8/*.8*
 %dir /var/run/usb
 %dir /var/log/hotplug
@@ -221,6 +216,8 @@
 
 %files digicam
 %defattr(644,root,root,755)
+%dir %{_sysconfdir}/hotplug/addons.d/digicam
+%ghost %{_sysconfdir}/hotplug/addons.d/digicam/usb.usermap
 %attr(755,root,root) %{_sysconfdir}/hotplug/usb/digicam
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -229,6 +226,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72  2007-11-29 21:29:22  qboosh
+- updated -digicam for libgphoto2 2.3.1+ and /etc/hotplug/addons.d dir
+- dropped unused /lib/hotplug
+
 Revision 1.71  2007-11-29 21:14:43  qboosh
 - needed for firmware loader when not using udev (i.e. for plain dev support)
 - updated init script (fixed force-reload, added try-restart)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/hotplug.spec?r1=1.71&r2=1.72&f=u