summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarnd@arndb.de <arnd@arndb.de>2004-05-20 19:14:09 -0700
committerGreg KH <gregkh@suse.de>2005-04-26 21:35:47 -0700
commit3c60abb55ad438857248c4e5c5ba8acde887ba26 (patch)
tree9bb985d2caacc7e6bcd86e5716ee815d98d48692
parentc33359307b4a337d6c4f2f4fbe4451544fa5cc1f (diff)
downloadsystemd-3c60abb55ad438857248c4e5c5ba8acde887ba26.tar.gz
[PATCH] udev rpm fix
Some file locations have changed since the spec file was last updated. Also a failed build might leave behind a stale buildroot directory. This patch should fix both problems.
-rw-r--r--udev.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/udev.spec b/udev.spec
index 79b6952415..e53b3598fc 100644
--- a/udev.spec
+++ b/udev.spec
@@ -72,6 +72,7 @@ make CC="gcc $RPM_OPT_FLAGS" \
"
%install
+rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install \
EXTRAS=" \
%if %{scsi_id}
@@ -107,11 +108,16 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %dir /udev/
%attr(755,root,root) %dir /etc/udev/
%config(noreplace) %attr(0644,root,root) /etc/udev/udev.conf
-%config(noreplace) %attr(0644,root,root) /etc/udev/udev.rules
-%config(noreplace) %attr(0644,root,root) /etc/udev/udev.permissions
+%attr(755,root,root) %dir /etc/udev/rules.d/
+%attr(755,root,root) %dir /etc/udev/permissions.d/
+%config(noreplace) %attr(0644,root,root) /etc/udev/rules.d/50-udev.rules
+%config(noreplace) %attr(0644,root,root) /etc/udev/permissions.d/50-udev.permissions
%attr(-,root,root) /etc/hotplug.d/default/udev.hotplug
%attr(755,root,root) /etc/init.d/udev
%attr(0644,root,root) %{_mandir}/man8/udev*.8*
+%attr(755,root,root) %dir /etc/dev.d/
+%attr(755,root,root) %dir /etc/dev.d/net/
+%attr(0755,root,root) /etc/dev.d/net/hotplug.dev
%if %{scsi_id}
%attr(755,root,root) /sbin/scsi_id