[gtkhtml2] Merge-review cleanup

[Matthew Barnes]

commit 12ae482382d7363d06407379cb835c256e4bc569
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Tue Oct 12 10:03:42 2010 -0400

    Merge-review cleanup

 gtkhtml2.spec |   62 ++++++++++++++++++--------------------------------------
 1 files changed, 20 insertions(+), 42 deletions(-)
---
diff --git a/gtkhtml2.spec b/gtkhtml2.spec
index 6f7c5dd..daf583c 100644
--- a/gtkhtml2.spec
+++ b/gtkhtml2.spec
@@ -1,88 +1,66 @@
-%define gail_version 1.3
-%define gtk2_version 2.3.0
-%define libxml2_version 2.4.20
-%define pango_version 1.0.99
-
 ### Abstract ###
 
 Name: gtkhtml2
 Version: 2.11.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Summary: An HTML widget for GTK+ 2.0
-BuildRoot: %{_tmppath}/%{name}-root
+URL: http://www.gnome.org/
 Source: http://ftp.gnome.org/pub/GNOME/sources/libgtkhtml/2.11/libgtkhtml-%{version}.tar.bz2
 
-### Dependencies ###
-
-Requires: gail >= %{gail_version}
-Requires: gtk2 >= %{gtk2_version}
-Requires: libxml2 >= %{libxml2_version}
-
 ### Build Dependencies ###
 
 BuildRequires: fontconfig
-BuildRequires: gail-devel >= %{gail_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gail-devel
+BuildRequires: gtk2-devel
 BuildRequires: libtool
-BuildRequires: libxml2-devel >= %{libxml2_version}
-BuildRequires: pango-devel >= %{pango_version}
+BuildRequires: libxml2-devel
+BuildRequires: pango-devel
 
 %description
 GtkHTML2 (sometimes called libgtkhtml) is a widget for
 displaying html pages.
 
 %package devel
+Summary: Development files for %{name}
 Group: Development/Libraries
-Summary: Libraries, includes, etc to develop Gtkhtml2 applications
-Requires: gtkhtml2 = %{version}-%{release}
-Requires: gail-devel >= %{gail_version}
-Requires: gtk2-devel >= %{gtk2_version}
-Requires: libxml2-devel >= %{libxml2_version}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
-Libraries and include files that can be used to develop Gtkhtml2 applications.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 %prep
 %setup -q -n libgtkhtml-%{version}
 
 %build
-# XXX remove this when bug #83188 is resolved
-%ifarch x86_64
-%define optflags -g
-%endif
-%configure
-export tagname=CC
-make LIBTOOL=/usr/bin/libtool
+%configure --disable-static
+make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-export tagname=CC
-%makeinstall LIBTOOL=/usr/bin/libtool
-
-# remove unpackaged files
-rm $RPM_BUILD_ROOT%{_libdir}/libgtkhtml-2.la
-rm $RPM_BUILD_ROOT%{_libdir}/*.a
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc COPYING.LIB NEWS AUTHORS ChangeLog
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/gtkhtml-2.0
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Oct 12 2010 Parag Nemade <paragn AT fedoraproject.org> - 2.11.1-9
+- Merge-review cleanup (#225871)
+
 * Mon Mar 08 2010 Matthew Barnes <mbarnes at redhat.com> - 2.11.1-8
 - Stop pulling in gnome-vfs2 just for some test programs.