[netbsd-iscsi] Attempt at saner SPEC file formatting
Lubomir Rintel
lkundrak at fedoraproject.org
Thu Oct 24 09:49:34 UTC 2013
commit 35022235168d5585381db50dc66fbd6d8c21b19e
Author: Lubomir Rintel <lkundrak at v3.sk>
Date: Thu Oct 24 11:39:54 2013 +0200
Attempt at saner SPEC file formatting
I'm doing this semi-automatically across all packages I maintain, since some
are several years old and since then several have suffered bit-rot and such.
I'm fixing up the following:
- Old RPM relics (such as %defattr, BuildRoot or %clean sections)
- Whitespace errors (such as trailing spaces)
- Consistent use of %{buildroot}
- Dropping useless %{name} expansions that harm legibility
- Consistent spacing between RPM sections
- Bad days in %changelogs
netbsd-iscsi.spec | 37 ++++++++++++++++---------------------
1 files changed, 16 insertions(+), 21 deletions(-)
---
diff --git a/netbsd-iscsi.spec b/netbsd-iscsi.spec
index 171ab41..6c76e93 100644
--- a/netbsd-iscsi.spec
+++ b/netbsd-iscsi.spec
@@ -1,6 +1,6 @@
Name: netbsd-iscsi
Version: 20080207
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: User-space implementation of iSCSI target from NetBSD project
Group: System Environment/Daemons
@@ -18,7 +18,6 @@ Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
NetBSD iSCSI is an iSCSI target following the iSCSI RFC 3720. It is based
@@ -40,26 +39,20 @@ make %{?_smp_mflags} all
%install
-rm -rf $RPM_BUILD_ROOT
+install -d %{buildroot}%{_sbindir}
+install -d %{buildroot}%{_sysconfdir}/iscsi
+install -d %{buildroot}%{_sysconfdir}/sysconfig
+install -d %{buildroot}%{_mandir}/man8
+install -d %{buildroot}%{_mandir}/man5
+install -d %{buildroot}%{_initrddir}
-install -d $RPM_BUILD_ROOT%{_sbindir}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/iscsi
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -d $RPM_BUILD_ROOT%{_mandir}/man8
-install -d $RPM_BUILD_ROOT%{_mandir}/man5
-install -d $RPM_BUILD_ROOT%{_initrddir}
+install -m 755 src/iscsi-target %{buildroot}%{_sbindir}
+install -m 644 src/iscsi-target.8 %{buildroot}%{_mandir}/man8
+install -m 644 src/etc/targets %{buildroot}%{_sysconfdir}/iscsi
+install -m 644 src/targets.5 %{buildroot}%{_mandir}/man5
-install -m 755 src/iscsi-target $RPM_BUILD_ROOT%{_sbindir}
-install -m 644 src/iscsi-target.8 $RPM_BUILD_ROOT%{_mandir}/man8
-install -m 644 src/etc/targets $RPM_BUILD_ROOT%{_sysconfdir}/iscsi
-install -m 644 src/targets.5 $RPM_BUILD_ROOT%{_mandir}/man5
-
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/netbsd-iscsi
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/netbsd-iscsi
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/netbsd-iscsi
+install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/netbsd-iscsi
%post
@@ -80,7 +73,6 @@ fi
%files
-%defattr(-,root,root,-)
%dir %{_sysconfdir}/iscsi
%config(noreplace) %{_sysconfdir}/iscsi/targets
%config(noreplace) %{_sysconfdir}/sysconfig/netbsd-iscsi
@@ -93,6 +85,9 @@ fi
%changelog
+* Thu Oct 24 2013 Lubomir Rintel <lkundrak at v3.sk> - 20080207-9
+- Bulk sad and useless attempt at consistent SPEC file formatting
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080207-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list