[glade2] - Merge-review cleanup (#225803)

[paragn]

commit e477633dc24183eede007be7f1631d0eb0339dba
Author: paragn <paragn at fedoraproject.org>
Date:   Tue Oct 12 11:04:47 2010 +0530

    - Merge-review cleanup (#225803)

 glade2.spec |   64 ++++++++++++++++++++++++-----------------------------------
 1 files changed, 26 insertions(+), 38 deletions(-)
---
diff --git a/glade2.spec b/glade2.spec
index 81d08af..b20dc0d 100644
--- a/glade2.spec
+++ b/glade2.spec
@@ -1,42 +1,29 @@
-%define glib2_version 2.6.0
-%define pango_version 1.8.0
-%define gtk2_version 2.6.0
-%define libgnomeui_version 2.9.0
-%define libbonobo_version 2.2.0
-%define libbonoboui_version 2.2.0
-%define gnome_vfs2_version 2.0.0
-%define bonobo_activation_version 1.0.0
-%define libgnomecanvas_version 2.0.0
-%define libgnomeprint22_version 2.2.0
-%define libgnomeprintui22_version 2.2.0
-%define desktop_file_utils_version 0.2.90
-
 %define po_package glade-2.0
 
-Summary:        A GTK+ GUI builder.
+Summary:        A GTK+ GUI builder
 Name:           glade2
 Version:        2.12.2
-Release: 	7%{?dist}
+Release:        8%{?dist}
 License:        GPLv2+ and GFDL
 URL:            http://glade.gnome.org/
 Source:         http://download.gnome.org/sources/glade/2.12/glade-%{version}.tar.bz2
+# Fedora specific patches
 Patch0:         gnome-i18n.patch
-Patch1:		gtk-includes.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:         gtk-includes.patch
 Group:          Development/Tools
 
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: pango-devel >= %{pango_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires: libbonobo-devel >= %{libbonobo_version}
-BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
-BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
-BuildRequires: bonobo-activation-devel >= %{bonobo_activation_version}
-BuildRequires: libgnomecanvas-devel >= %{libgnomecanvas_version}
-BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version}
-BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui22_version}
-BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
+BuildRequires: glib2-devel 
+BuildRequires: pango-devel
+BuildRequires: gtk2-devel
+BuildRequires: libgnomeui-devel
+BuildRequires: libbonobo-devel
+BuildRequires: libbonoboui-devel
+BuildRequires: gnome-vfs2-devel 
+BuildRequires: bonobo-activation-devel
+BuildRequires: libgnomecanvas-devel 
+BuildRequires: libgnomeprint22-devel
+BuildRequires: libgnomeprintui22-devel 
+BuildRequires: desktop-file-utils 
 BuildRequires: scrollkeeper
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser)
@@ -54,14 +41,16 @@ The glade2 package contains a version of Glade for GTK+ 2.0.
 %patch0 -p1 -b .gnome-i18n
 %patch1 -p1 -b .gtk-includes
 
+# Fix the warnings from desktop-file-install 
+sed -i 's|Icon=glade-2.png|Icon=glade-2|g' glade-2.desktop.in
+sed -i 's|MimeType=application/x-glade|MimeType=application/x-glade;|g' glade-2.desktop.in
+
 %build
 %configure --disable-gnome-db 
-make
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
@@ -72,19 +61,18 @@ rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
 %find_lang %po_package --all-name --with-gnome
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{po_package}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING README NEWS TODO
 %{_datadir}/glade-2
-%{_datadir}/omf/glade-2
 %{_datadir}/applications/gnome-glade-2.desktop
 %{_datadir}/pixmaps/*
 %{_bindir}/*
 
 %changelog
+* Wed Oct 06 2010 Parag Nemade <paragn AT fedoraproject.org> - 2.12.2.8
+- Merge-review cleanup (#225803)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild