|
@@ -1,4 +1,4 @@
|
|
-%define nspr_version 4.8
|
|
|
|
|
|
+%define nspr_version 4.8.6
|
|
%define nss_version 3.12
|
|
%define nss_version 3.12
|
|
%define cairo_version 1.8.6
|
|
%define cairo_version 1.8.6
|
|
%define libnotify_version 0.4
|
|
%define libnotify_version 0.4
|
|
@@ -15,7 +15,7 @@
|
|
%endif
|
|
%endif
|
|
|
|
|
|
%if %build_vine6
|
|
%if %build_vine6
|
|
-%define sqlite_version 3.6.21
|
|
|
|
|
|
+%define sqlite_version 3.7.2
|
|
%endif
|
|
%endif
|
|
|
|
|
|
%define version_internal 1.9.2
|
|
%define version_internal 1.9.2
|
|
@@ -31,12 +31,12 @@
|
|
Summary: XUL Runtime for Gecko Applications
|
|
Summary: XUL Runtime for Gecko Applications
|
|
Summary(ja): Gecko アプリケーションのための XUL ランタイム
|
|
Summary(ja): Gecko アプリケーションのための XUL ランタイム
|
|
Name: xulrunner
|
|
Name: xulrunner
|
|
-Version: 1.9.2.8
|
|
|
|
|
|
+Version: 1.9.2.9
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
URL: http://www.mozilla.org/projects/xulrunner/
|
|
URL: http://www.mozilla.org/projects/xulrunner/
|
|
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
|
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
|
Group: Applications/Internet
|
|
Group: Applications/Internet
|
|
-Source0: %{name}-%{version}-source.tar.bz2
|
|
|
|
|
|
+Source0: %{name}-%{version}.source.tar.bz2
|
|
Source10: %{name}-mozconfig
|
|
Source10: %{name}-mozconfig
|
|
Source11: %{name}-mozconfig-vine5
|
|
Source11: %{name}-mozconfig-vine5
|
|
Source12: %{name}-vine-default-prefs.js
|
|
Source12: %{name}-vine-default-prefs.js
|
|
@@ -54,6 +54,7 @@ Patch3: mozilla-jemalloc.patch
|
|
Patch7: xulrunner-1.9.2.1-build.patch
|
|
Patch7: xulrunner-1.9.2.1-build.patch
|
|
Patch8: mozilla-plugin.patch
|
|
Patch8: mozilla-plugin.patch
|
|
Patch9: mozilla-build-sbrk.patch
|
|
Patch9: mozilla-build-sbrk.patch
|
|
|
|
+Patch10: mozilla-libjpeg-turbo.patch
|
|
|
|
|
|
# patches from Fedora
|
|
# patches from Fedora
|
|
Patch100: mozilla-192-pkgconfig.patch
|
|
Patch100: mozilla-192-pkgconfig.patch
|
|
@@ -69,7 +70,7 @@ BuildRequires: nspr-devel >= %{nspr_version}
|
|
BuildRequires: nss-devel >= %{nss_version}
|
|
BuildRequires: nss-devel >= %{nss_version}
|
|
BuildRequires: cairo-devel >= %{cairo_version}
|
|
BuildRequires: cairo-devel >= %{cairo_version}
|
|
BuildRequires: libpng-devel
|
|
BuildRequires: libpng-devel
|
|
-BuildRequires: libjpeg-devel
|
|
|
|
|
|
+BuildRequires: libjpeg-turbo-devel
|
|
BuildRequires: bzip2-devel
|
|
BuildRequires: bzip2-devel
|
|
BuildRequires: zlib-devel
|
|
BuildRequires: zlib-devel
|
|
BuildRequires: lcms-devel
|
|
BuildRequires: lcms-devel
|
|
@@ -116,7 +117,7 @@ Requires: xulrunner = %{version}-%{release}
|
|
Requires: nspr-devel >= %{nspr_version}
|
|
Requires: nspr-devel >= %{nspr_version}
|
|
Requires: nss-devel >= %{nss_version}
|
|
Requires: nss-devel >= %{nss_version}
|
|
Requires: cairo-devel >= %{cairo_version}
|
|
Requires: cairo-devel >= %{cairo_version}
|
|
-Requires: libjpeg-devel
|
|
|
|
|
|
+Requires: libjpeg-turbo-devel
|
|
Requires: zip
|
|
Requires: zip
|
|
Requires: bzip2-devel
|
|
Requires: bzip2-devel
|
|
Requires: zlib-devel
|
|
Requires: zlib-devel
|
|
@@ -154,6 +155,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' \
|
|
%patch7 -p2 -b .del
|
|
%patch7 -p2 -b .del
|
|
%patch8 -p1 -b .plugin
|
|
%patch8 -p1 -b .plugin
|
|
%patch9 -p2 -b .sbrk
|
|
%patch9 -p2 -b .sbrk
|
|
|
|
+%patch10 -p1 -b .libjpeg-turbo
|
|
|
|
|
|
%patch100 -p1 -b .pkgconfig
|
|
%patch100 -p1 -b .pkgconfig
|
|
|
|
|
|
@@ -446,6 +448,12 @@ fi
|
|
#---------------------------------------------------------------------
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Mon Sep 13 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.2.9-1
|
|
|
|
+- update to 1.9.2.9 (sync with firefox-3.6.9)
|
|
|
|
+- add patch10 to build with libjpeg-turbo
|
|
|
|
+- build with sqlite-3.7.2
|
|
|
|
+- BR: nspr >= 4.8.6
|
|
|
|
+
|
|
* Mon Jul 26 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.2.8-1
|
|
* Mon Jul 26 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.2.8-1
|
|
- update tp 1.9.2.8 (sync with firefox-3.6.8)
|
|
- update tp 1.9.2.8 (sync with firefox-3.6.8)
|
|
|
|
|