|
|
@@ -1,5 +1,5 @@
|
|
|
%define nspr_version 4.8
|
|
|
-%define nss_version 3.12.3
|
|
|
+%define nss_version 3.12
|
|
|
%define cairo_version 1.8.6
|
|
|
%define libnotify_version 0.4
|
|
|
%define tarballdir mozilla-1.9.2
|
|
|
@@ -24,7 +24,7 @@
|
|
|
Summary: XUL Runtime for Gecko Applications
|
|
|
Summary(ja): Gecko アプリケーションのための XUL ランタイム
|
|
|
Name: xulrunner
|
|
|
-Version: 1.9.2.3
|
|
|
+Version: 1.9.2.4
|
|
|
Release: 1%{?_dist_release}
|
|
|
URL: http://www.mozilla.org/projects/xulrunner/
|
|
|
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
|
|
@@ -48,12 +48,13 @@ Patch5: mozilla-jemalloc-526152.patch
|
|
|
Patch7: xulrunner-1.9.2.1-build.patch
|
|
|
Patch8: mozilla-plugin.patch
|
|
|
Patch9: mozilla-build-sbrk.patch
|
|
|
+Patch10: firefox-3.6.4-ipc-chromium-nspr4.patch
|
|
|
|
|
|
# patches from Fedora
|
|
|
-Patch10: mozilla-192-pkgconfig.patch
|
|
|
+Patch100: mozilla-192-pkgconfig.patch
|
|
|
|
|
|
# Upstream patches
|
|
|
-Patch26: mozilla-ps-pdf-simplify-operators.patch
|
|
|
+Patch200: mozilla-ps-pdf-simplify-operators.patch
|
|
|
|
|
|
|
|
|
# ---------------------------------------------------
|
|
|
@@ -149,10 +150,11 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' \
|
|
|
%patch7 -p2 -b .del
|
|
|
%patch8 -p1 -b .plugin
|
|
|
%patch9 -p2 -b .sbrk
|
|
|
+%patch10 -p1 -b .nspr4
|
|
|
|
|
|
-%patch10 -p1 -b .pkgconfig
|
|
|
+%patch100 -p1 -b .pkgconfig
|
|
|
|
|
|
-%patch26 -p1 -b .ps-pdf-simplify-operators
|
|
|
+%patch200 -p1 -b .ps-pdf-simplify-operators
|
|
|
|
|
|
%{__rm} -f .mozconfig
|
|
|
%if %{build_vine6}
|
|
|
@@ -407,6 +409,7 @@ fi
|
|
|
%{mozappdir}/xulrunner
|
|
|
%{mozappdir}/xulrunner-bin
|
|
|
%{mozappdir}/xulrunner-stub
|
|
|
+%{mozappdir}/plugin-container
|
|
|
%{mozappdir}/platform.ini
|
|
|
%{mozappdir}/dependentlibs.list
|
|
|
%{_sysconfdir}/ld.so.conf.d/xulrunner*.conf
|
|
|
@@ -434,6 +437,10 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Jun 23 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.2.4-1
|
|
|
+- update to 1.9.2.4 (sync with firefox-3.6.4)
|
|
|
+- add patch10 to fix build failure
|
|
|
+
|
|
|
* Sat Apr 03 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.2.3-1
|
|
|
- update to 1.9.2.3 (sync with firefox-3.6.3)
|
|
|
|
daisuke