[udev] removed loop devices (should be compiled in the kernel) removed deprecated directories removed scsi_

[Harald Hoyer]

commit c28cf5922cc6d9b2978e28d49509f3a1ba68cf61
Author: Harald Hoyer <harald at redhat.com>
Date:   Wed Jul 20 13:58:40 2011 +0200

    removed loop devices (should be compiled in the kernel)
    removed deprecated directories
    removed scsi_id symlink
    cleanup of requirements

 udev.spec |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/udev.spec b/udev.spec
index 40ba7c7..1bf02ec 100644
--- a/udev.spec
+++ b/udev.spec
@@ -15,8 +15,8 @@ Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.t
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(pre): /bin/sh fileutils /sbin/chkconfig /sbin/service
-Requires(pre): /usr/bin/stat /sbin/pidof
+Requires(pre): /bin/sh fileutils 
+Requires(pre): /usr/bin/stat 
 Requires(pre): /usr/bin/getent /usr/sbin/groupadd
 Requires: hwdata
 Requires: systemd-units
@@ -28,18 +28,18 @@ Conflicts: systemd < 28
 Requires: s390utils-base
 %endif
 
-BuildRequires: sed libselinux-devel >= 0:1.17.9-2 flex libsepol-devel
-BuildRequires: glib2-devel bison findutils 
+BuildRequires: sed libselinux-devel >= 0:1.17.9-2 libsepol-devel
+BuildRequires: glib2-devel findutils 
 BuildRequires: gperf libtool
-BuildRequires: libusb-devel libacl-devel
+BuildRequires: libacl-devel
 BuildRequires: hwdata
 BuildRequires: gobject-introspection-devel >= 0.6.2
 BuildRequires: usbutils >= 0.82
 BuildRequires: libtool >= 2.2.6
 BuildRequires: pkgconfig
 Requires: libselinux >= 0:1.17.9-2 sed 
-Conflicts: kernel < 0:2.6 mkinitrd <= 0:4.1.11-1 initscripts < 7.84
-Requires: util-linux-ng >= 2.15.1
+Conflicts: kernel < 0:2.6 
+Requires: util-linux >= 2.15.1
 Obsoletes: dev <= 0:3.12-1
 Provides: dev = 0:3.12-2
 # hid2hci moved to udev
@@ -141,9 +141,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,devices}
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 
-# force relative symlinks
-ln -sf ..%{udev_scriptdir}/scsi_id $RPM_BUILD_ROOT/sbin/scsi_id
-
 for i in \
 %ifarch ia64
         rules/arch/40-ia64.rules \
@@ -222,8 +219,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS COPYING README TODO ChangeLog  extras/keymap/README.keymap.txt
 %attr(0755,root,root) /sbin/udevadm
 %attr(0755,root,root) /sbin/udevd
-%attr(0755,root,root) /sbin/scsi_id
-%attr(0755,root,root) %{udev_scriptdir}/scsi_id
 %attr(0755,root,root) %{udev_scriptdir}/ata_id
 %attr(0755,root,root) %{udev_scriptdir}/usb_id
 %attr(0755,root,root) %{udev_scriptdir}/cdrom_id
@@ -248,13 +243,12 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
 %attr(0644,root,root) %{udev_scriptdir}/rules.d/*.rules
 
-%ghost %config(noreplace,missingok) %attr(0644,root,root) %{_sysconfdir}/scsi_id.config
-
 %dir %attr(0755,root,root) %{firmwaredir}
 %attr(0644,root,root) %{_mandir}/man8/udev*.8*
 %attr(0644,root,root) %{_mandir}/man7/udev*.7*
 %attr(0644,root,root) %{_mandir}/man8/scsi_id*.8*
 
+%attr(0755,root,root) %{udev_scriptdir}/scsi_id
 %attr(0755,root,root) %{udev_scriptdir}/pci-db
 %attr(0755,root,root) %{udev_scriptdir}/usb-db
 %attr(0755,root,root) %{udev_scriptdir}/keymap
@@ -316,6 +310,8 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Jul 20 2011 Harald Hoyer <harald at redhat.com> 172-2
 - removed loop devices (should be compiled in the kernel)
 - removed deprecated directories
+- removed scsi_id symlink
+- cleanup of requirements
 
 * Mon Jul 11 2011 Harald Hoyer <harald at redhat.com> 172-1
 - version 172