From 88d2fbe9c021d47d1dd1b9332d07e9a1f344171b Mon Sep 17 00:00:00 2001
From: paragn <paragn@fedoraproject.org>
Date: Mon, 4 Oct 2010 10:55:25 +0530
Subject: [PATCH] - Merge-review cleanup (#225870)

---
 gtk-doc.spec | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/gtk-doc.spec b/gtk-doc.spec
index 487ec9e..612a6db 100644
--- a/gtk-doc.spec
+++ b/gtk-doc.spec
@@ -1,7 +1,7 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
 Version: 1.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL
 Group: Development/Tools
 #VCS: git:git://git.gnome.org/gtk-doc
@@ -14,16 +14,15 @@ BuildRequires: jade
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
 BuildRequires: scrollkeeper
-BuildRequires: python
+BuildRequires: python2-devel
 BuildRequires: gnome-doc-utils
 BuildRequires: gettext
 BuildRequires: source-highlight
 
-Requires: docbook-utils jade /usr/bin/cmp libxslt docbook-style-xsl
+# Following are not automatically installed
+Requires: docbook-utils openjade libxslt docbook-style-xsl
 # we are installing an automake macro
 Requires: automake
-# we are installing a .pc file
-Requires: pkgconfig
 # we are installing an sgml catalog
 Requires: sgml-common
 Requires: source-highlight
@@ -37,18 +36,16 @@ It is used for generating the documentation for GTK+, GLib
 and GNOME.
 
 %prep
-
 %setup -q
-
 # Move this doc file to avoid name collisions
 mv doc/README doc/README.docs
 
 %build
-%configure --enable-public-id --disable-scrollkeeper
-make
+%configure --disable-scrollkeeper
+make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # --disable-scrollkeeper is not enough
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
@@ -56,7 +53,7 @@ rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %doc AUTHORS README doc/* examples COPYING COPYING-DOCS
 %{_bindir}/*
 %{_datadir}/aclocal/gtk-doc.m4
@@ -67,6 +64,9 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html
 %{_datadir}/omf/gtk-doc-manual
 
 %changelog
+* Fri Sep 24 2010 Parag Nemade <paragn AT fedoraproject.org> - 1.15-2
+- Merge-review cleanup (#225870)
+
 * Sun May 23 2010 Matthias Clasen <mclasen@redhat.com> - 1.15-1
 - Update to 1.15