[udev] - version 167

[Harald Hoyer]

commit a8dfb502d8fa50964e6a4d38d8a755e2ad8f0f17
Author: Harald Hoyer <harald at redhat.com>
Date:   Wed Mar 30 16:50:28 2011 +0200

    - version 167

 .gitignore                                         |    1 +
 sources                                            |    3 +-
 udev-160.tar.bz2.sign                              |    8 -
 udev-164-no-v4l1.patch                             |   42 ---
 ...-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch |   25 --
 ...-98ab6a377285d5943563cfa397e8b350e43878ec.patch |  345 --------------------
 udev-retry.init                                    |   67 ----
 udev.spec                                          |   28 +-
 upstream                                           |    1 -
 upstream-key.gpg                                   |   54 ---
 10 files changed, 11 insertions(+), 563 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff4586d..80bcd9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ udev-160.tar.bz2
 /udev-164.tar.bz2.sign
 /udev-166.tar.bz2
 /udev-166.tar.bz2.sign
+/udev-167.tar.bz2
diff --git a/sources b/sources
index 871f305..db4315b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-4db27d73fdbe94f47fd89fdd105c2dfb  udev-166.tar.bz2
-3cb37564a589d4fedd6e7e3e178698d4  udev-166.tar.bz2.sign
+4b37e1222f06c14c24147de346aa0bad  udev-167.tar.bz2
diff --git a/udev.spec b/udev.spec
index 105de70..35c5349 100644
--- a/udev.spec
+++ b/udev.spec
@@ -6,8 +6,8 @@
 
 Summary: A rule-based device node and kernel event manager
 Name: udev
-Version: 166
-Release: 2%{?dist}
+Version: 167
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -15,12 +15,6 @@ Obsoletes: udev-persistent < 0:030-5
 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
 
 Source1: start_udev
-Source2: udev-retry.init
-
-Patch6: udev-164-no-v4l1.patch
-Patch7: udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch
-Patch8: udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch
-
 
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
@@ -118,9 +112,6 @@ glib-based applications using libudev functionality.
 
 %prep 
 %setup -q 
-%patch6 -p1 
-%patch7 -p1 
-%patch8 -p1 
 
 %build
 export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now"
@@ -180,7 +171,6 @@ install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev
 mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir}
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
-install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-retry
 
 %preun
 if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then
@@ -243,7 +233,6 @@ if test -f /proc/1/exe -a -d /proc/1/root; then
                 /sbin/udevadm control --start-exec-queue || :
         fi
 fi
-/sbin/chkconfig --add udev-retry
 
 exit 0
 
@@ -275,13 +264,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{udev_scriptdir}/write_cd_rules
 %attr(0755,root,root) %{udev_scriptdir}/write_net_rules
 %attr(0755,root,root) %{udev_scriptdir}/collect
-%attr(0755,root,root) %{udev_scriptdir}/fstab_import
 %attr(0755,root,root) %{udev_scriptdir}/input_id
 %attr(0755,root,root) %{udev_scriptdir}/keyboard-force-release.sh
 %attr(0755,root,root) %{udev_scriptdir}/mtd_probe
 
 %attr(0755,root,root) %dir %{udev_scriptdir}/rules.d/
-%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-retry
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/
 %attr(0755,root,root) %dir %{udev_scriptdir}/
@@ -318,13 +305,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/udev.pc
 
 %attr(0755,root,root) /sbin/start_udev
-%attr(0644,root,root) %{systemdsystemunitdir}/udev-retry.service
 %attr(0644,root,root) %{systemdsystemunitdir}/udev-settle.service
+%attr(0644,root,root) %{systemdsystemunitdir}/udev-trigger.service
 %attr(0644,root,root) %{systemdsystemunitdir}/udev.service
-%{systemdsystemunitdir}/basic.target.wants/udev-retry.service
-%{systemdsystemunitdir}/basic.target.wants/udev-settle.service
+%attr(0644,root,root) %{systemdsystemunitdir}/udev.socket
 %{systemdsystemunitdir}/basic.target.wants/udev.service
-
+%{systemdsystemunitdir}/basic.target.wants/udev-trigger.service
+%{systemdsystemunitdir}/sockets.target.wants/udev.socket
 
 # Deprecated, but keep the ownership
 %ghost %dir /var/lib/udev
@@ -365,6 +352,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Wed Mar 30 2011 Harald Hoyer <harald at redhat.com> 167-1
+- version 167
+
 * Wed Mar 23 2011 Harald Hoyer <harald at redhat.com> 166-2
 - add ACLs for harmony remote controls
 Resolves: rhbz#559412