[libcroco] - Merge-review cleanup (#225994)

[paragn]

commit 2b3d234a02de92cdd886ff0930adb30bb32927b8
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Sat Sep 11 08:28:15 2010 +0530

    - Merge-review cleanup (#225994)

 libcroco.spec |   55 ++++++++++++++++++++++++-------------------------------
 1 files changed, 24 insertions(+), 31 deletions(-)
---
diff --git a/libcroco.spec b/libcroco.spec
index 3cbbec0..4f440e0 100644
--- a/libcroco.spec
+++ b/libcroco.spec
@@ -1,27 +1,26 @@
 Name:             libcroco
 Summary:          A CSS2 parsing library
 Version:          0.6.2
-Release: 	  4%{?dist}
+Release:          5%{?dist}
 License:          LGPLv2
 Group:            System Environment/Libraries
-Source:           http://download/gnome.org/sources/libcroco/0.6/%{name}-%{version}.tar.bz2
-BuildRoot:        %{_tmppath}/%{name}-%{version}-root
-Patch0:		  libcroco-0.6.1-multilib.patch
+Source:           http://download.gnome.org/sources/libcroco/0.6/%{name}-%{version}.tar.bz2
+#Fedora specific patch
+Patch0:    libcroco-0.6.1-multilib.patch
 
-BuildRequires:    pkgconfig >= 0.8
-BuildRequires:    glib2-devel >= 2.3
-BuildRequires:    libxml2-devel >= 2.4.23
+BuildRequires:    pkgconfig
+BuildRequires:    glib2-devel
+BuildRequires:    libxml2-devel
 
 %description
 CSS2 parsing and manipulation library for GNOME
 
 %package devel
-Summary:          Libraries and include files for developing with libcroco.
+Summary:          Libraries and include files for developing with libcroco
 Group:            Development/Libraries
-Requires:         %{name} = %{version}
-Requires:         pkgconfig >= 0.8
-Requires:         glib2-devel >= 2.0
-Requires:         libxml2-devel >= 2.4.23
+Requires:         %{name} = %{version}-%{release}
+Requires:         glib2-devel
+Requires:         libxml2-devel
 
 %description devel
 This package provides the necessary development libraries and include
@@ -32,43 +31,37 @@ files to allow you to develop with libcroco.
 %patch0 -p1 -b .multilib
 
 %build
-:%configure --enable-seleng=yes --enable-layeng=yes
-make
+%configure --enable-seleng=yes --enable-layeng=yes --disable-static
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-# create file that the new redhat debuginfo stuff demands
-touch $RPM_BUILD_DIR/libcroco-%{version}/debugfiles.list
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-%makeinstall
-# Clean out files that should not be part of the rpm.
-# This is the recommended way of dealing with it for RH8
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%check
+make check
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post -p /sbin/ldconfig
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc AUTHORS COPYING COPYING.LIB NEWS README 
 %{_bindir}/csslint-0.6
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %{_libdir}/*.so
 %{_includedir}/libcroco-0.6
 %{_bindir}/croco-0.6-config
 %{_libdir}/pkgconfig/libcroco-0.6.pc
 
 %changelog
+* Fri Sep 10 2010 Parag Nemade <paragn AT fedoraproject.org> 0.6.2-5
+- Merge-review cleanup (#225994)
+
 * Tue Dec  8 2009 Matthias Clasen <mclasen at redhat.com> - 0.6.2-4
 - Add source url