diff --git a/rfkill-default-install-to-PREFIX-sbin.patch b/rfkill-default-install-to-PREFIX-sbin.patch new file mode 100644 index 0000000..af481a1 --- /dev/null +++ b/rfkill-default-install-to-PREFIX-sbin.patch @@ -0,0 +1,40 @@ +From 45605d5063e96d1b3229db8edac6f489bf29a382 Mon Sep 17 00:00:00 2001 +From: John W. Linville +Date: Tue, 29 Sep 2009 13:39:13 -0400 +Subject: [rfkill PATCH] default install to $(PREFIX)/sbin + +The rfkill utility isn't generally useful to normal users, so move it to +/sbin with other system management executables. + +Signed-off-by: John W. Linville +--- + Makefile | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index cda48c4..71a6082 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + MAKEFLAGS += --no-print-directory + + PREFIX ?= /usr +-BINDIR ?= $(PREFIX)/bin ++SBINDIR ?= $(PREFIX)/sbin + MANDIR ?= $(PREFIX)/share/man + + MKDIR ?= mkdir -p +@@ -48,8 +48,8 @@ check: + + install: rfkill rfkill.1.gz + @$(NQ) ' INST rfkill' +- $(Q)$(MKDIR) $(DESTDIR)$(BINDIR) +- $(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(BINDIR) rfkill ++ $(Q)$(MKDIR) $(DESTDIR)$(SBINDIR) ++ $(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(SBINDIR) rfkill + @$(NQ) ' INST rfkill.1' + $(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man1/ + $(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man1/ rfkill.1.gz +-- +1.6.2.5 + diff --git a/rfkill.spec b/rfkill.spec index a85bddb..106f2ae 100644 --- a/rfkill.spec +++ b/rfkill.spec @@ -1,6 +1,6 @@ Name: rfkill Version: 0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A tool for enabling and disabling wireless devices Group: System Environment/Base @@ -9,6 +9,7 @@ URL: http://www.linuxwireless.org/en/users/Documentation/rfkill Source0: http://wireless.kernel.org/download/rfkill/rfkill-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: rfkill-default-install-to-PREFIX-sbin.patch %description rfkill is a simple tool for accessing the Linux rfkill device interface, @@ -17,6 +18,7 @@ WLAN, Bluetooth and mobile broadband. %prep %setup -q +%patch0 -p 1 %build @@ -25,7 +27,7 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=${RPM_BUILD_ROOT} +make install DESTDIR=${RPM_BUILD_ROOT} PREFIX='' MANDIR=%{_mandir} %clean @@ -34,12 +36,15 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%{_bindir}/rfkill +/sbin/rfkill %{_mandir}/man1/* %doc COPYING README %changelog +* Tue Sep 29 2009 John W. Linville 0.3-3 +- Install binary into /sbin to enable use during boot + * Tue Sep 15 2009 John W. Linville 0.3-2 - Change summary and description as suggested by Tomasz Torcz