X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=librsvg.spec;h=f621e1748d37101cbf9b22ac6b86e26b49246c63;hb=4983a7a928034bc52ec87245cf15d81ef6a4ec58;hp=6871b833373792f4bdf55cfff865ee4f46a465ea;hpb=27f39052a9479c4ddce522413e877a44f1b2f1dc;p=packages%2Flibrsvg.git

diff --git a/librsvg.spec b/librsvg.spec
index 6871b83..f621e17 100644
--- a/librsvg.spec
+++ b/librsvg.spec
@@ -1,5 +1,3 @@
-# TODO
-# - check what browsers can be supported by browser plugin
 #
 # Conditional build
 %bcond_without	apidocs		# disable gtk-doc
@@ -7,160 +5,151 @@
 %bcond_without	libcroco	# build without CSS support through libcroco
 %bcond_without	gnomeprint	# build without gnome-print support in viewer
 %bcond_without	gnomevfs	# build without gnome-vfs support
-%bcond_without	mozilla		# do not build mozilla plugin
+%bcond_without	gnome		# disable gnomeprint and gnomevfs
 #
+%if %{without gnome}
+%undefine	with_gnomeprint
+%undefine	with_gnomevfs
+%endif
 Summary:	A Raph's Library for Rendering SVG Data
-Summary(pl):	Biblioteka Raph's SVG do renderowania danych SVG
-Summary(pt_BR):	Biblioteca SVG
-Summary(ru):	SVG ÂÉÂÌÉÏÔÅËÁ
-Summary(uk):	SVG ¦Â̦ÏÔÅËÁ
+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.14.4
-Release:	1
+Version:	2.18.2
+Release:	2
 Epoch:		1
 License:	LGPL v2+
-Vendor:		GNOME
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/librsvg/2.14/%{name}-%{version}.tar.bz2
-# Source0-md5:	945617bb094975d7353a3852302297c1
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.18/%{name}-%{version}.tar.bz2
+# Source0-md5:	4691ad687281e943260021272c28043e
 URL:		http://librsvg.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	cairo-devel >= 1.0.2
-BuildRequires:	gtk+2-devel >= 2:2.8.6
-%{?with_apidocs:BuildRequires:	gtk-doc >= 0.9}
-%{?with_gnomevfs:BuildRequires:	gnome-vfs2-devel >= 2.10.0-2}
+BuildRequires:	cairo-devel >= 1.2.4
+BuildRequires:	glib2-devel >= 1:2.12.13
+BuildRequires:	gtk+2-devel >= 2:2.10.14
+BuildRequires:	gtk-doc-automake
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.8}
+%{?with_gnomevfs:BuildRequires:	gnome-vfs2-devel >= 2.18.0}
 %{?with_libcroco:BuildRequires:	libcroco-devel >= 0.6.1}
-%{?with_gnomeprint:BuildRequires:	libgnomeprintui-devel >= 2.12.1}
-%{?with_libgsf:BuildRequires:	libgsf-devel >= 1.13.2}
+%{?with_gnomeprint:BuildRequires:	libgnomeprintui-devel >= 2.18.0}
+%{?with_libgsf:BuildRequires:	libgsf-devel >= 1.14.4}
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:2.6.22
-%{?with_mozilla:BuildRequires:	mozilla-devel}
-%{?with_mozilla:BuildRequires:	rpmbuild(macros) >= 1.236}
-BuildRequires:	popt-devel >= 1.5
+BuildRequires:	libxml2-devel >= 1:2.6.28
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-pythonprov
-%{!?with_gnomeprint:BuildConflicts:	libgnomeprintui-devel}
 Requires(post,postun):	gtk+2
-Requires:	cairo >= 1.0.2
-Requires:	gtk+2 >= 2:2.8.6
+Requires:	cairo >= 1.2.4
+Requires:	glib2 >= 1:2.12.13
+Requires:	gtk+2 >= 2:2.10.14
 %{?with_libcroco:Requires:	libcroco >= 0.6.1}
-%{?with_libgsf:Requires:	libgsf >= 1.13.2}
-Requires:	libxml2 >= 1:2.6.22
-Requires:	popt >= 1.5
+%{?with_libgsf:Requires:	libgsf >= 1.14.4}
+Requires:	libxml2 >= 1:2.6.28
+Obsoletes:	browser-plugin-librsvg
+Obsoletes:	mozilla-plugin-rsvg
 Obsoletes:	librsvg0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_plugindir	%{_libdir}/browser-plugins
-
-# list of supported browsers, in free form text
-%define		browsers	mozilla, mozilla-firefox, netscape, seamonkey
-
 %description
 An library to render SVG (scalable vector graphics), databased upon libart.
 
-%description -l pl
+%description -l pl.UTF-8
 Biblioteka do renderowania SVG (skalowalnej grafiki wektorowej) oparta
 na kodzie libart.
 
-%description -l pt_BR
-Biblioteca de Extensão da Eazel.
+%description -l pt_BR.UTF-8
+Biblioteca de Extensão da Eazel.
 
-%description -l ru
-âÉÂÌÉÏÔÅËÁ SVG, ÂÁÚÉÒÕÀÝÁÑÓÑ ÎÁ libart.
+%description -l ru.UTF-8
+Библиотека SVG, базирующаяся на libart.
 
-%description -l uk
-â¦Â̦ÏÔÅËÁ SVG, ÂÁÚÏ×ÁÎÁ ÎÁ libart.
+%description -l uk.UTF-8
+Бібліотека SVG, базована на libart.
 
 %package devel
 Summary:	Include files for developing with librsvg
-Summary(pl):	Pliki nag³ówkowe do tworzenia oprogramowania z u¿yciem librsvg
-Summary(pt_BR):	Bibliotecas e arquivos de inclusão para desenvolvimento com a librsvg
-Summary(ru):	âÉÂÌÉÏÔÅÞÎÙÅ ÌÉÎËÉ É ÆÁÊÌÙ ÚÁÇÏÌÏ×ËÏ× ÄÌÑ ÒÁÚÒÁÂÏÔËÉ Ó librsvg
-Summary(uk):	â¦Â̦ÏÔÅÞΦ ̦ÎËÉ ÔÁ ÆÁÊÌÉ ÚÁÇÏÌÏ×Ë¦× ÄÌÑ ÒÏÚÒÏÂËÉ Ú librsvg
+Summary(pl.UTF-8):	Pliki nagłówkowe do tworzenia oprogramowania z użyciem librsvg
+Summary(pt_BR.UTF-8):	Bibliotecas e arquivos de inclusão para desenvolvimento com a librsvg
+Summary(ru.UTF-8):	Библиотечные линки и файлы заголовков для разработки с librsvg
+Summary(uk.UTF-8):	Бібліотечні лінки та файли заголовків для розробки з librsvg
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-%{?with_gnomevfs:Requires:	gnome-vfs2-devel >= 2.10.0-2}
-Requires:	gtk+2-devel >= 2:2.8.6
-Requires:	libart_lgpl-devel >= 2.3.15
-%{?with_libcroco:Requires:	libcroco-devel >= 0.6.0}
-%{?with_libgsf:Requires:	libgsf-devel >= 1.13.2}
-Requires:	libxml2-devel >= 2.6.22
+Requires:	glib2 >= 1:2.12.13
+%{?with_gnomevfs:Requires:	gnome-vfs2-devel >= 2.18.0}
+Requires:	gtk+2-devel >= 2:2.10.14
+Requires:	libart_lgpl-devel >= 2.3.17
+%{?with_libcroco:Requires:	libcroco-devel >= 0.6.1}
+%{?with_libgsf:Requires:	libgsf-devel >= 1.14.4}
+Requires:	libxml2-devel >= 2.6.28
 Obsoletes:	librsvg0-devel
 
 %description devel
 This package provides the necessary development libraries and include
 files to allow you to develop with librsvg.
 
-%description devel -l pl
-Pakiet zawiera pliki nag³ówkowe potrzebne do tworzenia oprogramowania
+%description devel -l pl.UTF-8
+Pakiet zawiera pliki nagłówkowe potrzebne do tworzenia oprogramowania
 z wykorzystaniem librsvg.
 
-%description devel -l pt_BR
-Este pacote contém os arquivos necessários para desenvolver com base
+%description devel -l pt_BR.UTF-8
+Este pacote contém os arquivos necessários para desenvolver com base
 na biblioteca librsvg.
 
-%description devel -l ru
-üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÎÅÏÂÈÏÄÉÍÙÅ ÆÁÊÌÙ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ Ó
-ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ librsvg.
+%description devel -l ru.UTF-8
+Этот пакет содержит необходимые файлы для разработки программ с
+использованием librsvg.
 
-%description devel -l uk
-ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÎÅÏÂȦÄΦ ÆÁÊÌÉ ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ
+%description devel -l uk.UTF-8
+Цей пакет містить необхідні файли для розробки програм з використанням
 librsvg.
 
 %package static
 Summary:	Static libraries for developing with librsvg
-Summary(es):	Archivos estáticos necesarios para el desarrollo de aplicaciones con librsvg
-Summary(pl):	Statyczne biblioteki librsvg
-Summary(pt_BR):	Arquivos estáticos necessários para o desenvolvimento de aplicações com librsvg
+Summary(es.UTF-8):	Archivos estáticos necesarios para el desarrollo de aplicaciones con librsvg
+Summary(pl.UTF-8):	Statyczne biblioteki librsvg
+Summary(pt_BR.UTF-8):	Arquivos estáticos necessários para o desenvolvimento de aplicações com librsvg
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 This package contains static version of librsvg libraries.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Statyczna wersja bibliotek librsvg.
 
-%description static -l pt_BR
-Bibliotecas estáticas para o desenvolvimento de aplicações com
+%description static -l pt_BR.UTF-8
+Bibliotecas estáticas para o desenvolvimento de aplicações com
 librsvg.
 
-%package -n browser-plugin-%{name}
-Summary:	SVG browse plugin using librsvg
-Summary(pl):	Wtyczka SVG do przegl±darski WWW wykorzystuj±ca librsvg
-Group:		X11/Applications/Multimedia
-Requires:	browser-plugins(%{_target_base_arch})
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Provides:	mozilla-plugin-rsvg
-Obsoletes:	mozilla-plugin-rsvg
-
-%description -n browser-plugin-%{name}
-This plugin allows Mozilla-family browsers to view Scalable Vector
-Graphics content using librsvg.
-
-Supported browsers: %{browsers}.
+%package apidocs
+Summary:	librsvg API documentation
+Summary(pl.UTF-8):	Dokumentacja API biblioteki librsvg
+Group:		Documentation
+Requires:	gtk-doc-common
 
-%description -n browser-plugin-%{name} -l pl
-Ta wtyczka pozwala na ogl±danie grafiki w formacie SVG (Scalable
-Vector Graphics) w przegl±darkach z rodziny Mozilli.
+%description apidocs
+librsvg API documentation.
 
-Obs³ugiwane przegl±darki: %{browsers}.
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki librsvg.
 
 %prep
 %setup -q
 
 %build
-%{!?with_mozilla:export MOZILLA_CONFIG=no}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure \
-	%{!?with_libcroco:--without-croco} \
-	%{!?with_libgsf:--without-svgz} \
 	%{!?with_gnomevfs:--disable-gnome-vfs} \
+	%{!?with_gnomeprint:--disable-gnome-print} \
+	--disable-mozilla-plugin \
 	%{?with_apidocs:--enable-gtk-doc} \
+	%{!?with_libcroco:--without-croco} \
+	%{!?with_libgsf:--without-svgz} \
 	--with-html-dir=%{_gtkdocdir}/%{name}
 %{__make}
 
@@ -169,11 +158,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	plugindir=%{_plugindir} \
 	pkgconfigdir=%{_pkgconfigdir}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.*/{engines,loaders}/*.{la,a}
-rm -f $RPM_BUILD_ROOT%{_plugindir}/*.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -188,59 +175,29 @@ gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
 umask 022
 gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
 
-%triggerin -n browser-plugin-%{name} -- mozilla
-%nsplugin_install -d %{_libdir}/mozilla/plugins libmozsvgdec.so
-
-%triggerun -n browser-plugin-%{name} -- mozilla
-%nsplugin_uninstall -d %{_libdir}/mozilla/plugins libmozsvgdec.so
-
-%triggerin -n browser-plugin-%{name} -- mozilla-firefox
-%nsplugin_install -d %{_libdir}/mozilla-firefox/plugins libmozsvgdec.so
-
-%triggerun -n browser-plugin-%{name} -- mozilla-forefox
-%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins libmozsvgdec.so
-
-%triggerin -n browser-plugin-%{name} -- netscape-common
-%nsplugin_install -d %{_libdir}/netscape/plugins libmozsvgdec.so
-
-%triggerun -n browser-plugin-%{name} -- netscape-common
-%nsplugin_uninstall -d %{_libdir}/netscape/plugins libmozsvgdec.so
-
-%triggerin -n browser-plugin-%{name} -- seamonkey
-%nsplugin_install -d %{_libdir}/seamonkey/plugins libmozsvgdec.so
-
-%triggerun -n browser-plugin-%{name} -- seamonkey
-%nsplugin_uninstall -d %{_libdir}/seamonkey/plugins libmozsvgdec.so
-
-# as rpm removes the old obsoleted package files after the triggers
-# are ran, add another trigger to make the links there.
-%triggerpostun -n browser-plugin-%{name} -- mozilla-plugin-rsvg
-%nsplugin_install -f -d %{_libdir}/mozilla/plugins libmozsvgdec.so
-
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog AUTHORS NEWS
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_bindir}/rsvg*
+%attr(755,root,root) %{_libdir}/librsvg-2.so.*.*.*
 %attr(755,root,root) %{_libdir}/gtk-2.0/2.*/engines/*.so
 %attr(755,root,root) %{_libdir}/gtk-2.0/2.*/loaders/*.so
 %{_mandir}/man1/rsvg.1*
-%{_pixmapsdir}/*
+%{_pixmapsdir}/svg-viewer.svg
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_pkgconfigdir}/*.pc
+%attr(755,root,root) %{_libdir}/librsvg-2.so
+%{_libdir}/librsvg-2.la
+%{_pkgconfigdir}/librsvg-2.0.pc
 %{_includedir}/librsvg-2
-%{_gtkdocdir}/%{name}
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/librsvg-2.a
 
-%if %{with mozilla}
-%files -n browser-plugin-%{name}
+%if %{with apidocs}
+%files apidocs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_plugindir}/*.so
+%{_gtkdocdir}/%{name}
 %endif