X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=librsvg.spec;h=6ac4754e6963033d54e37e60112b0ba4088e529c;hb=c9f09db;hp=e3533cafb0bb98cb1a0216a711eb73d9e6cd13d8;hpb=3ecde336c08e2681f5c0b36d05771105d567c88d;p=packages%2Flibrsvg.git

diff --git a/librsvg.spec b/librsvg.spec
index e3533ca..6ac4754 100644
--- a/librsvg.spec
+++ b/librsvg.spec
@@ -1,11 +1,10 @@
 #
 # Conditional build
-%bcond_without	apidocs		# disable gtk-doc
-%bcond_without	static_libs	# don't build static library
+%bcond_without	static_libs	# static library
 %bcond_without	vala		# Vala API (vala up to 0.38.x already contains librsvg-2.0.vapi)
 
-%define		mver	2.46
-%define		pver	3
+%define		mver	2.54
+%define		pver	0
 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
@@ -17,34 +16,35 @@ Release:	1
 Epoch:		1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/librsvg/%{mver}/%{name}-%{version}.tar.xz
-# Source0-md5:	4fb6d55e13b3faf008a0d8a837e64233
+Source0:	https://download.gnome.org/sources/librsvg/%{mver}/%{name}-%{version}.tar.xz
+# Source0-md5:	22328b7922ab04836959f669ecef1ea7
 Source1:	rsvg
 Patch0:		x32.patch
-Patch1:		%{name}-gtkdoc.patch
-URL:		http://librsvg.sourceforge.net/
-BuildRequires:	autoconf >= 2.50
+URL:		https://wiki.gnome.org/Projects/LibRsvg
+BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	cairo-devel >= 1.16.0
 BuildRequires:	cairo-gobject-devel >= 1.16.0
 BuildRequires:	cargo
 BuildRequires:	docbook-dtd43-xml
+BuildRequires:	docutils
 BuildRequires:	fontconfig-devel
 # pkgconfig(freetype) >= 20.0.14
 BuildRequires:	freetype-devel >= 1:2.8
 BuildRequires:	gdk-pixbuf2-devel >= 2.20
-BuildRequires:	gettext-tools >= 0.19.8
-BuildRequires:	glib2-devel >= 1:2.48.0
+BuildRequires:	gi-docgen
+BuildRequires:	glib2-devel >= 1:2.50.0
 BuildRequires:	gobject-introspection-devel >= 0.10.8
-%{?with_apidocs:BuildRequires:	gtk-doc >= 1.13}
-%{?with_apidocs:BuildRequires:	gtk-doc-automake >= 1.13}
+BuildRequires:	harfbuzz-devel >= 2.0.0
 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:	pango-devel >= 1:1.48.11
 BuildRequires:	pkgconfig
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rust >= 1.34
+BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	rust >= 1.52
 BuildRequires:	sed >= 4.0
 BuildRequires:	tar >= 1:1.22
 %{?with_vala:BuildRequires:	vala >= 2:0.18}
@@ -53,15 +53,18 @@ Requires(post,postun):	/sbin/ldconfig
 Requires:	cairo-gobject >= 1.16.0
 Requires:	freetype >= 1:2.8
 Requires:	gdk-pixbuf2 >= 2.20
-Requires:	glib2 >= 1:2.48.0
+Requires:	glib2 >= 1:2.50.0
+Requires:	harfbuzz >= 2.0.0
 Requires:	libcroco >= 0.6.1
 Requires:	libxml2 >= 1:2.9.0
-Requires:	pango >= 1:1.38.0
-Obsoletes:	browser-plugin-librsvg
-Obsoletes:	librsvg-gtk+2
-Obsoletes:	librsvg-gtk+3
-Obsoletes:	librsvg0
-Obsoletes:	mozilla-plugin-rsvg
+Requires:	pango >= 1:1.48.11
+Obsoletes:	browser-plugin-librsvg < 1:2.15
+Obsoletes:	librsvg-gtk+2 < 1:2.40
+Obsoletes:	librsvg-gtk+3 < 1:2.46
+Obsoletes:	librsvg0 < 2
+Obsoletes:	mozilla-plugin-rsvg < 1:2.16.1
+# rust archs
+ExclusiveArch:	%{x8664} %{ix86} x32 aarch64 armv6hl armv7hl armv7hnl
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # see gdk-pixbuf2.spec for source of these ifdefs
@@ -97,11 +100,11 @@ Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	cairo-gobject-devel >= 1.16.0
 Requires:	freetype-devel >= 1:2.8
 Requires:	gdk-pixbuf2-devel >= 2.20
-Requires:	glib2-devel >= 1:2.48.0
+Requires:	glib2-devel >= 1:2.50.0
 Requires:	libcroco-devel >= 0.6.1
 Requires:	libxml2-devel >= 1:2.9.0
-Requires:	pango-devel >= 1:1.38.0
-Obsoletes:	librsvg0-devel
+Requires:	pango-devel >= 1:1.48.11
+Obsoletes:	librsvg0-devel < 2
 
 %description devel
 This package provides the necessary development libraries and include
@@ -146,9 +149,7 @@ 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.
@@ -160,7 +161,9 @@ Dokumentacja API biblioteki librsvg.
 Summary:	Vala API for librsvg library
 Summary(pl.UTF-8):	API języka Vala do biblioteki librsvg
 Group:		Development/Libraries
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 Requires:	vala >= 2:0.40
+BuildArch:	noarch
 
 %description -n vala-librsvg
 Vala API for librsvg library.
@@ -171,27 +174,26 @@ API języka Vala do biblioteki librsvg.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
-%if %{without apidocs}
-echo 'CLEANFILES=' > gtk-doc.make
-echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
+%ifarch x32
+%{__sed} -i -e 's/test "\?x\?\$cross_compiling"\? = "\?x\?yes"\?/true/' configure.ac
 %endif
 
 %build
-%{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-	%{__enable_disable apidocs gtk-doc} \
+%ifarch x32
+	RUST_TARGET=x86_64-unknown-linux-gnux32 \
+%endif
 	--enable-introspection \
 	--disable-silent-rules \
 	%{__enable_disable static_libs static} \
-	%{?with_vala:--enable-vala} \
-	--with-html-dir=%{_gtkdocdir}/%{name}
+	%{?with_vala:--enable-vala}
+
 %{__make}
 
 %install
@@ -201,12 +203,16 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgconfigdir=%{_pkgconfigdir}
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/*.la
+%if %{with static_libs}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/*.a
+%endif
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/librsvg-2.la
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
 
-%find_lang %{name}
+install -d $RPM_BUILD_ROOT%{_gtkdocdir}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/doc/librsvg $RPM_BUILD_ROOT%{_gtkdocdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -223,7 +229,7 @@ if [ -x %{_bindir}/gdk-pixbuf-query-loaders%{pqext} ]; then
 	%{_bindir}/gdk-pixbuf-query-loaders%{pqext} --update-cache
 fi
 
-%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS
 %attr(755,root,root) %{_bindir}/rsvg
@@ -248,11 +254,9 @@ fi
 %{_libdir}/librsvg-2.a
 %endif
 
-%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/%{name}
-%endif
 
 %if %{with vala}
 %files -n vala-librsvg