- Merge-review cleanup (#225987)

libart_lgpl.spec

@@ -1,30 +1,27 @@
 Summary: Library of graphics routines used by libgnomecanvas
 Name: libart_lgpl
 Version: 2.3.21
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org/
 Source0: http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/%{name}-%{version}.tar.bz2
+#Fedora specific patch
 Patch0: libart-multilib.patch
 License: LGPLv2+
 Group: System Environment/Libraries 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: pkgconfig
 
 %description
-
 Graphics routines used by the GnomeCanvas widget and some other 
 applications. libart renders vector paths and the like.
 
 %package devel
 Summary: Libraries and headers for libart_lgpl
 Group: Development/Libraries
-Requires: %name = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
-Conflicts: gnome-libs-devel < 1:1.4.1.2
 
 %description devel
-
+The %{name}-devel package contains libraries and header files for
-Graphics routines used by the GnomeCanvas widget and some other 
+developing applications that use %{name}.
-applications. libart renders vector paths and the like.
 
 %prep
 %setup -q
@@ -35,10 +32,8 @@ applications. libart renders vector paths and the like.
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-%makeinstall
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # fix multilib issues
 %ifarch x86_64 s390x ia64 ppc64 alpha sparc64
@@ -67,29 +62,27 @@ cat >$RPM_BUILD_ROOT%{_includedir}/libart-2.0/libart_lgpl/art_config.h <<EOF
 #endif 
 EOF
 
-%clean
-rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
-
 %doc AUTHORS COPYING NEWS README
-
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
-
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_bindir}/libart2-config
 %{_includedir}/*
 
 %changelog
+* Fri Sep 24 2010 Parag Nemade <paragn AT fedoraproject.org> - 2.3.21-2
+- Merge-review cleanup (#225987)
+
 * Wed Jul  7 2010 Jochen Schmitt <Jochen herr-schmitt de> - 2.3.21-1
 - New upstream release