[gtkhtml3] Merge-review cleanup.

[Matthew Barnes]

commit 0e2a2b1340bcf7c90e370918ba39e2c51077e8b5
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Thu Oct 14 16:18:11 2010 -0400

    Merge-review cleanup.

 gtkhtml3.spec |   52 ++++++++++++++++------------------------------------
 1 files changed, 16 insertions(+), 36 deletions(-)
---
diff --git a/gtkhtml3.spec b/gtkhtml3.spec
index 9d31df6..11234fe 100644
--- a/gtkhtml3.spec
+++ b/gtkhtml3.spec
@@ -1,24 +1,16 @@
-%define gnome_icon_theme_version 2.22.0
-%define gtk2_version 2.22.0
-%define intltool_version 0.36.3
 %define gtkhtml_major 3.14
 
 ### Abstract ###
 
 Name: gtkhtml3
 Version: 3.91.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 Summary: GtkHTML library
 License: LGPLv2+ and GPLv2
 URL: http://projects.gnome.org/evolution/
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Source: http://download.gnome.org/sources/gtkhtml/3.91/gtkhtml-%{version}.tar.bz2
 
-### Dependencies ###
-
-Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
-
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -26,9 +18,9 @@ BuildRequires: enchant-devel
 BuildRequires: gail-devel
 BuildRequires: gettext
 BuildRequires: gnome-common
-BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: intltool >= %{intltool_version}
+BuildRequires: gnome-icon-theme
+BuildRequires: gtk2-devel
+BuildRequires: intltool
 BuildRequires: iso-codes-devel
 BuildRequires: libtool
 
@@ -39,47 +31,32 @@ independently of it.
 
 %package devel
 Group: Development/Libraries
-Summary: Libraries, includes, etc to develop gtkhtml applications
+Summary: Development files for %{name}
 Requires: %{name} = %{version}-%{release}
-Requires: enchant-devel
-Requires: iso-codes-devel
 
 %description devel
-Libraries and include files that can be used to develop GtkHTML applications.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 %prep
 %setup -q -n gtkhtml-%{version}
 
 %build
-
-# Rerun the GNU "autotools" since we patched configure.in.
-autoreconf --force --install
-
-%configure --disable-deprecated-warning-flags
-export tagname=CC
-make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
+%configure --disable-static
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 %install
-rm -rf $RPM_BUILD_ROOT
-export tagname=CC
-make install LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT
-
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/gtkhtml/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/gtkhtml/*.a
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %find_lang gtkhtml-%{gtkhtml_major}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files -f gtkhtml-%{gtkhtml_major}.lang
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS README COPYING TODO
 %{_bindir}/gtkhtml-editor-test
 %{_libdir}/libgtkhtml-%{gtkhtml_major}.so.*
@@ -87,13 +64,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtkhtml-%{gtkhtml_major}
 
 %files devel
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %{_includedir}/libgtkhtml-%{gtkhtml_major}
 %{_libdir}/libgtkhtml-%{gtkhtml_major}.so
 %{_libdir}/libgtkhtml-editor-%{gtkhtml_major}.so
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Oct 13 2010 Parag Nemade <paragn AT fedoraproject.org> - 3.91-0.2
+- Merge-review cleanup (#225872)
+
 * Mon Oct 11 2010 Milan Crha <mcrha at redhat.com> - 3.91.0-1
 - Update to 3.91.0