Author: baggins Date: Mon May 15 15:10:52 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - merged from HEAD
---- Files affected: SPECS: librsvg.spec (1.98.2.2 -> 1.98.2.3) ---- Diffs: ================================================================ Index: SPECS/librsvg.spec diff -u SPECS/librsvg.spec:1.98.2.2 SPECS/librsvg.spec:1.98.2.3 --- SPECS/librsvg.spec:1.98.2.2 Sun May 14 15:50:04 2006 +++ SPECS/librsvg.spec Mon May 15 17:10:47 2006 @@ -3,6 +3,7 @@ # - check what browsers can be supported by browser plugin # # 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 gnomeprint # build without gnome-print support in viewer @@ -15,22 +16,22 @@ Summary(ru): SVG ÂÉÂĚÉĎÔĹËÁ Summary(uk): SVG ÂŚÂĚŚĎÔĹËÁ Name: librsvg -Version: 2.12.7 -Release: 4 +Version: 2.14.3 +Release: 2 Epoch: 1 License: LGPL v2+ Vendor: GNOME Group: Libraries -Source0: http://ftp.gnome.org/pub/gnome/sources/librsvg/2.12/%{name}-%{version}.tar.bz2 -# Source0-md5: 2113f01fbf228f3f8fc17c49966143fe +Source0: http://ftp.gnome.org/pub/gnome/sources/librsvg/2.14/%{name}-%{version}.tar.bz2 +# Source0-md5: f926aa102ccc3ce99ddf257fcce8ebf4 URL: http://librsvg.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: cairo-devel >= 1.0.2 BuildRequires: gtk+2-devel >= 2:2.8.6 -BuildRequires: gtk-doc >= 0.9 +%{?with_apidocs:BuildRequires: gtk-doc >= 0.9} %{?with_gnomevfs:BuildRequires: gnome-vfs2-devel >= 2.10.0-2} -BuildRequires: libart_lgpl-devel >= 2.3.15 -%{?with_libcroco:BuildRequires: libcroco-devel >= 0.6.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} BuildRequires: libtool @@ -42,11 +43,12 @@ BuildRequires: xcursor-devel BuildRequires: xft-devel BuildRequires: xrender-devel +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: libart_lgpl >= 2.3.15 -%{?with_libcroco:Requires: libcroco >= 0.6.0} +%{?with_libcroco:Requires: libcroco >= 0.6.1} %{?with_libgsf:Requires: libgsf >= 1.13.2} Requires: libxml2 >= 1:2.6.22 Requires: popt >= 1.5 @@ -146,14 +148,11 @@ Ta wtyczka pozwala na oglądanie grafiki w formacie SVG (Scalable Vector Graphics) w przeglądarkach z rodziny Mozilli. -Supported browsers: %{browsers}. +Obsługiwane przeglądarki: %{browsers}. %prep %setup -q -# obsolete macro (defined as empty in gnome-common) -%{__perl} -pi -e 's/GNOME_REQUIRE_PKGCONFIG//' configure.in - %build %{!?with_mozilla:export MOZILLA_CONFIG=no} %{__libtoolize} @@ -164,7 +163,7 @@ %{!?with_libcroco:--without-croco} \ %{!?with_libgsf:--without-svgz} \ %{!?with_gnomevfs:--disable-gnome-vfs} \ - --enable-gtk-doc \ + %{?with_apidocs:--enable-gtk-doc} \ --with-html-dir=%{_gtkdocdir}/%{name} %{__make} @@ -255,11 +254,73 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.98.2.3 2006/05/15 15:10:47 baggins +- merged from HEAD + Revision 1.98.2.2 2006/05/14 13:50:04 blues - release 4 - browser plugins support. STBR to AC Revision 1.98.2.1 2006/05/11 15:41:25 blues - better description + +Revision 1.105 2006/05/14 17:31:43 blues +- pl, not en + +Revision 1.104 2006/05/14 13:59:17 blues +- typo + +Revision 1.103 2006/05/14 13:58:29 blues +- release 2 - browser plugin support merged from AC-branch + +Revision 1.102 2006/04/02 21:29:46 qboosh +- removed indirect X deps (all are required by gtk+2-devel; the only one used by + librsvg configure is libX11, which is required by gtk+2-devel anyway + +Revision 1.101 2006/04/02 06:35:00 freetz +- cleanup + +Revision 1.100 2006/04/01 20:46:02 freetz +- merged from DEVEL + +Revision 1.99.2.12 2006/04/01 20:41:38 freetz +- 2.14.3 + +Revision 1.99.2.11 2006/03/19 17:29:39 freetz +- rel.2 for rebuild with libgsf 1.14.0 + +Revision 1.99.2.10 2006/03/11 19:54:17 freetz +- require libcroco >= 0.6.1 + +Revision 1.99.2.9 2006/03/11 19:20:48 freetz +- 2.14.2 + +Revision 1.99.2.8 2006/03/09 18:05:00 freetz +- added BR: rpm-pythonprov for rsvg python wrapper + (suggested by Caleb Maclennan pld at chiefworks com) + +Revision 1.99.2.7 2006/02/28 15:04:12 freetz +- 2.14.1 + +Revision 1.99.2.6 2006/02/25 20:46:20 freetz +- 2.14.0 + +Revision 1.99.2.5 2006/02/11 20:36:19 freetz +- 2.13.93 + +Revision 1.99.2.4 2006/02/06 18:40:33 freetz +- 2.13.92, switched to modular xorg + +Revision 1.99.2.3 2006/02/04 16:24:50 freetz +- 2.13.90 + +Revision 1.99.2.2 2006/01/22 22:34:35 freetz +- dropped libart_gpl BR + +Revision 1.99.2.1 2006/01/22 22:29:43 freetz +- 2.13.5 + +Revision 1.99 2005/12/02 11:39:12 adgor +- apidocs bcond Revision 1.98 2005/10/30 11:50:18 freetz - rel.3 (fixed) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/librsvg.spec?r1=1.98.2.2&r2=1.98.2.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
