[blackbox] Cleanup.

[Christopher Meng]

commit 183308a02250bfd2c0a240876ba65eeb8e4095e0
Author: Christopher Meng <i at cicku.me>
Date:   Mon Jan 13 12:35:38 2014 +0800

    Cleanup.

 blackbox.desktop |    1 +
 blackbox.spec    |   65 ++++++++++++++++++++----------------------------------
 2 files changed, 25 insertions(+), 41 deletions(-)
---
diff --git a/blackbox.desktop b/blackbox.desktop
index df31c67..b7328e1 100644
--- a/blackbox.desktop
+++ b/blackbox.desktop
@@ -82,3 +82,4 @@ TryExec=blackbox
 # no icon yet, only the top three are currently used
 Icon=
 Type=Application
+Terminal=false
diff --git a/blackbox.spec b/blackbox.spec
index a44ac3b..c7aed6d 100644
--- a/blackbox.spec
+++ b/blackbox.spec
@@ -1,20 +1,18 @@
-Summary: Very small and fast Window Manager
-Name: blackbox
-Version: 0.70.1
-Release: 21
-License: MIT
-Group: User Interface/Desktops
-URL: http://blackboxwm.sourceforge.net/
-Source0: http://downloads.sf.net/blackboxwm/blackbox-%{version}.tar.bz2
-Source1: blackbox.desktop
-Source2: blackbox.session
-Patch0: blackbox-0.70.1-gcc43.patch
+Name:           blackbox
+Version:        0.70.1
+Release:        21%{?dist}
+Summary:        Very small and fast Window Manager
+License:        MIT
+URL:            http://blackboxwm.sourceforge.net/
+Source0:        http://downloads.sf.net/blackboxwm/blackbox-%{version}.tar.bz2
+Source1:        blackbox.desktop
+Source2:        blackbox.session
+Patch0:         blackbox-0.70.1-gcc43.patch
 # Bug #660798
-Patch1: blackbox-0.70.1-Xutil.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: libXt-devel, libXext-devel, libXft-devel
+Patch1:         blackbox-0.70.1-Xutil.patch
+BuildRequires:  libXt-devel, libXext-devel, libXft-devel
 # Required for autoreconf
-BuildRequires: automake, autoconf, libtool
+BuildRequires:  automake, autoconf, libtool
 
 %description
 Blackbox is a window manager for the X Window environment, which is
@@ -24,59 +22,46 @@ simple menus. Fast built-in graphics code that can render solids,
 gradients and bevels is used to draw window decorations. Remaining
 small in size, blackbox preserves memory and CPU.
 
-
-%package devel
-Summary: Blackbox Toolbox library for writing small applications
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}, pkgconfig
-Requires: libXft-devel
+%package        devel
+Summary:        Development files for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       libXft-devel
 
 %description devel
 This package contains the Blackbox Toolbox files, headers and static library
 of the utility class library for writing small applications.
 
-
 %prep
 %setup -q
 %patch0 -p1 -b .gcc43
 %patch1 -p1 -b .Xutil
 # Required to cleanly get rid of the useless rpath
-autoreconf -i -f
-
+autoreconf -fiv
 
 %build
 %configure \
     --enable-shared \
     --disable-static
-%{__make} %{?_smp_mflags}
-
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
 
 # Install the desktop entry
-%{__install} -D -p -m 0644 %{SOURCE1} \
+install -pDm0644 %{SOURCE1} \
     %{buildroot}%{_datadir}/xsessions/blackbox.desktop
 
 # Install GDM session file
-%{__install} -D -p -m 0755 %{SOURCE2} \
-    %{buildroot}/etc/X11/gdm/Sessions/Blackbox
-
-
-%clean
-%{__rm} -rf %{buildroot}
-
+install -pDm0755 %{SOURCE2} \
+    %{buildroot}%{_sysconfdir}/X11/gdm/Sessions/Blackbox
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog* COMPLIANCE LICENSE README* RELNOTES TODO
-/etc/X11/gdm/Sessions/Blackbox
+%{_sysconfdir}/X11/gdm/Sessions/Blackbox
 %{_bindir}/blackbox
 %{_bindir}/bsetbg
 %{_bindir}/bsetroot
@@ -89,13 +74,11 @@ autoreconf -i -f
 %{_mandir}/man1/bsetroot.1*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/bt/
 %exclude %{_libdir}/libbt.la
 %{_libdir}/libbt.so
 %{_libdir}/pkgconfig/libbt.pc
 
-
 %changelog
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.70.1-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild