[slim] General spec file cleanup

[Petr Sabata]

commit 3a31df1214ee8910250b8f68904af119665c6a0f
Author: Petr Sabata <psabata at redhat.com>
Date:   Tue Mar 1 13:02:52 2011 +0100

    General spec file cleanup

 .gitignore                                         |    1 +
 ...m-1.3.2-fedora.patch => slim-1.3.2-fedora.patch |    0
 01-slim-1.3.2-make.patch => slim-1.3.2-make.patch  |    0
 ...1.3.1-selinux.patch => slim-1.3.2-selinux.patch |    0
 slim.spec                                          |   69 +++++++-------------
 sources                                            |    1 +
 6 files changed, 26 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d516fa8..cda4336 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 slim-1.3.1.tar.gz
 /slim-1.3.2.tar.gz
 /slim-update_slim_wmlist
+/slim-dynwm
diff --git a/02-slim-1.3.2-fedora.patch b/slim-1.3.2-fedora.patch
similarity index 100%
rename from 02-slim-1.3.2-fedora.patch
rename to slim-1.3.2-fedora.patch
diff --git a/01-slim-1.3.2-make.patch b/slim-1.3.2-make.patch
similarity index 100%
rename from 01-slim-1.3.2-make.patch
rename to slim-1.3.2-make.patch
diff --git a/03-slim-1.3.1-selinux.patch b/slim-1.3.2-selinux.patch
similarity index 100%
rename from 03-slim-1.3.1-selinux.patch
rename to slim-1.3.2-selinux.patch
diff --git a/slim.spec b/slim.spec
index 7c52109..52b4f20 100644
--- a/slim.spec
+++ b/slim.spec
@@ -1,8 +1,7 @@
 Name:           slim
 Version:        1.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple Login Manager
-
 Group:          User Interface/X
 License:        GPLv2+
 URL:            http://slim.berlios.de/
@@ -11,15 +10,14 @@ Source0:        http://download.berlios.de/slim/%{name}-%{version}.tar.gz
 Source1:        %{name}.pam
 # adapted from debian to use freedesktop
 Source2:        slim-update_slim_wmlist
-Source3:        slim-fedora.txt
+Source3:        slim-dynwm
+Source4:        slim-fedora.txt
 # logrotate entry (see bz#573743)
-Source4:        slim.logrotate.d
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Source5:        slim.logrotate.d
 # Fedora-specific patches
-Patch0: 01-slim-1.3.2-make.patch
-Patch1: 02-slim-1.3.2-fedora.patch
-Patch2: 03-slim-1.3.1-selinux.patch
+Patch0:         slim-1.3.2-make.patch
+Patch1:         slim-1.3.2-fedora.patch
+Patch2:         slim-1.3.2-selinux.patch
 
 BuildRequires:  libXmu-devel libXft-devel libXrender-devel
 BuildRequires:  libpng-devel libjpeg-devel freetype-devel fontconfig-devel
@@ -50,48 +48,24 @@ before launching slim.
 %patch0 -p1 -b .make
 %patch1 -p1 -b .fedora
 %patch2 -p1 -b .selinux
-cp -p %{SOURCE3} README.Fedora
+cp -p %{SOURCE4} README.Fedora
 
 %build
 make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" USE_PAM=1
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' MANDIR=%{_mandir}
-
-install -p -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update_slim_wmlist
-
-# do a slim wrapper which updates the window manager list before
-# launching slim
-cat > $RPM_BUILD_ROOT%{_bindir}/slim-dynwm << EOF
-#!/bin/sh
-update_slim_wmlist
-if [ "x\$1" = "x-nodaemon" ]; then
-  shift
-  exec slim "\$@"
-else
-  slim -d "\$@"
-fi
-EOF
-
-chmod 0755 $RPM_BUILD_ROOT%{_bindir}/slim-dynwm
-chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/slim.conf
-
-install -d -m755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
-install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/slim
-
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/slim
-
+make install DESTDIR=%{buildroot} INSTALL='install -p' MANDIR=%{_mandir}
+install -p -m755 %{SOURCE2} %{buildroot}%{_bindir}/update_slim_wmlist
+install -p -m755 %{SOURCE3} %{buildroot}%{_bindir}/slim-dynwm
+chmod 0644 %{buildroot}%{_sysconfdir}/slim.conf
+install -d -m755 %{buildroot}%{_sysconfdir}/pam.d
+install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/slim
+mkdir -p %{buildroot}%{_localstatedir}/run/slim
 # replace the background image
-rm -f $RPM_BUILD_ROOT%{_datadir}/slim/themes/default/background.jpg
-ln -s ../../../backgrounds/tiles/default_blue.jpg $RPM_BUILD_ROOT%{_datadir}/slim/themes/default/background.jpg
-
+rm -f %{buildroot}%{_datadir}/slim/themes/default/background.jpg
+ln -s ../../../backgrounds/tiles/default_blue.jpg %{buildroot}%{_datadir}/slim/themes/default/background.jpg
 # install logrotate entry
-install -m0644 -D %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/slim
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+install -m0644 -D %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/slim
 
 %files
 %defattr(-,root,root,-)
@@ -106,8 +80,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/slim
 %{_datadir}/slim/themes/
 
-
 %changelog
+* Tue Mar 01 2011 Petr Sabata <psabata at redhat.com> - 1.3.2-5
+- General spec cleanup
+- Moved slim-dynwm to a separate source file
+- Patches renamed
+- Buildroot removed
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 1c656f7..551a5c5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 ca1ae6120e6f4b4969f2d6cf94f47b42  slim-1.3.2.tar.gz
 69a563902f84529c0b9437603c082574  slim-update_slim_wmlist
+bb11ef362ce7f27433931c51ffdc9657  slim-dynwm