[gnome-desktop] - Merge-review cleanup (#225815)

[paragn]

commit 23491f612d82b397aa6045b3cf0703451fb8709b
Author: paragn <paragn at fedoraproject.org>
Date:   Tue Oct 12 10:50:48 2010 +0530

    - Merge-review cleanup (#225815)

 gnome-desktop.spec |   50 +++++++++++++++-----------------------------------
 1 files changed, 15 insertions(+), 35 deletions(-)
---
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 9d50427..f105006 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,18 +1,9 @@
-%define libxml2_version 2.4.20
-%define gtk2_version 2.11.3
-%define glib2_version 2.15.4
-%define libgnomeui_version 2.2.0
-%define libgnomecanvas_version 2.0.0
-%define startup_notification_version 0.5
-%define gnome_doc_utils_version 0.3.2
-%define gtk_doc_version 1.9
-
 %define po_package gnome-desktop-2.0
 
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.32.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-desktop
 Source0: http://download.gnome.org/sources/gnome-desktop/2.32/%{name}-%{version}.tar.bz2
@@ -25,28 +16,24 @@ Requires: pycairo
 Requires: pygtk2
 Requires: gnome-python2-gnome
 
-Obsoletes: gnome-core gnome-core-devel
-Provides: gnome-core
-
 # Make sure to update libgnome schema when changing this
 Requires: goddard-backgrounds-gnome
 Requires: dmz-cursor-themes
 
 BuildRequires: gnome-common
-BuildRequires: libxml2-devel >= %{libxml2_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires: libgnomecanvas-devel >= %{libgnomecanvas_version}
-BuildRequires: startup-notification-devel >= %{startup_notification_version}
-BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
+BuildRequires: libxml2-devel 
+BuildRequires: gtk2-devel
+BuildRequires: glib2-devel 
+BuildRequires: libgnomeui-devel
+BuildRequires: libgnomecanvas-devel 
+BuildRequires: startup-notification-devel
+BuildRequires: gnome-doc-utils 
 BuildRequires: scrollkeeper
 BuildRequires: gettext
-BuildRequires: gtk-doc >= %{gtk_doc_version}
+BuildRequires: gtk-doc
 BuildRequires: automake autoconf libtool intltool
 
 %description
-
 The gnome-desktop package contains an internal library
 (libgnomedesktop) used to implement some portions of the GNOME
 desktop, and also some data files and other shared components of the
@@ -58,14 +45,6 @@ License: LGPLv2+
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Requires: libxml2-devel >= %{libxml2_version}
-Requires: gtk2-devel >= %{gtk2_version}
-Requires: glib2-devel >= %{glib2_version}
-Requires: libgnomeui-devel >= %{libgnomeui_version}
-Requires: libgnomecanvas-devel >= %{libgnomecanvas_version}
-Requires: startup-notification-devel >= %{startup_notification_version}
-Requires: gnome-doc-utils >= %{gnome_doc_utils_version}
-
 %description devel
 Libraries and header files for the GNOME-internal private library
 libgnomedesktop.
@@ -76,16 +55,15 @@ libgnomedesktop.
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" \
 	   --with-pnp-ids-path="/usr/share/hwdata/pnp.ids" \
-	   --disable-scrollkeeper
+	   --disable-scrollkeeper  --disable-static
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 # stuff we don't want
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 %find_lang %{po_package} --all-name --with-gnome
 
@@ -99,7 +77,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 %{_datadir}/applications/gnome-about.desktop
 %{_datadir}/gnome-about
 %{_datadir}/pixmaps/*
-%{_datadir}/omf/*
 %doc %{_mandir}/man*/*
 # GPL
 %{_bindir}/gnome-about
@@ -114,6 +91,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 %doc %{_datadir}/gtk-doc
 
 %changelog
+* Tue Oct 12 2010 Parag Nemade <paragn AT fedoraproject.org> 2.32.0-2
+- Merge-review cleanup (#225815)
+
 * Wed Sep 29 2010 Matthias Clasen <mclasen at redhat.com> 2.32.0-1
 - Update to 2.32.0