X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=librsvg.spec;h=efd08ccb3e3d2d3f49d34fcadcd6e1771dcd60e4;hb=29233d8a61c4e27558a624f1bd7f1719a346b458;hp=7b27a0bf2b2cdb4f50f8b9445add7b794327437c;hpb=ce5e5ed3b11c731ac7e97fd37333c734b4b59df1;p=packages%2Flibrsvg.git

diff --git a/librsvg.spec b/librsvg.spec
index 7b27a0b..efd08cc 100644
--- a/librsvg.spec
+++ b/librsvg.spec
@@ -4,55 +4,53 @@
 %bcond_without	gtk2		# legacy gtk+2 support
 %bcond_without	libcroco	# build without CSS support through libcroco
 %bcond_without	static_libs	# don't build static library
-#
-
-%define		ver	2.36
-%define		pver	4
 
+%define		mver	2.40
+%define		pver	2
 Summary:	A Raph's Library for Rendering SVG Data
 Summary(pl.UTF-8):	Biblioteka Raph's SVG do renderowania danych SVG
 Summary(pt_BR.UTF-8):	Biblioteca SVG
 Summary(ru.UTF-8):	SVG библиотека
 Summary(uk.UTF-8):	SVG бібліотека
 Name:		librsvg
-Version:	%{ver}.%{pver}
+Version:	%{mver}.%{pver}
 Release:	1
 Epoch:		1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/librsvg/%{ver}/%{name}-%{version}.tar.xz
-# Source0-md5:	3c94524c8ccf668e30b236f409239f54
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/librsvg/%{mver}/%{name}-%{version}.tar.xz
+# Source0-md5:	acdecdb9f08f3bf662a68bf7dafb8b82
 Source1:	rsvg
 URL:		http://librsvg.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	cairo-devel >= 1.2.0
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	gdk-pixbuf2-devel >= 2.0
+BuildRequires:	gdk-pixbuf2-devel >= 2.20
 BuildRequires:	glib2-devel >= 1:2.24.0
 BuildRequires:	gobject-introspection-devel >= 0.10.8
 %{?with_gtk2:BuildRequires:	gtk+2-devel >= 2:2.16.0}
-BuildRequires:	gtk+3-devel >= 3.0.0
+BuildRequires:	gtk+3-devel >= 3.2.0
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.13}
 %{?with_apidocs:BuildRequires:	gtk-doc-automake >= 1.13}
 %{?with_libcroco:BuildRequires:	libcroco-devel >= 0.6.1}
 BuildRequires:	libtool >= 2:2.0
 BuildRequires:	libxml2-devel >= 1:2.7.0
-BuildRequires:	pango-devel >= 1:1.16.0
+BuildRequires:	pango-devel >= 1:1.32.6
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-pythonprov
 BuildRequires:	sed >= 4.0
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Requires(post,postun):	/sbin/ldconfig
-Requires(post,postun):	gdk-pixbuf2 >= 2.0
 Requires:	cairo >= 1.2.0
-Requires:	gdk-pixbuf2 >= 2.0
+Requires:	gdk-pixbuf2 >= 2.20
 Requires:	glib2 >= 1:2.24.0
 %{?with_libcroco:Requires:	libcroco >= 0.6.1}
 Requires:	libxml2 >= 1:2.7.0
-Requires:	pango >= 1:1.16.0
+Requires:	pango >= 1:1.32.6
 Obsoletes:	browser-plugin-librsvg
+Obsoletes:	librsvg-gtk+2
 Obsoletes:	librsvg0
 Obsoletes:	mozilla-plugin-rsvg
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -88,12 +86,12 @@ Summary(uk.UTF-8):	Бібліотечні лінки та файли загол
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	cairo-devel >= 1.2.0
-Requires:	gdk-pixbuf2-devel >= 2.0
+Requires:	gdk-pixbuf2-devel >= 2.20
 Requires:	glib2-devel >= 1:2.24.0
-Requires:	gtk+3-devel >= 3.0.0
+Requires:	gtk+3-devel >= 3.2.0
 %{?with_libcroco:Requires:	libcroco-devel >= 0.6.1}
 Requires:	libxml2-devel >= 1:2.7.0
-Requires:	pango-devel >= 1:1.16.0
+Requires:	pango-devel >= 1:1.32.6
 Obsoletes:	librsvg0-devel
 
 %description devel
@@ -146,32 +144,18 @@ librsvg API documentation.
 %description apidocs -l pl.UTF-8
 Dokumentacja API biblioteki librsvg.
 
-%package gtk+2
-Summary:	librsvg/GTK+2 based SVG theme engine and viewer
-Summary(pl.UTF-8):	Silnik motywów oraz przeglądarka plików SVG oparte na bibliotekach librsvg/GTK+2
-Group:		X11/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	gtk+2 >= 2:2.16.0
-
-%description gtk+2
-librsvg/GTK+2 based SVG theme engine and viewer.
-
-%description gtk+2 -l pl.UTF-8
-Silnik motywów oraz przeglądarka plików SVG oparte na bibliotekach
-librsvg/GTK+2.
-
 %package gtk+3
-Summary:	librsvg/GTK+3 based SVG theme and viewer
-Summary(pl.UTF-8):	Motyw i przeglądarka plików SVG oparte na bibliotekach librsvg/GTK+3
-Group:		X11/Libraries
+Summary:	librsvg/GTK+3 based SVG viewer
+Summary(pl.UTF-8):	Przeglądarka plików SVG oparta na bibliotekach librsvg/GTK+3
+Group:		X11/Applications/Graphics
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	gtk+3 >= 3.0.0
+Requires:	gtk+3 >= 3.2.0
 
 %description gtk+3
-librsvg/GTK+3 based SVG theme and viewer.
+librsvg/GTK+3 based SVG viewer.
 
 %description gtk+3 -l pl.UTF-8
-Motyw i przeglądarka plików SVG oparte na bibliotekach librsvg/GTK+3.
+Przeglądarka plików SVG oparta na bibliotekach librsvg/GTK+3.
 
 %prep
 %setup -q
@@ -182,7 +166,7 @@ echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
 %endif
 
 # vala not ready yet here
-echo 'AC_DEFUN([VAPIGEN_CHECK],[AM_CONDITIONAL([ENABLE_VAPIGEN], [false])])' >> acinclude.m4
+#echo 'AC_DEFUN([VAPIGEN_CHECK],[AM_CONDITIONAL([ENABLE_VAPIGEN], [false])])' >> acinclude.m4
 
 %build
 mkdir m4
@@ -208,7 +192,6 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgconfigdir=%{_pkgconfigdir}
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.*/engines/*.{la,a}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/*.{la,a}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/librsvg-2.la
 
@@ -240,7 +223,6 @@ fi
 %attr(755,root,root) %ghost %{_libdir}/librsvg-2.so.2
 %{_libdir}/girepository-1.0/Rsvg-2.0.typelib
 %attr(755,root,root) %{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/libpixbufloader-svg.so
-%dir %{_datadir}/themes/bubble
 %{_mandir}/man1/rsvg-convert.1*
 
 %files devel
@@ -262,14 +244,7 @@ fi
 %{_gtkdocdir}/%{name}
 %endif
 
-%if %{with gtk2}
-%files gtk+2
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/engines/libsvg.so
-%{_datadir}/themes/bubble/gtk-2.0
-%endif
-
 %files gtk+3
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/rsvg-view-3
 %attr(755,root,root) %{_bindir}/rsvg-view
+%attr(755,root,root) %{_bindir}/rsvg-view-3