Merge branch 'f12' into f13

cups.init

@@ -74,11 +74,13 @@ start () {
 	echo
 	[ $RETVAL = 0 ] && touch $lockfile
 
-	udevadm trigger --subsystem-match=usb	\
-		--attr-match=bInterfaceClass=07	\
-		--attr-match=bInterfaceSubClass=01 &>/dev/null || :
-        udevadm trigger --subsystem-match=usb \
-		--property-match=DEVNAME="/dev/usb/lp*" &>/dev/null || :
+	udevadm trigger --subsystem-match=usb		\
+		--attr-match=bInterfaceClass=07		\
+		--attr-match=bInterfaceSubClass=01	\
+		--action=add &>/dev/null || :
+        udevadm trigger --subsystem-match=usb		\
+		--property-match=DEVNAME="/dev/usb/lp*" \
+		--action=add &>/dev/null || :
 
 	return 0
 }

cups.spec

@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -571,6 +571,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Aug 13 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-8
+- Specify udevadm trigger action in initscript (bug #623959).
+
 * Tue Aug  3 2010 Tim Waugh <twaugh@redhat.com>
 - Merged F-12 change:
   - Use numeric addresses for interfaces unless HostNameLookups are