rpms/bluez-utils/devel bluez-utils.spec,1.82,1.83

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/bluez-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18574

Modified Files:
	bluez-utils.spec 
Log Message:
* Thu Oct 25 2007 Joe Orton <jorton at redhat.com> 3.20-4
- more scriptlet fixes; only condrestart in post on upgrade,
  ignore failures



Index: bluez-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- bluez-utils.spec	25 Oct 2007 12:59:03 -0000	1.82
+++ bluez-utils.spec	25 Oct 2007 13:29:29 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 3.20
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -105,22 +105,22 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --del hidd >/dev/null 2>&1 || true
+/sbin/chkconfig --del hidd >/dev/null 2>&1 || :
 
 /sbin/chkconfig --add bluetooth
 /sbin/chkconfig --add dund
 /sbin/chkconfig --add pand
-if [ "$1" = "1" ]; then
-	/sbin/service bluetooth condrestart >/dev/null 2>&1
-	/sbin/service dund condrestart >/dev/null 2>&1
-	/sbin/service pand condrestart >/dev/null 2>&1
+if [ "$1" = "2" ]; then
+	/sbin/service bluetooth condrestart >/dev/null 2>&1 || :
+	/sbin/service dund condrestart >/dev/null 2>&1 || :
+	/sbin/service pand condrestart >/dev/null 2>&1 || :
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-	/sbin/service bluetooth stop >/dev/null 2>&1
-	/sbin/service dund stop >/dev/null 2>&1
-	/sbin/service pand stop >/dev/null 2>&1
+	/sbin/service bluetooth stop >/dev/null 2>&1 || :
+	/sbin/service dund stop >/dev/null 2>&1 || :
+	/sbin/service pand stop >/dev/null 2>&1 || :
 	/sbin/chkconfig --del bluetooth
 	/sbin/chkconfig --del dund
 	/sbin/chkconfig --del pand
@@ -155,6 +155,10 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Thu Oct 25 2007 Joe Orton <jorton at redhat.com> 3.20-4
+- more scriptlet fixes; only condrestart in post on upgrade,
+  ignore failures
+
 * Thu Oct 25 2007 Joe Orton <jorton at redhat.com> 3.20-3
 - fix %%post failures (#351981)
 - use Requires(preun,post) not Prereq