diff --git a/.cvsignore b/.cvsignore index c7bb27f..5458fe3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rfkill-0.3.tar.bz2 +rfkill-0.4.tar.bz2 diff --git a/rfkill-default-install-to-PREFIX-sbin.patch b/rfkill-default-install-to-PREFIX-sbin.patch deleted file mode 100644 index af481a1..0000000 --- a/rfkill-default-install-to-PREFIX-sbin.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 106f2ae..feb36d9 100644 --- a/rfkill.spec +++ b/rfkill.spec @@ -1,6 +1,6 @@ Name: rfkill -Version: 0.3 -Release: 3%{?dist} +Version: 0.4 +Release: 1%{?dist} Summary: A tool for enabling and disabling wireless devices Group: System Environment/Base @@ -9,8 +9,6 @@ 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, which is used to enable and disable wireless networking devices, typically @@ -18,7 +16,6 @@ WLAN, Bluetooth and mobile broadband. %prep %setup -q -%patch0 -p 1 %build @@ -37,11 +34,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) /sbin/rfkill -%{_mandir}/man1/* +%{_mandir}/man8/* %doc COPYING README %changelog +* Mon Feb 8 2010 John W. Linville 0.4-1 +- Update to version 0.4 + * Tue Sep 29 2009 John W. Linville 0.3-3 - Install binary into /sbin to enable use during boot diff --git a/sources b/sources index 072800c..4274db2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4d693c2a3e5f0503a3cde3d84be8919 rfkill-0.3.tar.bz2 +727892c0fb35c80ee3849fbe89b45350 rfkill-0.4.tar.bz2