[seamonkey/el6] initial port to el6
Dmitry Butskoy
buc at fedoraproject.org
Thu Oct 4 16:15:44 UTC 2012
commit 706e06196b5b6c1932f3a258e693c05b43755c9d
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Thu Oct 4 20:15:03 2012 +0400
initial port to el6
mozilla-733867-x.patch | 265 --------------------
mozilla-file.patch | 26 --
...ult-prefs.js => seamonkey-epel-default-prefs.js | 5 +-
seamonkey-idl-parser-cachepath.patch | 26 ++
seamonkey.spec | 124 +++++++---
sources | 4 +-
xulrunner-10.0-gcc47.patch | 25 --
xulrunner-15.0-gcc47.patch | 13 +
8 files changed, 136 insertions(+), 352 deletions(-)
---
diff --git a/seamonkey-fedora-default-prefs.js b/seamonkey-epel-default-prefs.js
similarity index 66%
rename from seamonkey-fedora-default-prefs.js
rename to seamonkey-epel-default-prefs.js
index c14a9b3..51e8347 100644
--- a/seamonkey-fedora-default-prefs.js
+++ b/seamonkey-epel-default-prefs.js
@@ -1,7 +1,10 @@
+pref("app.update.auto", false);
+pref("app.update.enabled", false);
pref("browser.display.use_system_colors", true);
pref("general.smoothScroll", true);
pref("general.useragent.vendor", "Fedora");
pref("general.useragent.vendorSub", "SEAMONKEY_RPM_VR");
+pref("intl.locale.matchOS", true);
pref("update_notifications.enabled", false);
pref("extensions.shownSelectionUI", true);
-pref("extensions.autoDisableScope", 0);
+pref("extensions.autoDisableScopes", 0);
diff --git a/seamonkey-idl-parser-cachepath.patch b/seamonkey-idl-parser-cachepath.patch
new file mode 100644
index 0000000..11148af
--- /dev/null
+++ b/seamonkey-idl-parser-cachepath.patch
@@ -0,0 +1,26 @@
+diff -up seamonkey-2.12/comm-release/mozilla/xpcom/idl-parser/Makefile.in.idl-parser-cachepath seamonkey-2.12/comm-release/mozilla/xpcom/idl-parser/Makefile.in
+--- seamonkey-2.12/comm-release/mozilla/xpcom/idl-parser/Makefile.in.idl-parser-cachepath 2012-08-27 06:49:34.000000000 +0200
++++ seamonkey-2.12/comm-release/mozilla/xpcom/idl-parser/Makefile.in 2012-08-28 13:12:39.116991864 +0200
+@@ -29,7 +29,7 @@ include $(topsrcdir)/config/rules.mk
+ export:: $(PARSER_SRCS) $(PLY_PROGS)
+ $(PYTHON_PATH) \
+ $(PLY_INCLUDE) \
+- $(srcdir)/header.py --cachedir=. --regen
++ $(srcdir)/header.py --cachedir=cache --regen
+
+ check::
+ $(PYTHON_PATH) \
+diff -up seamonkey-2.12/comm-release/mozilla/xpcom/typelib/xpidl/Makefile.in.idl-parser-cachepath seamonkey-2.12/comm-release/mozilla/xpcom/typelib/xpidl/Makefile.in
+--- seamonkey-2.12/comm-release/mozilla/xpcom/typelib/xpidl/Makefile.in.idl-parser-cachepath 2012-08-27 06:49:34.000000000 +0200
++++ seamonkey-2.12/comm-release/mozilla/xpcom/typelib/xpidl/Makefile.in 2012-08-28 13:11:23.014580767 +0200
+@@ -16,8 +16,8 @@ SDK_BINARY = \
+ $(topsrcdir)/xpcom/idl-parser/xpidl.py \
+ $(topsrcdir)/xpcom/idl-parser/header.py \
+ $(topsrcdir)/xpcom/idl-parser/typelib.py \
+- $(DEPTH)/xpcom/idl-parser/xpidllex.py \
+- $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \
++ $(DEPTH)/xpcom/idl-parser/cache/xpidllex.py \
++ $(DEPTH)/xpcom/idl-parser/cache/xpidlyacc.py \
+ $(NULL)
+
+ ifndef MOZ_SYSTEM_PLY
diff --git a/seamonkey.spec b/seamonkey.spec
index 65e7b3b..da50bcc 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -1,9 +1,12 @@
-%define homepage http://start.fedoraproject.org/
+%bcond_with system_libvpx
+
+%define homepage file:///usr/share/doc/HTML/index.html
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%define cairo_version 0.5
%define minimum_build_nspr_version 4.9
%define minimum_build_nss_version 3.13.3
+%define minimum_build_vpx_version 1.0.0
%define build_langpacks 1
@@ -15,14 +18,14 @@
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
-Version: 2.9.1
-Release: 4%{?dist}
+Version: 2.12.1
+Release: 1%{?dist}
URL: http://www.mozilla.org/projects/seamonkey/
License: MPLv1.1
Group: Applications/Internet
Source0: seamonkey-%{version}%{?prerelease_tag}.source.tar.bz2
-Source1: seamonkey-langpacks-%{version}-20120502.tar.xz
+Source1: seamonkey-langpacks-%{version}-20120912.tar.xz
Source3: seamonkey.sh.in
Source4: seamonkey.desktop
Source7: seamonkey-make-package.pl
@@ -31,13 +34,12 @@ Source12: seamonkey-mail.desktop
Source13: seamonkey-mail.svg
Source17: mozilla-psm-exclude-list
Source18: mozilla-xpcom-exclude-list
-Source20: seamonkey-fedora-default-prefs.js
+Source20: seamonkey-epel-default-prefs.js
Source100: find-external-requires
-Patch1: xulrunner-10.0-gcc47.patch
+Patch1: xulrunner-15.0-gcc47.patch
Patch5: seamonkey-8.0-enable-addons.patch
-Patch8: mozilla-733867-x.patch
-Patch9: mozilla-file.patch
+Patch10: seamonkey-idl-parser-cachepath.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{minimum_build_nspr_version}
@@ -66,13 +68,20 @@ BuildRequires: alsa-lib-devel
BuildRequires: hunspell-devel
BuildRequires: system-bookmarks
BuildRequires: libnotify-devel
-BuildRequires: libvpx-devel
+%if %{with system_libvpx}
+BuildRequires: libvpx-devel >= %{minimum_build_vpx_version}
+%else
+BuildRequires: yasm >= 1.1
+%endif
BuildRequires: mesa-libGL-devel
BuildRequires: nss-static
Requires: system-bookmarks
+Requires: redhat-indexhtml
Requires: mozilla-filesystem
Requires: hicolor-icon-theme
-Requires: libvpx
+%if %{with system_libvpx}
+Requires: libvpx >= %{minimum_build_vpx_version}
+%endif
Requires: nspr >= %{minimum_build_nspr_version}
Requires: nss >= %{minimum_build_nss_version}
@@ -102,14 +111,16 @@ application formerly known as Mozilla Application Suite.
cd %{sources_subdir}
cd mozilla
-%patch1 -p1 -b .gcc47
+%patch1 -p2 -b .gcc47
cd ..
%patch5 -p2 -b .addons
pushd mozilla
-%patch9 -p1 -b .file
+%patch10 -p3 -b .idl-parser-cachepath
popd
-%patch8 -p1 -b .733867
+
+# fix obsoleted modifier in inspector
+sed -i -e 's/ *xpcnativewrappers=no//' mozilla/extensions/inspector/jar.mn
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -118,6 +129,11 @@ popd
echo "ac_add_options --disable-elf-hack" >> .mozconfig
%endif
+%if %{without system_libvpx}
+sed -i -e '/with-system-libvpx/ d' .mozconfig
+%endif
+
+
%build
cd %{sources_subdir}
@@ -136,15 +152,18 @@ export LIBDIR='%{_libdir}'
MOZ_SMP_FLAGS=-j1
%ifnarch ppc ppc64 s390 s390x
-[ -z "$RPM_BUILD_NCPUS" ] && \
- RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
-[ "$RPM_BUILD_NCPUS" -gt 1 ] && MOZ_SMP_FLAGS=-j2
+#[ -z "$RPM_BUILD_NCPUS" ] && \
+# RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
+#[ "$RPM_BUILD_NCPUS" -gt 1 ] && MOZ_SMP_FLAGS=-j2
+MOZ_SMP_FLAGS=%{?_smp_mflags}
%endif
make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
+
%install
%{__rm} -rf $RPM_BUILD_ROOT
+
cd %{sources_subdir}
DESTDIR=$RPM_BUILD_ROOT make install
@@ -152,6 +171,11 @@ DESTDIR=$RPM_BUILD_ROOT make install
# fix omni.jar to actually work
pushd mozilla/dist/bin
zip -d $RPM_BUILD_ROOT/%{mozdir}/omni.ja components/browser.xpt components/mail.xpt components/components.manifest chrome/localized.manifest chrome/nonlocalized.manifest
+
+# this contains only binary componetes which will be not present in the jar
+%{__rm} -f components/components.manifest
+sed -i -e '/ components\/components.manifest/ d' chrome.manifest
+
zip -9r $RPM_BUILD_ROOT/%{mozdir}/omni.ja chrome.manifest components/*.xpt chrome/*.manifest components/*.manifest components/*.js
popd
@@ -221,41 +245,44 @@ echo %defattr\(-,root,root\) > %{builddir}/seamonkey.list
--install-root %{mozdir}
echo > ../%{name}.lang
+
%if %{build_langpacks}
# Install langpacks
%{__mkdir_p} $RPM_BUILD_ROOT/%{mozdir}/extensions
%{__tar} xf %{SOURCE1}
+
for langpack in `ls seamonkey-langpacks/*.xpi`; do
- language=$(basename $langpack .xpi | sed 's/^seamonkey-//' | sed 's/\.langpack$//' | sed 's/\([0-9]\.\)*//')
+ # seamonkey-langpacks/seamonkey-VERSION.LANG.langpack.xpi
+ language=${langpack%.langpack.xpi}
+ # seamonkey-langpacks/seamonkey-VERSION.LANG
+ language=${language##*.}
+ # LANG
extensiondir=$RPM_BUILD_ROOT/%{mozdir}/extensions/langpack-$language at seamonkey.mozilla.org
%{__mkdir_p} $extensiondir
unzip $langpack -d $extensiondir
find $extensiondir -type f | xargs chmod 644
+ find $extensiondir -name ".mkdir.done" | xargs rm -f
-# tmpdir=`mktemp -d %{name}.XXXXXXXX`
-# langtmp=$tmpdir/%{name}/langpack-$language
-# %{__mkdir_p} $langtmp
- jarfile=$extensiondir/chrome/$language.jar
-# unzip $jarfile -d $langtmp
-
-# sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g;" \
-# $langtmp/locale/$language/navigator-region/region.properties
- sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g;" \
+ sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g" \
$extensiondir/chrome/$language/locale/$language/navigator-region/region.properties
-# find $langtmp -type f | xargs chmod 644
-# %{__rm} -rf $jarfile
-# cd $langtmp
- cd $extensiondir/chrome/$language
+ jarfile=$extensiondir/chrome/$language.jar
+ pushd $extensiondir/chrome/$language
zip -r -D $jarfile locale
- cd -
-# %{__rm} -rf $tmpdir
+ popd
+ %{__rm} -rf $extensiondir/chrome/$language # now in jar...
+
+ # fix manifest to point to jar
+ sed -i -e '/^manifest / d' \
+ -e 's,\([^ /]*/[^/]*\),jar:\1.jar!,' \
+ $extensiondir/chrome.manifest
language=`echo $language | sed -e 's/-/_/g'`
extensiondir=`echo $extensiondir | sed -e "s,^$RPM_BUILD_ROOT,,"`
echo "%%lang($language) $extensiondir" >> ../%{name}.lang
done
-%{__rm} -rf firefox-langpacks
+
+%{__rm} -rf seamonkey-langpacks
%endif # build_langpacks
# install desktop files in correct directory
@@ -328,13 +355,16 @@ chmod 755 $RPM_BUILD_ROOT/usr/bin/seamonkey
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/defaults/profile/bookmarks.html
ln -s %{default_bookmarks_file} $RPM_BUILD_ROOT/%{mozdir}/defaults/profile/bookmarks.html
+
%clean
%{__rm} -rf $RPM_BUILD_ROOT
+
%post
update-desktop-database %{_datadir}/applications
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
%postun
update-desktop-database %{_datadir}/applications
if [ $1 -eq 0 ] ; then
@@ -342,6 +372,7 @@ if [ $1 -eq 0 ] ; then
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -410,6 +441,33 @@ fi
%changelog
+* Thu Sep 27 2012 Dmitry Butskoy <Dmitry at Butskoy.name> 2.12.1-1.el6
+- port to EPEL6
+- use EL6 homepage way
+- use proper MOZ_SMP_FLAGS
+- fix build langpacks
+- fix startup warnings (error console) for omni and inspector
+- complete default prefs from the latest RHEL6 Firefox and Fedora 18 Seamonkey
+
+* Tue Aug 28 2012 Martin Stransky <stransky at redhat.com> 2.12.1-1
+- Update to 2.12.1
+
+* Tue Aug 28 2012 Martin Stransky <stransky at redhat.com> 2.12-1
+- Update to 2.12
+
+* Tue Jul 27 2012 Martin Stransky <stransky at redhat.com> 2.11-1
+- Update to 2.11
+
+* Thu Jun 21 2012 Martin Stransky <stransky at redhat.com> 2.10.1-1
+- Update to 2.10.1
+
+* Thu Jun 7 2012 Allen Hewes <allen at decisiv.net> 2.10-1
+- Update to 2.10
+- change sed string for version number to support 2 digits
+- remove specific .so's from installer manifest
+- fix the cache path for header.py and associated files when building
+ in srcdir (vs using seperate objdir)
+
* Mon May 7 2012 Martin Stransky <stransky at redhat.com> 2.9.1-4
- Fixed #717242 - does not adhere to Static Library Packaging Guidelines
diff --git a/sources b/sources
index 2bb1709..65d3fe6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8dd18d93a6570c3c9f3873bb177ccc6b seamonkey-2.9.1.source.tar.bz2
-40b7adfa315ff1aff0ee3343b495795d seamonkey-langpacks-2.9.1-20120502.tar.xz
+89bc1360aa1eb59c5b4177373bb16502 seamonkey-2.12.1.source.tar.bz2
+a269491c16f403d242b34ff417805ac7 seamonkey-langpacks-2.12.1-20120912.tar.xz
diff --git a/xulrunner-15.0-gcc47.patch b/xulrunner-15.0-gcc47.patch
new file mode 100644
index 0000000..0d44796
--- /dev/null
+++ b/xulrunner-15.0-gcc47.patch
@@ -0,0 +1,13 @@
+diff -up xulrunner-15.0/mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 xulrunner-15.0/mozilla-beta/toolkit/crashreporter/client/Makefile.in
+--- xulrunner-15.0/mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 2012-08-15 07:48:31.000000000 +0200
++++ xulrunner-15.0/mozilla-beta/toolkit/crashreporter/client/Makefile.in 2012-08-20 15:05:41.782947739 +0200
+@@ -34,6 +34,9 @@ CPPSRCS = \
+ crashreporter.cpp \
+ $(NULL)
+
++# Needed for moz_free
++LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
++
+ ifeq ($(OS_ARCH),WINNT)
+ CPPSRCS += crashreporter_win.cpp
+ LIBS += \
More information about the scm-commits
mailing list