[udev] install everything in /usr

[Kay Sievers]

commit 90bdfa8bcd577423f731f8a96ce3c334a7a0610f
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Sun Jan 29 18:36:10 2012 +0100

    install everything in /usr

 udev.spec |   47 +++++++++++++++++++++++++++--------------------
 1 files changed, 27 insertions(+), 20 deletions(-)
---
diff --git a/udev.spec b/udev.spec
index 06d97fa..82c072b 100644
--- a/udev.spec
+++ b/udev.spec
@@ -1,7 +1,7 @@
 Summary:        A rule-based device node and kernel event manager
 Name:           udev
 Version:        180
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Base
 Source:         ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.xz
@@ -25,6 +25,7 @@ Requires:       systemd-units
 Requires:       util-linux >= 2.15.1
 Conflicts:      systemd < 39
 Conflicts:      dracut < 013-93
+Conflicts:      filesystem < 3
 
 %ifarch s390 s390x
 # Require s390utils-base, because it's essential on s390
@@ -42,6 +43,7 @@ removed from the system.
 Summary:        Dynamic library to access udev device information
 Group:          System Environment/Libraries
 Requires:       udev = %{version}-%{release}
+Conflicts:      filesystem < 3
 License:        LGPLv2+
 
 %description -n libudev
@@ -63,6 +65,7 @@ dynamic library, which provides access to udev device information.
 Summary:        Libraries for adding libudev support to applications that use glib
 Group:          Development/Libraries
 Requires:       libudev = %{version}-%{release}
+Conflicts:      filesystem < 3
 License:        LGPLv2+
 
 %description -n libgudev1
@@ -89,23 +92,22 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now"
 export V=1
 %configure \
  --prefix=%{_prefix} \
- --with-rootprefix= \
  --sysconfdir=%{_sysconfdir} \
- --libexecdir=/lib \
- --bindir=/sbin \
- --with-rootlibdir=/%{_lib} \
+ --libexecdir=%{_prefix}/lib \
  --with-selinux \
- --with-systemdsystemunitdir=/lib/systemd/system
+ --with-systemdsystemunitdir=%{_prefix}/lib/systemd/system
 make %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -fr $RPM_BUILD_ROOT%{_docdir}/udev
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware
-mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware/updates
+mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firmware
+mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firmware/updates
+mkdir -p -m 0755 $RPM_BUILD_ROOT%{_sbindir}
+ln -sf ../bin/udevadm $RPM_BUILD_ROOT%{_sbindir}/udevadm
 %ifarch s390 s390x
-install -m 0644 rules/arch/40-s390.rules $RPM_BUILD_ROOT/lib/udev/rules.d
+install -m 0644 rules/arch/40-s390.rules $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d
 %endif
 
 %pre
@@ -130,24 +132,25 @@ systemctl daemon-reload >/dev/null 2>&1 || :
 
 %files
 %doc NEWS COPYING README TODO ChangeLog  src/extras/keymap/README.keymap.txt
-/lib/udev
-/sbin/udevadm
+%{_bindir}/udevadm
+%{_sbindir}/udevadm
+%{_prefix}/lib/udev
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/
 %attr(0644,root,root) %{_mandir}/man7/*.7*
 %attr(0644,root,root) %{_mandir}/man8/*.8*
 %{_datadir}/pkgconfig/udev.pc
-%dir %attr(0755,root,root) /lib/firmware
-%dir %attr(0755,root,root) /lib/firmware/updates
-%attr(0644,root,root) /lib/systemd/system/*.service
-%attr(0644,root,root) /lib/systemd/system/*.socket
-/lib/systemd/system/basic.target.wants/*.service
-/lib/systemd/system/sockets.target.wants/*.socket
+%dir %attr(0755,root,root) %{_prefix}/lib/firmware
+%dir %attr(0755,root,root) %{_prefix}/lib/firmware/updates
+%attr(0644,root,root) %{_prefix}/lib/systemd/system/*.service
+%attr(0644,root,root) %{_prefix}/lib/systemd/system/*.socket
+%{_prefix}/lib/systemd/system/basic.target.wants/*.service
+%{_prefix}/lib/systemd/system/sockets.target.wants/*.socket
 
 %files -n libudev
 %doc src/COPYING
-%attr(0755,root,root) /%{_lib}/libudev.so.*
+%attr(0755,root,root) %{_libdir}/libudev.so.*
 
 %files -n libudev-devel
 %doc src/docs/html/*
@@ -158,7 +161,7 @@ systemctl daemon-reload >/dev/null 2>&1 || :
 
 %files -n libgudev1
 %doc src/extras/gudev/COPYING
-%attr(0755,root,root) /%{_lib}/libgudev-1.0.so.*
+%attr(0755,root,root) %{_libdir}/libgudev-1.0.so.*
 %attr(0644,root,root) %{_libdir}/girepository-1.0/GUdev-1.0.typelib
 
 %files -n libgudev1-devel
@@ -173,7 +176,11 @@ systemctl daemon-reload >/dev/null 2>&1 || :
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
-* Wed Jan 25 2012 Kay Sievers <kay at redhat.com> 180-1
+* Sun Jan 29 2012 Kay Sievers <kay at redhat.com> 180-2
+  - install everything in /usr
+  https://fedoraproject.org/wiki/Features/UsrMove
+
+* Sun Jan 29 2012 Kay Sievers <kay at redhat.com> 180-1
 - version 180
   - fix rule execution (brc#785148)
   - ID_PART_* export for udisks2