diff --git a/env-paths.diff b/env-paths.diff deleted file mode 100644 index 9ffe46b..0000000 --- a/env-paths.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- rsvg.in -+++ rsvg.in -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python - - # - # This python script subsumes the old 'rsvg' C-based command-line program. diff --git a/librsvg-2.35.1.tar.xz b/librsvg-2.35.1.tar.xz deleted file mode 100644 index c66e811..0000000 --- a/librsvg-2.35.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e277659d048aa4f3b19755951795ffabb8596ba0d1f0bc255a5ac780a7455ca -size 501596 diff --git a/librsvg-2.35.2.tar.xz b/librsvg-2.35.2.tar.xz new file mode 100644 index 0000000..524882a --- /dev/null +++ b/librsvg-2.35.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84bf2a293d374711654c4472d7e1ca9e152f6b0f0def050c09b77d9d8dd2354c +size 504780 diff --git a/librsvg.changes b/librsvg.changes index 4f62cec..0a8ff10 100644 --- a/librsvg.changes +++ b/librsvg.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Feb 7 11:17:28 UTC 2012 - vuntz@opensuse.org + +- Update to version 2.35.2: + + Bug fixes. +- Remove xz BuildRequires now that it comes for free in the build + system. +- Add gobject-introspection-devel BuildRequires to build + introspection support: somehow, we never did that earlier. +- Drop env-paths.diff: the script that was patched got dropped. +- Remove definition of gtk3-engine-svg subpackage: the gtk+ 3 theme + engine got removed. +- Remove build_gtk3_support macro and always build with GTK+ 3 + support now that it's all fine. +- Add hack in %install to not install data files for an old + non-working GTK+ 3 theme. + ------------------------------------------------------------------- Tue Dec 20 09:43:35 UTC 2011 - vuntz@opensuse.org diff --git a/librsvg.spec b/librsvg.spec index fb7af2a..108bb33 100644 --- a/librsvg.spec +++ b/librsvg.spec @@ -1,7 +1,7 @@ # # spec file for package librsvg # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,11 +14,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# -%define build_gtk3_support 0 Name: librsvg -Version: 2.35.1 +Version: 2.35.2 Release: 0 Summary: A Library for Rendering SVG Data License: LGPL-2.0+ ; GPL-2.0+ @@ -28,18 +26,14 @@ Source: http://download.gnome.org/sources/librsvg/2.35/%{name}-%{version Source99: baselibs.conf # PATCH-FIX-OPENSUSE librsvg-gdk-pixbuf-query-loaders-64.patch vuntz@opensuse.org -- Fix check for gdk-pixbuf-query-loaders on 64bit systems Patch0: librsvg-gdk-pixbuf-query-loaders-64.patch -Patch1: env-paths.diff BuildRequires: automake -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz +BuildRequires: gobject-introspection-devel BuildRequires: pkgconfig(cairo) >= 1.2.0 BuildRequires: pkgconfig(gdk-pixbuf-2.0) -BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-2.0) >= 2.24.0 +BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) -%if %{build_gtk3_support} BuildRequires: pkgconfig(gtk+-3.0) -%endif BuildRequires: pkgconfig(libcroco-0.6) BuildRequires: pkgconfig(libxml-2.0) >= 2.7.0 BuildRequires: pkgconfig(pangocairo) >= 1.16.0 @@ -108,17 +102,6 @@ Group: System/Libraries %description -n gtk2-engine-svg This package provides a librsvg-based GTK+ 2 theme engine. -%if %{build_gtk3_support} - -%package -n gtk3-engine-svg -Summary: SVG-based GTK+ 3 Theme Engine -License: LGPL-2.0+ -Group: System/Libraries - -%description -n gtk3-engine-svg -This package provides a librsvg-based GTK+ 3 theme engine. -%endif - %package -n rsvg-view Summary: SVG View using the GNOME Render SVG library License: LGPL-2.0+ @@ -137,7 +120,6 @@ http://www.w3c.org). # don't have configure auto-regenerated touch aclocal.m4 %endif -%patch1 %build %configure\ @@ -148,6 +130,8 @@ make %{?jobs:-j%jobs} %install %makeinstall find %{buildroot} -type f -name "*.la" -delete -print +# Do not install data files for GTK+ 3 theme that we don't have (bgo#669563) +rm -r %{buildroot}%{_datadir}/themes/bubble/gtk-3.0 %clean rm -rf $RPM_BUILD_ROOT @@ -177,23 +161,10 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/themes/bubble %{_datadir}/themes/bubble/gtk-2.0/ -%if %{build_gtk3_support} - -%files -n gtk3-engine-svg -%defattr(-,root,root) -%{_libdir}/gtk-3.0/*/engines/libsvg-3.so -%dir %{_datadir}/themes/bubble -%{_datadir}/themes/bubble/gtk-3.0/ -%endif - %files -n rsvg-view %defattr(-,root,root) -%{_bindir}/rsvg %{_bindir}/rsvg-convert -%{_bindir}/rsvg-view -%if %{build_gtk3_support} %{_bindir}/rsvg-view-3 -%endif %doc %{_mandir}/man?/rsvg.1* %files devel