From 8e644b28aa38a7347f90adea7017f70d078af11d Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Oct 24 2013 09:39:53 +0000 Subject: 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 --- diff --git a/corrida.spec b/corrida.spec index a2448b8..79e4e8e 100644 --- a/corrida.spec +++ b/corrida.spec @@ -3,7 +3,7 @@ Name: corrida Version: %{version_major}.%{version_minor} -Release: 12%{?dist} +Release: 13%{?dist} Summary: Application for archivation of meteor observations Group: Amusements/Graphics @@ -21,10 +21,12 @@ BuildRequires: desktop-file-utils Application was designed by Polish Fireball Center cooperators to ease archivation of meteor observations. + %prep %setup -q -n corrida-%{version_major}-%{version_minor} %patch0 -p1 -b .count + %build find . -type f |xargs chmod 0644 make %{?_smp_mflags} PREFIX=%{_prefix}/ CFLAGS="%{optflags}" @@ -32,18 +34,18 @@ convert common/corrida.ico corrida.png %install -make install PREFIX=$RPM_BUILD_ROOT%{_prefix}/ +make install PREFIX=%{buildroot}%{_prefix}/ # Directory structure -install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -d $RPM_BUILD_ROOT%{_datadir}/applications +install -d %{buildroot}%{_datadir}/pixmaps +install -d %{buildroot}%{_datadir}/applications # Icon -install -pm 0644 corrida.png $RPM_BUILD_ROOT%{_datadir}/pixmaps +install -pm 0644 corrida.png %{buildroot}%{_datadir}/pixmaps # Menu entry desktop-file-install %{SOURCE1} \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications + --dir=%{buildroot}%{_datadir}/applications %files %{_bindir}/corrida @@ -53,7 +55,11 @@ desktop-file-install %{SOURCE1} \ %{_datadir}/applications/* %doc copying + %changelog +* Thu Oct 24 2013 Lubomir Rintel - 0.96.11-13 +- Bulk sad and useless attempt at consistent SPEC file formatting + * Sat Aug 03 2013 Fedora Release Engineering - 0.96.11-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild