|
|
@@ -1,8 +1,9 @@
|
|
|
-%define nspr_version 4.8.6
|
|
|
-%define nss_version 3.12
|
|
|
-%define cairo_version 1.8.6
|
|
|
+%define nspr_version 4.8.7
|
|
|
+%define nss_version 3.12.9
|
|
|
+%define cairo_version 1.10.2-2
|
|
|
%define libnotify_version 0.4
|
|
|
-%define tarballdir mozilla-1.9.2
|
|
|
+%define tarballdir mozilla-2.0
|
|
|
+%define libjpeg-turbo_version 1.1.0
|
|
|
|
|
|
%define build_vine6 0
|
|
|
%define build_vine5 0
|
|
|
@@ -15,10 +16,10 @@
|
|
|
%endif
|
|
|
|
|
|
%if %build_vine6
|
|
|
-%define sqlite_version 3.7.2
|
|
|
+%define sqlite_version 3.7.5
|
|
|
%endif
|
|
|
|
|
|
-%define version_internal 1.9.2
|
|
|
+%define version_internal 2.0
|
|
|
%define mozappdir %{_libdir}/%{name}-%{version_internal}
|
|
|
|
|
|
# Separated plugins are supported on x86(64) only
|
|
|
@@ -31,7 +32,7 @@
|
|
|
Summary: XUL Runtime for Gecko Applications
|
|
|
Summary(ja): Gecko アプリケーションのための XUL ランタイム
|
|
|
Name: xulrunner
|
|
|
-Version: 1.9.2.15
|
|
|
+Version: 2.0
|
|
|
Release: 1%{?_dist_release}
|
|
|
URL: http://www.mozilla.org/projects/xulrunner/
|
|
|
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
|
|
@@ -50,16 +51,17 @@ Source1000: xulrunner-%{version}-ja.tar.bz2
|
|
|
# build patches
|
|
|
Patch0: xulrunner-version.patch
|
|
|
Patch1: mozilla-build.patch
|
|
|
-Patch3: mozilla-jemalloc.patch
|
|
|
Patch7: xulrunner-1.9.2.1-build.patch
|
|
|
#Patch8: mozilla-plugin.patch
|
|
|
Patch9: mozilla-build-sbrk.patch
|
|
|
Patch10: mozilla-libjpeg-turbo.patch
|
|
|
|
|
|
# patches from Fedora
|
|
|
-Patch100: mozilla-192-pkgconfig.patch
|
|
|
+Patch100: mozilla-193-pkgconfig.patch
|
|
|
|
|
|
# Upstream patches
|
|
|
+Patch130: xulrunner-omnijar.patch
|
|
|
+
|
|
|
|
|
|
|
|
|
# ---------------------------------------------------
|
|
|
@@ -69,7 +71,7 @@ BuildRequires: nspr-devel >= %{nspr_version}
|
|
|
BuildRequires: nss-devel >= %{nss_version}
|
|
|
BuildRequires: cairo-devel >= %{cairo_version}
|
|
|
BuildRequires: libpng-devel
|
|
|
-BuildRequires: libjpeg-turbo-devel
|
|
|
+BuildRequires: libjpeg-turbo-devel >= %{libjpeg-turbo_version}
|
|
|
BuildRequires: bzip2-devel
|
|
|
BuildRequires: zlib-devel
|
|
|
BuildRequires: lcms-devel
|
|
|
@@ -92,6 +94,7 @@ BuildRequires: lcms-devel
|
|
|
BuildRequires: zip
|
|
|
# For -sqlite.patch
|
|
|
BuildRequires: autoconf213
|
|
|
+BuildRequires: libvpx-devel
|
|
|
|
|
|
Requires: nspr >= %{nspr_version}
|
|
|
Requires: nss >= %{nss_version}
|
|
|
@@ -116,7 +119,7 @@ Requires: xulrunner = %{version}-%{release}
|
|
|
Requires: nspr-devel >= %{nspr_version}
|
|
|
Requires: nss-devel >= %{nss_version}
|
|
|
Requires: cairo-devel >= %{cairo_version}
|
|
|
-Requires: libjpeg-turbo-devel
|
|
|
+Requires: libjpeg-turbo-devel >= %{libjpeg-turbo_version}
|
|
|
Requires: zip
|
|
|
Requires: bzip2-devel
|
|
|
Requires: zlib-devel
|
|
|
@@ -149,14 +152,13 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' \
|
|
|
%{P:%%PATCH0} > version.patch
|
|
|
%{__patch} -p1 -b --suffix .version < version.patch
|
|
|
|
|
|
-%patch1 -p1 -b .build
|
|
|
-%patch3 -p1 -b .jemalloc
|
|
|
+%patch1 -p2 -b .build
|
|
|
%patch7 -p2 -b .del
|
|
|
-#%patch8 -p1 -b .plugin
|
|
|
%patch9 -p2 -b .sbrk
|
|
|
-%patch10 -p1 -b .libjpeg-turbo
|
|
|
+%patch10 -p2 -b .libjpeg-turbo
|
|
|
|
|
|
-%patch100 -p1 -b .pkgconfig
|
|
|
+%patch100 -p2 -b .pkgconfig
|
|
|
+%patch130 -p1 -b .omnijar
|
|
|
|
|
|
|
|
|
%{__rm} -f .mozconfig
|
|
|
@@ -222,21 +224,19 @@ MOZ_APP_DIR=%{_libdir}/${INTERNAL_APP_NAME}
|
|
|
INTERNAL_APP_SDK_NAME=%{name}-sdk-${INTERNAL_GECKO}
|
|
|
MOZ_APP_SDK_DIR=%{_libdir}/${INTERNAL_APP_SDK_NAME}
|
|
|
|
|
|
-#DESTDIR=$RPM_BUILD_ROOT make -f client.mk install STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
|
|
|
+# set up our default preferences
|
|
|
+%{__cat} %{SOURCE12} | %{__sed} -e 's,RPM_VERREL,%{version}-%{release},g' > vl-default-prefs
|
|
|
+%{__install} -p -D -m 644 vl-default-prefs $RPM_BUILD_ROOT/${MOZ_APP_DIR}/defaults/pref/all-vine.js
|
|
|
+%{__rm} vl-default-prefs
|
|
|
+
|
|
|
DESTDIR=$RPM_BUILD_ROOT make install
|
|
|
|
|
|
%{__mkdir_p} $RPM_BUILD_ROOT/${MOZ_APP_DIR} \
|
|
|
$RPM_BUILD_ROOT%{_datadir}/idl/${INTERNAL_APP_SDK_NAME} \
|
|
|
$RPM_BUILD_ROOT%{_includedir}/${INTERNAL_APP_SDK_NAME}
|
|
|
-%{__install} -p dist/sdk/bin/regxpcom $RPM_BUILD_ROOT/$MOZ_APP_DIR
|
|
|
|
|
|
%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
|
|
|
|
|
|
-# set up our default preferences
|
|
|
-%{__cat} %{SOURCE12} | %{__sed} -e 's,RPM_VERREL,%{version}-%{release},g' > vl-default-prefs
|
|
|
-%{__install} -p -D -m 644 vl-default-prefs $RPM_BUILD_ROOT/${MOZ_APP_DIR}/defaults/pref/all-vine.js
|
|
|
-%{__rm} vl-default-prefs
|
|
|
-
|
|
|
# Start script install
|
|
|
%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/%{name}
|
|
|
%{__cat} %{SOURCE21} | %{__sed} -e 's,XULRUNNER_VERSION,%{version_internal},g' > \
|
|
|
@@ -250,9 +250,9 @@ find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \;
|
|
|
cd -
|
|
|
|
|
|
# install locales
|
|
|
-for lang in %{MOZ_BUILD_LOCALES} ; do
|
|
|
- %{__install} -p -D -m 664 dist/bin/chrome/$lang.{jar,manifest} $RPM_BUILD_ROOT/${MOZ_APP_DIR}/chrome/
|
|
|
-done
|
|
|
+#for lang in %{MOZ_BUILD_LOCALES} ; do
|
|
|
+# %{__install} -p -D -m 664 dist/bin/chrome/$lang.{jar,manifest} $RPM_BUILD_ROOT/${MOZ_APP_DIR}/chrome/
|
|
|
+#done
|
|
|
|
|
|
# Prepare our devel package
|
|
|
%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
|
|
|
@@ -290,10 +290,8 @@ EOF
|
|
|
|
|
|
pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
|
|
|
install_file "mozilla-config"
|
|
|
-popd
|
|
|
-
|
|
|
-pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
|
|
|
install_file "jsautocfg"
|
|
|
+install_file "js-config"
|
|
|
popd
|
|
|
|
|
|
%{__install} -p -c -m 755 dist/bin/xpcshell \
|
|
|
@@ -395,24 +393,25 @@ fi
|
|
|
%doc %attr(644, root, root) %{mozappdir}/LICENSE
|
|
|
%doc %attr(644, root, root) %{mozappdir}/README.txt
|
|
|
%{mozappdir}/chrome
|
|
|
+%{mozappdir}/chrome.manifest
|
|
|
%{mozappdir}/dictionaries
|
|
|
%dir %{mozappdir}/components
|
|
|
%ghost %{mozappdir}/components/compreg.dat
|
|
|
%ghost %{mozappdir}/components/xpti.dat
|
|
|
%{mozappdir}/components/*.so
|
|
|
-%{mozappdir}/components/*.xpt
|
|
|
-%attr(644, root, root) %{mozappdir}/components/*.js
|
|
|
+#%{mozappdir}/components/*.xpt
|
|
|
+%{mozappdir}/components/*.manifest
|
|
|
+#%attr(644, root, root) %{mozappdir}/components/*.js
|
|
|
%{mozappdir}/defaults
|
|
|
-%{mozappdir}/greprefs
|
|
|
%dir %{mozappdir}/icons
|
|
|
%attr(644, root, root) %{mozappdir}/icons/*
|
|
|
-%{mozappdir}/modules
|
|
|
+%{mozappdir}/omni.jar
|
|
|
+#%{mozappdir}/modules
|
|
|
%{mozappdir}/plugins
|
|
|
-%{mozappdir}/res
|
|
|
+#%{mozappdir}/res
|
|
|
%{mozappdir}/*.so
|
|
|
%{mozappdir}/mozilla-xremote-client
|
|
|
%{mozappdir}/run-mozilla.sh
|
|
|
-%{mozappdir}/regxpcom
|
|
|
%{mozappdir}/xulrunner
|
|
|
%{mozappdir}/xulrunner-bin
|
|
|
%{mozappdir}/xulrunner-stub
|
|
|
@@ -421,22 +420,18 @@ fi
|
|
|
%endif
|
|
|
%{mozappdir}/platform.ini
|
|
|
%{mozappdir}/dependentlibs.list
|
|
|
+#%{mozappdir}/greprefs.js
|
|
|
%{_sysconfdir}/ld.so.conf.d/xulrunner*.conf
|
|
|
|
|
|
# XXX See if these are needed still
|
|
|
%{mozappdir}/updater*
|
|
|
%exclude %{mozappdir}/update.locale
|
|
|
-%exclude %{mozappdir}/components/components.list
|
|
|
|
|
|
%files devel
|
|
|
%defattr(-,root,root,-)
|
|
|
-%dir %{_datadir}/idl/%{name}*%{version_internal}
|
|
|
-%{_datadir}/idl/%{name}*%{version_internal}/*
|
|
|
+%{_datadir}/idl/%{name}*%{version_internal}
|
|
|
%{_includedir}/%{name}*%{version_internal}
|
|
|
-%dir %{_libdir}/%{name}-sdk-*
|
|
|
-%dir %{_libdir}/%{name}-sdk-*/sdk
|
|
|
-%{_libdir}/%{name}-sdk-*/*
|
|
|
-%{_libdir}/%{name}-sdk-*/sdk/*
|
|
|
+%{_libdir}/%{name}-sdk-*/
|
|
|
%{_libdir}/pkgconfig/*.pc
|
|
|
%{mozappdir}/xpcshell
|
|
|
%{mozappdir}/xpidl
|
|
|
@@ -446,6 +441,14 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Mar 30 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0-1
|
|
|
+- update to 2.0 (sync with firefox-4.0)
|
|
|
+- BR: libjpeg-turbo-devel >= 1.1.0
|
|
|
+- BR: nspr-devel >= 4.8.7
|
|
|
+- BR: nss-devel >= 3.12.9
|
|
|
+- BR: cairo-devel >= 1.10.2-2
|
|
|
+- add Patch130 to use omni.jar (upstream patch)
|
|
|
+
|
|
|
* Thu Mar 10 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.2.15-1
|
|
|
- update to 1.9.2.15 (sync with firefox-3.6.15)
|
|
|
|
daisuke