[rwho] Minor spec file cleanup
Honza Horak
hhorak at fedoraproject.org
Tue Sep 11 08:12:44 UTC 2012
commit 4f44aa09a8e4b6a3f8d523f641c8662e9db8fe01
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date: Tue Sep 11 09:54:14 2012 +0200
Minor spec file cleanup
...-rwho-0.15-alpha.patch => rwho-0.15-alpha.patch | 0
...0.17-bug22014.patch => rwho-0.17-bug22014.patch | 0
...it-rwho-0.17-gcc4.patch => rwho-0.17-gcc4.patch | 0
...ostnamelen.patch => rwho-0.17-hostnamelen.patch | 0
...o-0.17-include.patch => rwho-0.17-include.patch | 0
...-neighbours.patch => rwho-0.17-neighbours.patch | 0
...-rwho-0.17-strip.patch => rwho-0.17-strip.patch | 0
...it-rwho-0.17-time.patch => rwho-0.17-time.patch | 0
...17-waitchild.patch => rwho-0.17-waitchild.patch | 0
...-rwho-0.17-wd_we.patch => rwho-0.17-wd_we.patch | 0
rwho.spec | 32 ++++++++-----------
11 files changed, 14 insertions(+), 18 deletions(-)
---
diff --git a/netkit-rwho-0.15-alpha.patch b/rwho-0.15-alpha.patch
similarity index 100%
rename from netkit-rwho-0.15-alpha.patch
rename to rwho-0.15-alpha.patch
diff --git a/netkit-rwho-0.17-bug22014.patch b/rwho-0.17-bug22014.patch
similarity index 100%
rename from netkit-rwho-0.17-bug22014.patch
rename to rwho-0.17-bug22014.patch
diff --git a/netkit-rwho-0.17-gcc4.patch b/rwho-0.17-gcc4.patch
similarity index 100%
rename from netkit-rwho-0.17-gcc4.patch
rename to rwho-0.17-gcc4.patch
diff --git a/netkit-rwho-0.17-hostnamelen.patch b/rwho-0.17-hostnamelen.patch
similarity index 100%
rename from netkit-rwho-0.17-hostnamelen.patch
rename to rwho-0.17-hostnamelen.patch
diff --git a/netkit-rwho-0.17-include.patch b/rwho-0.17-include.patch
similarity index 100%
rename from netkit-rwho-0.17-include.patch
rename to rwho-0.17-include.patch
diff --git a/netkit-rwho-0.17-neighbours.patch b/rwho-0.17-neighbours.patch
similarity index 100%
rename from netkit-rwho-0.17-neighbours.patch
rename to rwho-0.17-neighbours.patch
diff --git a/netkit-rwho-0.17-strip.patch b/rwho-0.17-strip.patch
similarity index 100%
rename from netkit-rwho-0.17-strip.patch
rename to rwho-0.17-strip.patch
diff --git a/netkit-rwho-0.17-time.patch b/rwho-0.17-time.patch
similarity index 100%
rename from netkit-rwho-0.17-time.patch
rename to rwho-0.17-time.patch
diff --git a/netkit-rwho-0.17-waitchild.patch b/rwho-0.17-waitchild.patch
similarity index 100%
rename from netkit-rwho-0.17-waitchild.patch
rename to rwho-0.17-waitchild.patch
diff --git a/netkit-rwho-0.17-wd_we.patch b/rwho-0.17-wd_we.patch
similarity index 100%
rename from netkit-rwho-0.17-wd_we.patch
rename to rwho-0.17-wd_we.patch
diff --git a/rwho.spec b/rwho.spec
index 8b2e121..68807b5 100644
--- a/rwho.spec
+++ b/rwho.spec
@@ -1,29 +1,28 @@
Summary: Displays who is logged in to local network machines
Name: rwho
Version: 0.17
-Release: 40%{?dist}
+Release: 41%{?dist}
License: BSD
Group: System Environment/Daemons
Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rwho-%{version}.tar.gz
Source1: rwhod.service
-Patch0: netkit-rwho-0.15-alpha.patch
-Patch1: netkit-rwho-0.17-bug22014.patch
+Patch0: rwho-0.15-alpha.patch
+Patch1: rwho-0.17-bug22014.patch
Patch2: rwho-0.17-fixbcast.patch
Patch3: rwho-0.17-fixhostname.patch
-Patch4: netkit-rwho-0.17-strip.patch
-Patch5: netkit-rwho-0.17-include.patch
-Patch6: netkit-rwho-0.17-wd_we.patch
-Patch7: netkit-rwho-0.17-time.patch
-Patch8: netkit-rwho-0.17-gcc4.patch
-Patch9: netkit-rwho-0.17-waitchild.patch
-Patch10: netkit-rwho-0.17-neighbours.patch
-Patch11: netkit-rwho-0.17-hostnamelen.patch
+Patch4: rwho-0.17-strip.patch
+Patch5: rwho-0.17-include.patch
+Patch6: rwho-0.17-wd_we.patch
+Patch7: rwho-0.17-time.patch
+Patch8: rwho-0.17-gcc4.patch
+Patch9: rwho-0.17-waitchild.patch
+Patch10: rwho-0.17-neighbours.patch
+Patch11: rwho-0.17-hostnamelen.patch
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
Requires(post): systemd-sysv
BuildRequires: systemd-units
-BuildRoot: %{_tmppath}/%{name}-root
%description
The rwho command displays output similar to the output of the who
@@ -72,7 +71,6 @@ sh configure --with-c-compiler=gcc
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
%install
-rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,8}
mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
@@ -84,9 +82,6 @@ make INSTALLROOT=${RPM_BUILD_ROOT} install -C ruptime
install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_unitdir}/rwhod.service
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
%post
if [ $1 = 1 ]; then
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
@@ -113,19 +108,20 @@ if [ $1 -ge 1 ]; then
fi
%files
-%defattr(-,root,root)
%doc README
%{_bindir}/ruptime
%{_mandir}/man1/ruptime.1*
%{_bindir}/rwho
%{_mandir}/man1/rwho.1*
-
%{_sbindir}/rwhod
%{_mandir}/man8/rwhod.8*
/var/spool/rwho
%{_unitdir}/*
%changelog
+* Tue Sep 11 2012 Honza Horak <hhorak at redhat.com> - 0.17-41
+- Minor spec file cleanup
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list