|
|
@@ -9,18 +9,18 @@
|
|
|
# alpha_version should be set to the alpha number if using an alpha, 0 otherwise
|
|
|
# beta_version should be set to the beta number if using a beta, 0 otherwise
|
|
|
# rc_version should be set to the RC number if using an RC, 0 otherwise
|
|
|
-%global gecko_dir_ver 2
|
|
|
+%global gecko_dir_ver %{version}
|
|
|
%global alpha_version 0
|
|
|
%global beta_version 0
|
|
|
%global rc_version 0
|
|
|
|
|
|
-%global mozappdir %{_libdir}/%{name}-%{gecko_dir_ver}
|
|
|
-%global tarballdir mozilla-esr10
|
|
|
+%global mozappdir %{_libdir}/%{name}
|
|
|
+%global tarballdir mozilla-esr17
|
|
|
|
|
|
Summary: XUL Runtime for Gecko Applications
|
|
|
Summary(ja): Gecko アプリケーションのための XUL ランタイム
|
|
|
Name: xulrunner
|
|
|
-Version: 10.0.8
|
|
|
+Version: 17.0.2
|
|
|
Release: 1%{?_dist_release}
|
|
|
URL: http://developer.mozilla.org/En/XULRunner
|
|
|
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
|
|
@@ -32,31 +32,19 @@ Source12: %{name}-redhat-default-prefs.js
|
|
|
Source21: %{name}.sh.in
|
|
|
|
|
|
# build patches
|
|
|
-Patch0: xulrunner-version.patch
|
|
|
-Patch1: mozilla-build.patch
|
|
|
+Patch1: xulrunner-install-dir.patch
|
|
|
+Patch2: mozilla-build.patch
|
|
|
Patch14: xulrunner-2.0-chromium-types.patch
|
|
|
-Patch17: xulrunner-10.0-gcc47.patch
|
|
|
-
|
|
|
+Patch17: xulrunner-15.0-gcc47.patch
|
|
|
+# https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
|
|
|
+Patch18: xulrunner-16.0-jemalloc-ppc.patch
|
|
|
|
|
|
# Fedora specific patches
|
|
|
Patch20: mozilla-193-pkgconfig.patch
|
|
|
-Patch23: wmclass.patch
|
|
|
-Patch24: crashreporter-remove-static.patch
|
|
|
|
|
|
# Upstream patches
|
|
|
-Patch38: mozilla-696393.patch
|
|
|
-# https://bugzilla.mozilla.org/show_bug.cgi?id=707993
|
|
|
-Patch39: xulrunner-8.0-fix-maemo-checks-in-npapi.patch
|
|
|
-Patch40: mozilla-682832-proxy.patch
|
|
|
-# cherry-picked from 13afcd4c097c
|
|
|
-Patch41: xulrunner-9.0-secondary-build-fix.patch
|
|
|
-Patch42: mozilla-706724.patch
|
|
|
-Patch43: mozilla-file.patch
|
|
|
-# Needed to detect/use libvpx-1.0.0
|
|
|
-# https://bugzilla.mozilla.org/show_bug.cgi?id=722127
|
|
|
-Patch44: mozilla-722127.patch
|
|
|
-Patch46: mozilla-724615.patch
|
|
|
-Patch47: mozilla-691898.patch
|
|
|
+Patch49: mozilla-746112.patch
|
|
|
+Patch50: mozilla-813997.patch
|
|
|
|
|
|
# ---------------------------------------------------
|
|
|
|
|
|
@@ -138,27 +126,16 @@ for writing XUL+XPCOM applications with Mozilla XULRunner and Gecko.
|
|
|
%setup -q -c
|
|
|
cd %{tarballdir}
|
|
|
|
|
|
-sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
|
|
|
- > version.patch
|
|
|
-%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
|
|
|
-
|
|
|
-%patch1 -p2 -b .build
|
|
|
-%patch14 -p1 -b .chromium-types
|
|
|
-%patch17 -p1 -b .gcc47
|
|
|
+%patch1 -p1
|
|
|
+%patch2 -p1 -b .build
|
|
|
+%patch14 -p2 -b .chromium-types
|
|
|
+%patch17 -p2 -b .gcc47
|
|
|
+%patch18 -p2 -b .jemalloc-ppc
|
|
|
|
|
|
%patch20 -p2 -b .pk
|
|
|
-%patch23 -p1 -b .wmclass
|
|
|
-%patch24 -p1 -b .static
|
|
|
-
|
|
|
-%patch38 -p2 -b .696393
|
|
|
-%patch39 -p1 -b .707993
|
|
|
-%patch40 -p2 -b .682832
|
|
|
-%patch41 -p2 -b .secondary-build
|
|
|
-%patch42 -p1 -b .706724
|
|
|
-%patch43 -p1 -b .file
|
|
|
-%patch44 -p2 -b .vpx1.0.0
|
|
|
-%patch46 -p1 -b .724615
|
|
|
-%patch47 -p1 -b .691898
|
|
|
+
|
|
|
+%patch49 -p2 -b .746112
|
|
|
+%patch50 -p1 -b .813997
|
|
|
|
|
|
%{__rm} -f .mozconfig
|
|
|
%{__cp} %{SOURCE10} .mozconfig
|
|
|
@@ -276,17 +253,23 @@ done
|
|
|
popd
|
|
|
|
|
|
# Library path
|
|
|
-LD_SO_CONF_D=%{_sysconfdir}/ld.so.conf.d
|
|
|
-LD_CONF_FILE=xulrunner-%{__isa_bits}.conf
|
|
|
+#LD_SO_CONF_D=%{_sysconfdir}/ld.so.conf.d
|
|
|
+#LD_CONF_FILE=xulrunner-%{__isa_bits}.conf
|
|
|
|
|
|
-%{__mkdir_p} ${RPM_BUILD_ROOT}${LD_SO_CONF_D}
|
|
|
-%{__cat} > ${RPM_BUILD_ROOT}${LD_SO_CONF_D}/${LD_CONF_FILE} << EOF
|
|
|
-%{mozappdir}
|
|
|
-EOF
|
|
|
+#%{__mkdir_p} ${RPM_BUILD_ROOT}${LD_SO_CONF_D}
|
|
|
+#%{__cat} > ${RPM_BUILD_ROOT}${LD_SO_CONF_D}/${LD_CONF_FILE} << EOF
|
|
|
+#%{mozappdir}
|
|
|
+#EOF
|
|
|
|
|
|
# Copy over the LICENSE
|
|
|
%{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir}
|
|
|
|
|
|
+# Install xpcshell
|
|
|
+%{__cp} dist/bin/xpcshell $RPM_BUILD_ROOT/%{mozappdir}
|
|
|
+
|
|
|
+# Install run-mozilla.sh
|
|
|
+%{__cp} dist/bin/run-mozilla.sh $RPM_BUILD_ROOT/%{mozappdir}
|
|
|
+
|
|
|
# ghost files
|
|
|
%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/components
|
|
|
touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
|
|
|
@@ -309,7 +292,7 @@ fi
|
|
|
%{_bindir}/xulrunner
|
|
|
%dir %{mozappdir}
|
|
|
%doc %attr(644, root, root) %{mozappdir}/LICENSE
|
|
|
-%doc %attr(644, root, root) %{mozappdir}/README.txt
|
|
|
+%doc %attr(644, root, root) %{mozappdir}/README.xulrunner
|
|
|
%{mozappdir}/chrome
|
|
|
%{mozappdir}/chrome.manifest
|
|
|
%{mozappdir}/dictionaries
|
|
|
@@ -324,11 +307,10 @@ fi
|
|
|
%{mozappdir}/mozilla-xremote-client
|
|
|
%{mozappdir}/run-mozilla.sh
|
|
|
%{mozappdir}/xulrunner
|
|
|
-%{mozappdir}/xulrunner-bin
|
|
|
%{mozappdir}/xulrunner-stub
|
|
|
%{mozappdir}/platform.ini
|
|
|
%{mozappdir}/dependentlibs.list
|
|
|
-%{_sysconfdir}/ld.so.conf.d/xulrunner*.conf
|
|
|
+#%{_sysconfdir}/ld.so.conf.d/xulrunner*.conf
|
|
|
%{mozappdir}/plugin-container
|
|
|
|
|
|
%files devel
|
|
|
@@ -343,6 +325,10 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Jan 11 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 17.0.2-1
|
|
|
+- update to 17.0.2esr
|
|
|
+- remove /etc/ld.so.conf.d/xulrunner*.conf
|
|
|
+
|
|
|
* Wed Oct 10 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 10.0.8-1
|
|
|
- update to 10.0.8esr
|
|
|
|
daisuke