Author: glen Date: Mon Aug 3 23:35:14 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- 1.9.1.2 (fixes CVE-2009-2467, CVE-2009-2477, CVE-2009-2470)
- qt bcond
---- Files affected:
packages/xulrunner:
xulrunner.spec (1.107 -> 1.108)
---- Diffs:
================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.107
packages/xulrunner/xulrunner.spec:1.108
--- packages/xulrunner/xulrunner.spec:1.107 Sun Jul 19 03:52:27 2009
+++ packages/xulrunner/xulrunner.spec Tue Aug 4 01:35:08 2009
@@ -5,13 +5,14 @@
%bcond_without gnome # disable all GNOME components (gnomevfs,
gnome, gnomeui)
%bcond_without kerberos # disable krb5 support
%bcond_with mozldap # build with system mozldap
+%bcond_with qt # build with qt toolkit
#
%define rel 1
-%define firefox_ver 3.5.1
+%define firefox_ver 3.5.2
Summary: XULRunner - Mozilla Runtime Environment for XUL+XPCOM
applications
Summary(pl.UTF-8): XULRunner - środowisko uruchomieniowe Mozilli dla
aplikacji XUL+XPCOM
Name: xulrunner
-Version: 1.9.1.1
+Version: 1.9.1.2
Release: %{rel}
Epoch: 1
License: MPL v1.1 or GPL v2+ or LGPL v2.1+
@@ -19,7 +20,7 @@
# Source tarball for xulrunner is in fact firefox tarball (checked on 1.9), so
lets use it
# instead of waiting for mozilla to copy file on ftp.
Source0:
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{firefox_ver}/source/firefox-%{firefox_ver}-source.tar.bz2
-# Source0-md5: 18169e189785d680827d4fce94524449
+# Source0-md5: 136867f95c86f3988b7f825e874b85de
Patch0: %{name}-install.patch
Patch1: %{name}-rpath.patch
Patch2: %{name}-mozldap.patch
@@ -40,7 +41,7 @@
BuildRequires: dbus-glib-devel >= 0.60
BuildRequires: freetype-devel >= 1:2.1.8
%{?with_gnome:BuildRequires: gnome-vfs2-devel >= 2.0}
-BuildRequires: gtk+2-devel >= 2:2.10.0
+%{!?with_qt:BuildRequires: gtk+2-devel >= 2:2.10.0}
BuildRequires: hunspell-devel >= 1.2.3
%{?with_kerberos:BuildRequires: heimdal-devel >= 0.7.1}
BuildRequires: lcms-devel >= 1.17
@@ -111,7 +112,7 @@
Summary(pl.UTF-8): Biblioteki współdzielone XULRunnera
Group: X11/Libraries
Requires: cairo >= 1.6.0
-Requires: gtk+2 >= 2:2.10.0
+%{!?with_qt:Requires: gtk+2 >= 2:2.10.0}
Requires: libpng >= 1.2.7
Requires: libpng(APNG) >= 0.10
Requires: pango >= 1:1.10.0
@@ -235,7 +236,11 @@
ac_add_options --disable-javaxpcom
ac_add_options --disable-updater
ac_add_options --enable-xinerama
+%if %{with qt}
+ac_add_options --enable-default-toolkit=cairo-qt
+%else
ac_add_options --enable-default-toolkit=cairo-gtk2
+%endif
ac_add_options --enable-system-cairo
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-lcms
@@ -343,9 +348,6 @@
%dir %{_libdir}/%{name}/plugins
%dir %{_libdir}/%{name}/components
-%{_libdir}/%{name}/LICENSE
-%{_libdir}/%{name}/README.txt
-%{_libdir}/%{name}/dependentlibs.list
%{_libdir}/%{name}/platform.ini
%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
@@ -527,6 +529,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.108 2009/08/03 23:35:08 glen
+- 1.9.1.2 (fixes CVE-2009-2467, CVE-2009-2477, CVE-2009-2470)
+- qt bcond
+
Revision 1.107 2009/07/19 01:52:27 arekm
- check if version matches milestone.txt
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.107&r2=1.108&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
