[udev] use %{_sbindir} now that everything is in /usr
Kay Sievers
kay at fedoraproject.org
Wed Jan 25 18:44:57 UTC 2012
commit e0bc75be11e9b7ab64d883c517d8906d15cb5a74
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Wed Jan 25 19:36:33 2012 +0100
use %{_sbindir} now that everything is in /usr
udev.spec | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/udev.spec b/udev.spec
index 826ea6c..382ee15 100644
--- a/udev.spec
+++ b/udev.spec
@@ -1,7 +1,7 @@
Summary: A rule-based device node and kernel event manager
Name: udev
Version: 179
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.xz
@@ -87,16 +87,16 @@ glib-based applications using libudev functionality.
%setup -q
%build
-# prevent man pages from re-building (xmlto)
+# prevent man pages from re-building (xsltproc)
find . -name "*.[1-8]" -exec touch '{}' \;
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now"
export V=1
%configure \
- --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --libexecdir=%{_prefix}/lib \
- --with-selinux \
- --with-systemdsystemunitdir=%{_prefix}/lib/systemd/system
+ --prefix=%{_prefix} \
+ --sysconfdir=%{_sysconfdir} \
+ --libexecdir=%{_prefix}/lib \
+ --with-selinux \
+ --with-systemdsystemunitdir=%{_prefix}/lib/systemd/system
make %{?_smp_mflags}
%install
@@ -105,8 +105,8 @@ rm -fr $RPM_BUILD_ROOT%{_docdir}/udev
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
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%{_prefix}/sbin
-ln -sf ../bin/udevadm $RPM_BUILD_ROOT%{_prefix}/sbin/udevadm
+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%{_prefix}/lib/udev/rules.d
%endif
@@ -116,14 +116,14 @@ getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || :
getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || :
getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || :
getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || :
-/bin/systemctl stop udev.service udev-control.socket udev-kernel.socket >/dev/null 2>&1 || :
+systemctl stop udev.service udev-control.socket udev-kernel.socket >/dev/null 2>&1 || :
%post
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-/bin/systemctl start udev.service >/dev/null 2>&1 || :
+systemctl daemon-reload >/dev/null 2>&1 || :
+systemctl start udev.service >/dev/null 2>&1 || :
%postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+systemctl daemon-reload >/dev/null 2>&1 || :
%post -n libudev -p /sbin/ldconfig
%postun -n libudev -p /sbin/ldconfig
@@ -134,7 +134,7 @@ getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || :
%files
%doc NEWS COPYING README TODO ChangeLog src/extras/keymap/README.keymap.txt
%{_bindir}/udevadm
-%{_prefix}/sbin/udevadm
+%{_sbindir}/udevadm
%{_prefix}/lib/udev
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
%attr(0755,root,root) %dir %{_sysconfdir}/udev/
@@ -177,6 +177,9 @@ getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || :
%attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
%changelog
+* Wed Jan 25 2012 Kay Sievers <kay at redhat.com> 179-3
+- use %{_sbindir}
+
* Wed Jan 25 2012 Kay Sievers <kay at redhat.com> 179-2
- install everything in /usr
https://fedoraproject.org/wiki/Features/UsrMove
More information about the scm-commits
mailing list