SPECS: hotplug.spec - fix gphoto dir for lib64, rel 5

[glen]

Author: glen                         Date: Tue Feb 28 17:56:12 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix gphoto dir for lib64, rel 5

---- Files affected:
SPECS:
   hotplug.spec (1.61 -> 1.62) 

---- Diffs:

================================================================
Index: SPECS/hotplug.spec
diff -u SPECS/hotplug.spec:1.61 SPECS/hotplug.spec:1.62
--- SPECS/hotplug.spec:1.61	Tue Feb 28 00:41:22 2006
+++ SPECS/hotplug.spec	Tue Feb 28 18:56:06 2006
@@ -5,7 +5,7 @@
 Summary(pl):	Linuksowe skrypty do urządzeń hotplug
 Name:		hotplug
 Version:	2004_09_23
-Release:	4
+Release:	5
 License:	GPL
 Group:		Applications/System
 Source0:	ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
@@ -34,8 +34,9 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_exec_prefix	/
-%define		_libdir		/%{_lib}
-%define		_sbindir	/sbin
+%define		_libdir			/%{_lib}
+%define		_sbindir		/sbin
+%define		_gphoto_lib		/usr/%{_lib}/libgphoto2
 
 %description
 This package contains the scripts necessary for hotplug Linux support.
@@ -97,8 +98,9 @@
 Summary:	Hotplug definitions for USB digital cameras
 Summary(pl):	Definicje Hotpluga dla aparatów cyfrowych na USB
 Group:		Applications/System
+Requires(post):	grep
 Requires(post,postun):	fileutils
-Requires(post,postun):	grep
+Requires(post,postun):	sed >= 4.0
 Requires(postun):	/usr/sbin/groupdel
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
@@ -160,26 +162,20 @@
 %post digicam
 if [ "$1" = "1" ]; then
 	usermap="%{_sysconfdir}/hotplug/usb.usermap"
-	tmpusermap="${usermap}.tmp"
-	umask 022
 	if [ -f "$usermap" ]; then
-		grep -v "digicam" $usermap > $tmpusermap
-		mv -f $tmpusermap $usermap
-# FIXME: lib64!
-		/usr/lib/libgphoto2/print-usb-usermap digicam | grep -v '#' >> $usermap
+		%{__sed} -i -e '/digicam/d' $usermap
+		%{_gphoto_lib}/print-usb-usermap digicam | grep -v '#' >> "$usermap"
 	else
-		/usr/lib/libgphoto2/print-usb-usermap digicam | grep -v '#' >> $usermap
+		umask 022
+		%{_gphoto_lib}/print-usb-usermap digicam | grep -v '#' > "$usermap"
 	fi
 fi
 
 %postun digicam
 if [ "$1" = "0" ]; then
 	usermap="%{_sysconfdir}/hotplug/usb.usermap"
-	tmpusermap="${usermap}.tmp"
-	umask 022
 	if [ -f "$usermap" ]; then
-		grep -v "digicam" $usermap > $tmpusermap
-		mv -f $tmpusermap $usermap
+		%{__sed} -i -e '/digicam/d' "$usermap"
 	fi
 	%groupremove digicam
 fi
@@ -233,6 +229,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2006/02/28 17:56:06  glen
+- fix gphoto dir for lib64, rel 5
+
 Revision 1.61  2006/02/27 23:41:22  glen
 - 64 bit arch broken for -digicam
 
@@ -302,7 +301,7 @@
 Revision 1.42  2004/08/07 21:46:39  roman
 - added a patch adapting hotplug to PLD readlink
 - won't build yet, 'cause hotplug-digicam is missing from the CVS; when
-found, please rebuild to make package usable
+  found, please rebuild to make package usable
 - release++
 
 Revision 1.41  2004/08/06 18:06:05  qboosh
@@ -423,17 +422,17 @@
   Group field using gettext).
 
 Revision 1.6  2002/01/18 02:13:17  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.5  2001/11/04 02:18:21  blues
 - pl tanslation added + some cosmetics
-NOTE: there is new version avaible
+  NOTE: there is new version avaible
 
 Revision 1.4  2001/07/26 05:42:08  saq
 - reverting last change: removing new macros from %p{re,ost}{,un}
 
 Revision 1.2  2001/04/25 11:04:29  wiget
-rewrite in PLD style
+- rewrite in PLD style
 
 * Tue Apr 24 2001 Greg Kroah-Hartman <greg at kroah.com>
 - added the hotplug.8 manpage written by Fumitoshi UKAI <ukai at debian.or.jp>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hotplug.spec?r1=1.61&r2=1.62&f=u