X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=librsvg.spec;h=e5dd1630d5284ac52afd1c862e9436e9a2a35bf1;hb=fc65f7f1cf360e29b7e44b9835dece9805ad9dbc;hp=635880397f18649e09520522ca854d72c35504ec;hpb=2f3c2c7657d4ef9c56a508600d7ba74112be1ead;p=packages%2Flibrsvg.git

diff --git a/librsvg.spec b/librsvg.spec
index 6358803..e5dd163 100644
--- a/librsvg.spec
+++ b/librsvg.spec
@@ -1,55 +1,72 @@
 #
 # Conditional build
 %bcond_without	apidocs		# disable gtk-doc
-%bcond_without	libgsf		# build without libgsf (used for run-time decompression)
-%bcond_without	libcroco	# build without CSS support through libcroco
+%bcond_without	gtk2		# legacy gtk+2 support
 %bcond_without	static_libs	# don't build static library
-#
+%bcond_without	vala		# Vala API (vala up to 0.38.x already contains librsvg-2.0.vapi)
+
+%define		mver	2.44
+%define		pver	12
 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:	2.26.0
+Version:	%{mver}.%{pver}
 Release:	1
 Epoch:		1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.26/%{name}-%{version}.tar.bz2
-# Source0-md5:	65dbd726a514fe8b797d26254b8efc1e
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/librsvg/%{mver}/%{name}-%{version}.tar.xz
+# Source0-md5:	300f6a5981323c9ac2b65a98d24c7005
+Source1:	rsvg
+Patch0:		x32.patch
 URL:		http://librsvg.sourceforge.net/
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	glib2-devel >= 1:2.16.0
-BuildRequires:	gtk+2-devel >= 2:2.12.8
-%{?with_apidocs:BuildRequires:	gtk-doc-automake}
-%{?with_apidocs:BuildRequires:	gtk-doc >= 1.8}
-%{?with_libcroco:BuildRequires:	libcroco-devel >= 0.6.1}
-%{?with_libgsf:BuildRequires:	libgsf-devel >= 1.14.4}
-BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:2.6.31
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	cairo-devel >= 1.15.12
+BuildRequires:	cargo
+BuildRequires:	docbook-dtd412-xml
+# pkgconfig(freetype) >= 20.0.14
+BuildRequires:	freetype-devel >= 1:2.8
+BuildRequires:	gdk-pixbuf2-devel >= 2.20
+BuildRequires:	glib2-devel >= 1:2.48.0
+BuildRequires:	gobject-introspection-devel >= 0.10.8
+%{?with_gtk2:BuildRequires:	gtk+2-devel >= 2:2.16.0}
+BuildRequires:	gtk+3-devel >= 3.10.0
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.13}
+%{?with_apidocs:BuildRequires:	gtk-doc-automake >= 1.13}
+BuildRequires:	libcroco-devel >= 0.6.1
+BuildRequires:	libtool >= 2:2.0
+BuildRequires:	libxml2-devel >= 1:2.9.0
+BuildRequires:	pango-devel >= 1:1.38.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rust >= 1.27
+BuildRequires:	sed >= 4.0
+BuildRequires:	tar >= 1:1.22
+%{?with_vala:BuildRequires:	vala >= 2:0.18}
+BuildRequires:	xz
 Requires(post,postun):	/sbin/ldconfig
-Requires(post,postun):	gtk+2
-Requires:	glib2 >= 1:2.16.0
-Requires:	gtk+2 >= 2:2.12.8
-%{?with_libcroco:Requires:	libcroco >= 0.6.1}
-%{?with_libgsf:Requires:	libgsf >= 1.14.4}
-Requires:	libxml2 >= 1:2.6.31
+Requires:	cairo >= 1.15.12
+Requires:	freetype >= 1:2.8
+Requires:	gdk-pixbuf2 >= 2.20
+Requires:	glib2 >= 1:2.48.0
+Requires:	libcroco >= 0.6.1
+Requires:	libxml2 >= 1:2.9.0
+Requires:	pango >= 1:1.38.0
 Obsoletes:	browser-plugin-librsvg
-Obsoletes:	mozilla-plugin-rsvg
+Obsoletes:	librsvg-gtk+2
 Obsoletes:	librsvg0
+Obsoletes:	mozilla-plugin-rsvg
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# see gtk+2.spec for source of these ifdefs
+# see gdk-pixbuf2.spec for source of these ifdefs
 %if "%{_lib}" != "lib"
 %define         libext          %(lib="%{_lib}"; echo ${lib#lib})
-%define         gtketcdir	/etc/gtk%{libext}-2.0
 %define         pqext           -%{libext}
 %else
-%define         gtketcdir	/etc/gtk-2.0
 %define         pqext           %{nil}
 %endif
 
@@ -75,11 +92,14 @@ Summary(ru.UTF-8):	Библиотечные линки и файлы загол
 Summary(uk.UTF-8):	Бібліотечні лінки та файли заголовків для розробки з librsvg
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	glib2-devel >= 1:2.16.0
-Requires:	gtk+2-devel >= 2:2.12.8
-%{?with_libcroco:Requires:	libcroco-devel >= 0.6.1}
-%{?with_libgsf:Requires:	libgsf-devel >= 1.14.4}
-Requires:	libxml2-devel >= 1:2.6.31
+Requires:	cairo-devel >= 1.15.12
+Requires:	freetype-devel >= 1:2.8
+Requires:	gdk-pixbuf2-devel >= 2.20
+Requires:	glib2-devel >= 1:2.48.0
+Requires:	gtk+3-devel >= 3.10.0
+Requires:	libcroco-devel >= 0.6.1
+Requires:	libxml2-devel >= 1:2.9.0
+Requires:	pango-devel >= 1:1.38.0
 Obsoletes:	librsvg0-devel
 
 %description devel
@@ -125,6 +145,9 @@ Summary:	librsvg API documentation
 Summary(pl.UTF-8):	Dokumentacja API biblioteki librsvg
 Group:		Documentation
 Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 librsvg API documentation.
@@ -132,26 +155,53 @@ librsvg API documentation.
 %description apidocs -l pl.UTF-8
 Dokumentacja API biblioteki librsvg.
 
+%package -n vala-librsvg
+Summary:	Vala API for librsvg library
+Summary(pl.UTF-8):	API języka Vala do biblioteki librsvg
+Group:		Development/Libraries
+Requires:	vala >= 2:0.40
+
+%description -n vala-librsvg
+Vala API for librsvg library.
+
+%description -n vala-librsvg -l pl.UTF-8
+API języka Vala do biblioteki librsvg.
+
+%package gtk+3
+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.10.0
+
+%description gtk+3
+librsvg/GTK+3 based SVG viewer.
+
+%description gtk+3 -l pl.UTF-8
+Przeglądarka plików SVG oparta na bibliotekach librsvg/GTK+3.
+
 %prep
 %setup -q
+%patch0 -p1
 
-%if !%{with apidocs}
+%if %{without apidocs}
 echo 'CLEANFILES=' > gtk-doc.make
 echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
 %endif
 
 %build
+%{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-	--disable-mozilla-plugin \
-	%{!?with_static_libs:--disable-static} \
-	%{?with_apidocs:--enable-gtk-doc} \
-	%{!?with_libcroco:--without-croco} \
-	%{!?with_libgsf:--without-svgz} \
+	%{__enable_disable apidocs gtk-doc} \
+	--enable-introspection \
+	--disable-silent-rules \
+	%{__enable_disable static_libs static} \
+	%{?with_vala:--enable-vala} \
 	--with-html-dir=%{_gtkdocdir}/%{name}
 %{__make}
 
@@ -162,7 +212,12 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgconfigdir=%{_pkgconfigdir}
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.*/{engines,loaders}/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/librsvg-2.la
+
+%{__ln_s} rsvg-view-3 $RPM_BUILD_ROOT%{_bindir}/rsvg-view
+
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -170,34 +225,33 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 umask 022
-%{_bindir}/gdk-pixbuf-query-loaders%{pqext} > %{gtketcdir}/gdk-pixbuf.loaders
+%{_bindir}/gdk-pixbuf-query-loaders%{pqext} --update-cache || :
 
 %postun
 /sbin/ldconfig
 umask 022
 if [ -x %{_bindir}/gdk-pixbuf-query-loaders%{pqext} ]; then
-	%{_bindir}/gdk-pixbuf-query-loaders%{pqext} > %{gtketcdir}/gdk-pixbuf.loaders
+	%{_bindir}/gdk-pixbuf-query-loaders%{pqext} --update-cache
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog AUTHORS NEWS
+%doc AUTHORS NEWS
 %attr(755,root,root) %{_bindir}/rsvg
 %attr(755,root,root) %{_bindir}/rsvg-convert
-%attr(755,root,root) %{_bindir}/rsvg-view
 %attr(755,root,root) %{_libdir}/librsvg-2.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/librsvg-2.so.2
-%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/engines/libsvg.so
-%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/loaders/svg_loader.so
-%{_mandir}/man1/rsvg.1*
-%{_pixmapsdir}/svg-viewer.svg
+%{_libdir}/girepository-1.0/Rsvg-2.0.typelib
+%attr(755,root,root) %{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/libpixbufloader-svg.so
+%{_datadir}/thumbnailers/librsvg.thumbnailer
+%{_mandir}/man1/rsvg-convert.1*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/librsvg-2.so
-%{_libdir}/librsvg-2.la
+%{_includedir}/librsvg-2.0
+%{_datadir}/gir-1.0/Rsvg-2.0.gir
 %{_pkgconfigdir}/librsvg-2.0.pc
-%{_includedir}/librsvg-2
 
 %if %{with static_libs}
 %files static
@@ -210,3 +264,14 @@ fi
 %defattr(644,root,root,755)
 %{_gtkdocdir}/%{name}
 %endif
+
+%if %{with vala}
+%files -n vala-librsvg
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/librsvg-2.0.vapi
+%endif
+
+%files gtk+3
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/rsvg-view
+%attr(755,root,root) %{_bindir}/rsvg-view-3