[gtk2-engines] - Merge-review cleanup (#225868)

[paragn]

commit 846bfcf007af0b8b2f81eef814eaebe70f48ffdc
Author: paragn <paragn at fedoraproject.org>
Date:   Mon Oct 4 10:56:42 2010 +0530

    - Merge-review cleanup (#225868)

 gtk2-engines.spec |   48 +++++++++++++++++-------------------------------
 1 files changed, 17 insertions(+), 31 deletions(-)
---
diff --git a/gtk2-engines.spec b/gtk2-engines.spec
index 37b3a2f..65a8887 100644
--- a/gtk2-engines.spec
+++ b/gtk2-engines.spec
@@ -1,16 +1,13 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.20.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        LGPLv2+
 Group:          System Environment/Libraries
 #VCS: git:git://git.gnome.org/gtk-engines
 Source:         http://download.gnome.org/sources/gtk-engines/2.20/gtk-engines-%{version}.tar.bz2
 
-Conflicts:      gnome-themes < 2.9.0
-Obsoletes:      gnome-theme-clearlooks <= 0.5
-
 BuildRequires:  gtk2-devel
 BuildRequires:  intltool
 BuildRequires:  gettext
@@ -29,23 +26,21 @@ Patch2: auto-mnemonics.patch
 Patch3: window-dragging.patch
 
 
+%description
+The gtk2-engines package contains shared objects and configuration
+files that implement a number of GTK+ theme engines. Theme engines
+provide different looks for GTK+, some of which resemble other
+toolkits or operating systems.
+
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
 
 %description devel
 The gtk2-engines-devel package contains files needed to develop
 software that uses the theme engines in the gtk2-engines package.
 
-
-%description
-The gtk2-engines package contains shared objects and configuration
-files that implement a number of GTK+ theme engines. Theme engines
-provide different looks for GTK+, some of which resemble other
-toolkits or operating systems.
-
 %prep
 %setup -q -n gtk-engines-%{version}
 
@@ -55,21 +50,12 @@ toolkits or operating systems.
 %patch3 -p1 -b .window-dragging
 
 %build
-%configure
-make
+%configure --disable-static
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
-
-# no .la, please
-find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs rm
-
-# sanitize permissions
-find $RPM_BUILD_ROOT%{_datadir}/themes -type d -exec chmod 755 {} \;
-find $RPM_BUILD_ROOT%{_datadir}/themes -type f -name "*.png" -exec chmod 644 {} \;
-find $RPM_BUILD_ROOT%{_datadir}/themes -name "gtkrc*" -perm +111 -exec chmod 644 {} \;
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 # no thanks
 rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/Redmond
@@ -77,21 +63,21 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.4.0/engines/libredmond95.so
 
 %find_lang gtk-engines
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f gtk-engines.lang
-%defattr(644, root, root, 755)
+%defattr(-, root, root, -)
 %doc README AUTHORS NEWS COPYING
-%attr (755, root, root) %{_libdir}/gtk-2.0/2.10.0/engines/*.so
+%{_libdir}/gtk-2.0/2.10.0/engines/*.so
 %{_datadir}/themes/*
 %{_datadir}/gtk-engines
 
 %files devel
-%defattr(644, root, root, 755)
+%defattr(-, root, root, -)
 %{_libdir}/pkgconfig/gtk-engines-2.pc
 
 %changelog
+* Fri Sep 24 2010 Parag Nemade <paragn AT fedoraproject.org> - 2.20.1-3
+- Merge-review cleanup (#225868)
+
 * Fri Jun 18 2010 Matthias Clasen <mclasen at redhat.com> - 2.20.1-2
 - Drop a bogus Requires