[tunneler] Attempt at saner SPEC file formatting
Lubomir Rintel
lkundrak at fedoraproject.org
Thu Oct 24 09:57:34 UTC 2013
commit 82ef8249659ac167455b0f87d2bf005a0ad19fd1
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
tunneler.spec | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/tunneler.spec b/tunneler.spec
index 0cc4204..9d2bf03 100644
--- a/tunneler.spec
+++ b/tunneler.spec
@@ -1,6 +1,6 @@
Name: tunneler
Version: 1.1.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Clone of legendary Tunneler game
Group: Amusements/Games
@@ -10,7 +10,6 @@ Source0: http://users.jyu.fi/~tvkalvas/code/tunneler/%{name}-%{version}.t
Source1: tunneler.svg
Source2: tunneler.desktop
Patch0: tunneler-1.1.1-lm.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: SDL-devel
@@ -36,10 +35,9 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/
-install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/
+make install DESTDIR=%{buildroot}
+install -d %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
+install -m 644 -p %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
desktop-file-install %{SOURCE2} \
%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rheld} < 7)
--vendor=fedora \
@@ -47,10 +45,6 @@ desktop-file-install %{SOURCE2} \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
touch --no-create %{_datadir}/icons/hicolor || :
[ -x %{_bindir}/gtk-update-icon-cache ] &&
@@ -64,7 +58,6 @@ touch --no-create %{_datadir}/icons/hicolor || :
%files
-%defattr(-,root,root,-)
%{_bindir}/tunneler
%{_datadir}/icons/hicolor/scalable/apps/tunneler.svg
%{_datadir}/applications/*.desktop
@@ -72,6 +65,9 @@ touch --no-create %{_datadir}/icons/hicolor || :
%changelog
+* Thu Oct 24 2013 Lubomir Rintel <lkundrak at v3.sk> - 1.1.1-13
+- Bulk sad and useless attempt at consistent SPEC file formatting
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list