diff --git a/.cvsignore b/.cvsignore index 9bce6fd..c996f59 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -librsvg-2.26.3.tar.bz2 +librsvg-2.31.0-20100628git.tar.bz2 diff --git a/librsvg2.spec b/librsvg2.spec index edf6a0a..5b91030 100644 --- a/librsvg2.spec +++ b/librsvg2.spec @@ -1,52 +1,28 @@ -%define __libtoolize : - -%define libxml2_version 2.4.12 -%define gtk2_version 2.9.0 -%define gtk3_version 2.90.0 -%define glib2_version 2.15.4 -%define freetype_version 2.0.1 -%define cairo_version 1.1.2 -%define libcroco_version 0.6.1 -%define libgnomeui_version 2.5.0 -%define libgsf_version 1.6.0 -%define gnome_vfs_version 1.9.16 +%define alphatag 20100628git Name: librsvg2 Summary: An SVG library based on cairo -Version: 2.26.3 -Release: 3%{?dist} +Version: 2.31.0 +Release: 0.1.%{alphatag}%{?dist} License: LGPLv2+ Group: System Environment/Libraries -Source: http://download.gnome.org/sources/librsvg/2.26/librsvg-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/librsvg/2.31/librsvg-%{version}-%{alphatag}.tar.bz2 -Requires: gtk2 >= %{gtk2_version} -Requires: libxml2 >= %{libxml2_version} -Requires: freetype >= %{freetype_version} -Requires: cairo >= %{cairo_version} -Requires: libgsf >= %{libgsf_version} -Requires(post): gtk2 >= %{gtk2_version} -Requires(postun): gtk2 >= %{gtk2_version} +Requires(post): gdk-pixbuf2 +Requires(postun): gdk-pixbuf2 BuildRequires: libpng-devel -BuildRequires: glib2-devel >= %{glib2_version} -BuildRequires: gtk2-devel >= %{gtk2_version} -BuildRequires: gtk3-devel >= %{gtk3_version} -BuildRequires: libxml2-devel >= %{libxml2_version} -BuildRequires: freetype-devel >= %{freetype_version} -BuildRequires: cairo-devel >= %{cairo_version} -BuildRequires: libgsf-devel, libcroco-devel -BuildRequires: libcroco >= %{libcroco_version} -BuildRequires: libgnomeui >= %{libgnomeui_version} -BuildRequires: libgnomeui-devel +BuildRequires: glib2-devel +#BuildRequires: gdk-pixbuf2-devel +BuildRequires: libxml2-devel +BuildRequires: freetype-devel +BuildRequires: cairo-devel +BuildRequires: libgsf-devel +BuildRequires: libcroco-devel BuildRequires: libgsf-devel >= %{libgsf_version} # grr, librsvg does not install api docs if --disable-gtk-doc BuildRequires: gtk-doc -# https://bugzilla.gnome.org/show_bug.cgi?id=618475 -BuildRequires: automake autoconf libtool intltool gnome-common -Patch0: gtk3-port.patch -Patch1: 0001-Fix-compilation-of-GTK-theme-engine-for-GTK-3.0.patch - %description An SVG library based on cairo. @@ -55,124 +31,52 @@ An SVG library based on cairo. Summary: Libraries and include files for developing with librsvg Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: gtk2-devel >= %{gtk2_version} -Requires: libxml2-devel >= %{libxml2_version} -Requires: freetype-devel >= %{freetype_version} -Requires: libgsf-devel >= %{libgsf_version} -Requires: libcroco-devel >= %{libcroco_version} +Requires: gdk-pixbuf2-devel +Requires: cairo-devel +Requires: libxml2-devel +Requires: freetype-devel +Requires: libgsf-devel +Requires: libcroco-devel Requires: pkgconfig %description devel This package provides the necessary development libraries and include files to allow you to develop with librsvg. -%package -n librsvg3 -Summary: An SVG library based on cairo -Group: Development/Libraries -Requires: gtk3 >= %{gtk3_version} -Requires: libxml2 >= %{libxml2_version} -Requires: freetype >= %{freetype_version} -Requires: cairo >= %{cairo_version} -Requires: libgsf >= %{libgsf_version} -Requires(post): gtk3 >= %{gtk3_version} -Requires(postun): gtk3 >= %{gtk3_version} - -%description -n librsvg3 -An SVG library based on cairo. This version is linked against -libraries from the GTK+ 3.x series. - -%package -n librsvg3-devel -Summary: Libraries and include files for developing with librsvg3 -Group: Development/Libraries -Requires: librsvg3 = %{version}-%{release} -Requires: gtk3-devel >= %{gtk2_version} -Requires: libxml2-devel >= %{libxml2_version} -Requires: freetype-devel >= %{freetype_version} -Requires: libgsf-devel >= %{libgsf_version} -Requires: libcroco-devel >= %{libcroco_version} -Requires: pkgconfig - -%description -n librsvg3-devel -This package provides the necessary development libraries and include -files to allow you to develop with librsvg3. - %prep -%setup -q -n librsvg-%{version} -c -pushd librsvg-%{version} -%patch0 -p1 -b .gtk3 -%patch1 -p1 -b .gtk3-build -mv librsvg-2.0.pc.in librsvg.pc.in -mv librsvg-2.0-uninstalled.pc.in librsvg-uninstalled.pc.in -popd - -cp -a librsvg-%{version} gtk3 -mv librsvg-%{version} gtk2 +%setup -q -n librsvg-%{version} %build -pushd gtk2 -libtoolize -f -autoreconf -f %configure --with-svgz \ --disable-gtk-doc \ - --enable-gtk-theme \ + --disable-gtk-theme \ --with-croco \ --with-gtk=2.0 - make %{?_smp_mflags} -popd - -pushd gtk3 -libtoolize -f -autoreconf -f -%configure --with-svgz \ - --disable-gtk-doc \ - --enable-gtk-theme \ - --with-croco \ - --with-gtk=3.0 - -make %{?_smp_mflags} -popd %install -pushd gtk3 make install DESTDIR=$RPM_BUILD_ROOT -popd -pushd gtk2 -make install DESTDIR=$RPM_BUILD_ROOT -popd + rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} -rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-?.0/*/{engines,loaders}/*.{a,la} +rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-?.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 -%clean -rm -rf $RPM_BUILD_ROOT - %post /sbin/ldconfig -%{_bindir}/update-gdk-pixbuf-loaders %{_host} || : +gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || : %postun /sbin/ldconfig -%{_bindir}/update-gdk-pixbuf-loaders %{_host} || : +gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || : -%post -n librsvg3 -/sbin/ldconfig - -%posttrans -n librsvg3 -gdk-pixbuf-query-loaders-3.0-%{__isa_bits} --update-cache || : - -%postun -n librsvg3 -/sbin/ldconfig -gdk-pixbuf-query-loaders-3.0-%{__isa_bits} --update-cache || : %files %defattr(-, root, root) -%doc gtk2/AUTHORS gtk2/COPYING gtk2/COPYING.LIB gtk2/NEWS gtk2/README +%doc AUTHORS COPYING COPYING.LIB NEWS README %{_libdir}/librsvg-2.so.* -%{_libdir}/gtk-2.0/*/engines/libsvg.so -%{_libdir}/gtk-2.0/*/loaders/svg_loader.so +%{_libdir}/gdk-pixbuf-2.0/*/loaders/svg_loader.so %{_bindir}/rsvg %{_bindir}/rsvg-view %{_bindir}/rsvg-view-2 @@ -187,22 +91,13 @@ gdk-pixbuf-query-loaders-3.0-%{__isa_bits} --update-cache || : %{_libdir}/pkgconfig/librsvg-2.0.pc %doc %{_datadir}/gtk-doc/html/rsvg-2.0 -%files -n librsvg3 -%defattr(-, root, root) -%{_libdir}/librsvg-3.so.* -%{_libdir}/gtk-3.0/*/engines/libsvg.so -%{_libdir}/gtk-3.0/*/loaders/svg_loader.so -%{_bindir}/rsvg-view-3 -%{_bindir}/rsvg-convert-3 - -%files -n librsvg3-devel -%defattr(-, root, root) -%{_libdir}/librsvg-3.so -%{_includedir}/librsvg-3.0 -%{_libdir}/pkgconfig/librsvg-3.0.pc -%doc %{_datadir}/gtk-doc/html/rsvg-3.0 %changelog +* Mon Jun 28 2010 Matthias Clasen - 2.31.0-0.1.20100628git +- Update to a git snapshot that builds against standalone gdk-pixbuf +- Drop librsvg3 package +- Drop svg theme engine + * Fri Jun 11 2010 Bastien Nocera 2.26.3-3 - Add missing scriptlets for librsvg3 - Fix requires for librsvg3-devel package diff --git a/sources b/sources index 53e4de8..460bdc2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8df68c2c02cdf2a96a92b43bf737bf9c librsvg-2.26.3.tar.bz2 +04fe68d54f0a65d51d74e9e4a91ac37b librsvg-2.31.0-20100628git.tar.bz2