From a0de1edcca9577af5c4e05502eddbc0e839395dd Mon Sep 17 00:00:00 2001
From: Parag Nemade <paragn@fedoraproject.org>
Date: Sat, 11 Sep 2010 08:24:34 +0530
Subject: [PATCH] - Merge-review cleanup (#225841)

---
 gnome-user-docs.spec | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/gnome-user-docs.spec b/gnome-user-docs.spec
index a74bf0f..dba11f4 100644
--- a/gnome-user-docs.spec
+++ b/gnome-user-docs.spec
@@ -1,17 +1,15 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
 Version:        2.30.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GFDL
 #VCS: git:git://git.gnome.org/gnome-user-docs
 Source:         http://download.gnome.org/sources/gnome-user-docs/2.30/gnome-user-docs-%{version}.tar.bz2
 Group:          Documentation
-
 BuildArch:      noarch
-Obsoletes:      gnome-users-guide
 
-BuildRequires: scrollkeeper >= 0.3.11
-BuildRequires: gnome-doc-utils >= 0.5.6
+BuildRequires: scrollkeeper
+BuildRequires: gnome-doc-utils
 BuildRequires: pkgconfig
 BuildRequires: gettext
 
@@ -24,18 +22,13 @@ environment.
 
 %build
 %configure --disable-scrollkeeper
-make
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 %find_lang %{name} --all-name --with-gnome
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
 %defattr(-, root, root,-)
 %dir %{_datadir}/omf/user-guide
@@ -43,6 +36,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/omf/gnome-access-guide
 
 %changelog
+* Thu Sep 09 2010 Parag Nemade <paragn AT fedoraproject.org> 2.30.1-2
+- Merge-review cleanup (#225841)
+
 * Mon Apr 26 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.1-1
 - Update to 2.30.1