- Merge-review cleanup (#226040)

librsvg2.spec

@@ -1,11 +1,11 @@
-Name:    librsvg2
-Summary: An SVG library based on cairo
-Version: 2.32.0
-Release: 1%{?dist}
+Name:           librsvg2
+Summary:        An SVG library based on cairo
+Version:        2.32.0
+Release:        2%{?dist}
 
 License:        LGPLv2+
 Group:          System Environment/Libraries
-#VCS:		git:git://git.gnome.org/librsvg
+#VCS:          git:git://git.gnome.org/librsvg
 Source:         http://download.gnome.org/sources/librsvg/2.32/librsvg-%{version}.tar.bz2
 
 Requires(post):   gdk-pixbuf2
@@ -20,7 +20,7 @@ BuildRequires:  freetype-devel
 BuildRequires:  cairo-devel
 BuildRequires:  libgsf-devel
 BuildRequires:  libcroco-devel
-BuildRequires:  libgsf-devel >= %{libgsf_version}
+BuildRequires:  libgsf-devel 
 # grr, librsvg does not install api docs if --disable-gtk-doc
 BuildRequires:  gtk-doc
 
@@ -35,14 +35,6 @@ An SVG library based on cairo.
 Summary:        Libraries and include files for developing with librsvg
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       gdk-pixbuf2-devel
-Requires:       cairo-devel
-Requires:       pango-devel
-Requires:       libxml2-devel
-Requires:       freetype-devel
-Requires:       libgsf-devel
-Requires:       libcroco-devel
-Requires:       pkgconfig
 
 Provides:       librsvg3-devel = %{name}.%{version}-%{release}
 Obsoletes:      librsvg3-devel <= 2.26.3-3.fc14
@@ -60,17 +52,17 @@ export GDK_PIXBUF_QUERYLOADERS
 # work around an ordering problem in configure
 enable_pixbuf_loader=yes
 export enable_pixbuf_loader
-%configure --with-svgz \
+%configure --disable-static  \
+        --with-svgz \
         --disable-gtk-doc \
         --disable-gtk-theme \
         --with-croco
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/*/loaders/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
 rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/svg-viewer.svg
@@ -85,7 +77,7 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
 
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %doc AUTHORS COPYING COPYING.LIB NEWS README
 %{_libdir}/librsvg-2.so.*
 %{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.so
@@ -95,7 +87,7 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
 %{_mandir}/man1/*
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %{_libdir}/librsvg-2.so
 %{_includedir}/librsvg-2.0
 %{_libdir}/pkgconfig/librsvg-2.0.pc
@@ -103,6 +95,9 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
 
 
 %changelog
+* Mon Oct 18 2010 Parag Nemade <paragn AT fedoraproject.org> - 2.32.0-2
+- Merge-review cleanup (#226040)
+
 * Wed Sep 29 2010 Matthias Clasen <mclasen@redhat.com> 2.32.0-1
 - Update to 2.32.0