[rogue] Spec cleanup

Petr Šabata psabata at fedoraproject.org
Wed Jan 11 14:42:29 UTC 2012


commit c7fda8cda34a35f8d34b017ab8b255676016b002
Author: Petr Šabata <contyk at redhat.com>
Date:   Wed Jan 11 15:39:18 2012 +0100

    Spec cleanup

 rogue.spec |   21 +++------------------
 1 files changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/rogue.spec b/rogue.spec
index 12ddd2d..bc9eff7 100644
--- a/rogue.spec
+++ b/rogue.spec
@@ -2,14 +2,11 @@ Name:           rogue
 Version:        5.4.5
 Release:        7%{?dist}
 Summary:        The original graphical adventure game
-
 Group:          Amusements/Games
 License:        BSD
 URL:            http://rogue.rogueforge.net/
 Source0:        http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.5a-src.tar.gz
 Patch0:         rogue-5.4.5-writesave.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  ncurses-devel
 Requires(post): coreutils
@@ -23,26 +20,17 @@ an entire genre.
 %setup -q -n %{name}%{version}
 %patch0 -p0
 
-
 %build
 %configure --enable-setgid=games --enable-scorefile=%{_var}/games/roguelike/rogue54.scr --enable-lockfile=%{_var}/games/roguelike/rogue54.lck
 make %{_smp_mflags}
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
-
+make install DESTDIR=%{buildroot}
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         rogue.desktop
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
-install -p -m 644 rogue.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/
+install -p -m 644 rogue.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -56,9 +44,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-
 %files
-%defattr(-,root,root,-)
 %attr(2755,games,games) %{_bindir}/rogue
 %{_mandir}/man6/rogue.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -67,7 +53,6 @@ fi
 %config(noreplace) %attr(0664,games,games) %{_var}/games/roguelike/rogue54.scr
 %doc %{_docdir}/%{name}-%{version}
 
-
 %changelog
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild


More information about the scm-commits mailing list