[seamonkey/f17] update to 2.17
Dmitry Butskoy
buc at fedoraproject.org
Wed Apr 3 16:37:49 UTC 2013
commit 1be6b52e52cfe749062ee3c0cbb05b2f11efbfd8
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Wed Apr 3 20:37:33 2013 +0400
update to 2.17
...04121.patch => seamonkey-2.17-rhbz_304121.patch | 12 ++++++------
seamonkey.spec | 20 +++++++++++++++-----
sources | 4 ++--
3 files changed, 23 insertions(+), 13 deletions(-)
---
diff --git a/seamonkey-2.15-rhbz_304121.patch b/seamonkey-2.17-rhbz_304121.patch
similarity index 51%
rename from seamonkey-2.15-rhbz_304121.patch
rename to seamonkey-2.17-rhbz_304121.patch
index b5064d7..42bff63 100644
--- a/seamonkey-2.15-rhbz_304121.patch
+++ b/seamonkey-2.17-rhbz_304121.patch
@@ -1,12 +1,12 @@
-diff -Nrbu seamonkey-2.15/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py seamonkey-2.15-OK/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
---- seamonkey-2.15/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-01-06 10:26:26.000000000 +0400
-+++ seamonkey-2.15-OK/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-01-14 17:51:55.668267309 +0400
-@@ -376,7 +376,7 @@
+diff -Nrbu seamonkey-2.17/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py seamonkey-2.17-OK/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
+--- seamonkey-2.17/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-04-01 07:31:07.000000000 +0400
++++ seamonkey-2.17-OK/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-04-03 16:23:51.027633271 +0400
+@@ -377,7 +377,7 @@
WriteMakefile(output_file, data, build_file, depth, top,
# we set srcdir up one directory, since the subdir
# doesn't actually exist in the source directory
- swapslashes(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0])),
+ swapslashes(os.path.normpath(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0]))),
- self.relative_srcdir)
+ self.relative_srcdir,
+ self.common_mk_path)
return True
-
diff --git a/seamonkey.spec b/seamonkey.spec
index 5300aaa..665a061 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -24,7 +24,7 @@
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
-Version: 2.16.2
+Version: 2.17
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/seamonkey/
License: MPLv2.0
@@ -38,7 +38,7 @@ Source0: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%
#
# Run script as ./moz-grab-langpacks --app seamonkey %{version}
#
-Source1: seamonkey-langpacks-%{version}-20130315.tar.xz
+Source1: seamonkey-langpacks-%{version}-20130403.tar.xz
Source3: seamonkey.sh.in
Source4: seamonkey.desktop
@@ -55,7 +55,7 @@ Patch1: xulrunner-15.0-gcc47.patch
Patch5: seamonkey-8.0-enable-addons.patch
Patch10: seamonkey-idl-parser-cachepath.patch
Patch20: seamonkey-2.13-jemalloc.patch
-Patch21: seamonkey-2.15-rhbz_304121.patch
+Patch21: seamonkey-2.17-rhbz_304121.patch
Patch22: seamonkey-2.14-installdir.patch
Patch23: seamonkey-2.14-elfhack.patch
@@ -67,7 +67,7 @@ BuildRequires: nss-static >= %{minimum_build_nss_version}
%endif
BuildRequires: cairo-devel >= %{cairo_version}
BuildRequires: libpng-devel
-BuildRequires: libjpeg-devel
+BuildRequires: libjpeg-turbo-devel
BuildRequires: zlib-devel
BuildRequires: zip
BuildRequires: libIDL-devel
@@ -157,6 +157,9 @@ echo "ac_add_options --with-system-nss" >> .mozconfig
echo "ac_add_options --without-system-nspr" >> .mozconfig
echo "ac_add_options --without-system-nss" >> .mozconfig
%endif
+%ifnarch %{ix86} x86_64
+echo "ac_add_options --disable-webrtc" >> .mozconfig
+%endif
%build
@@ -474,6 +477,13 @@ fi
%changelog
+* Wed Apr 3 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.17-1
+- update to 2.17
+- explicitly require libjpeg-turbo (for JCS_EXTENSIONS)
+
+* Tue Mar 26 2013 Peter Robinson <pbrobinson at fedoraproject.org> 2.16.2-2
+- Only build WebRTC on x86 to fix FTBFS on other arches
+
* Fri Mar 15 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.16.2-1
- update to 2.16.2
- fix desktop files (#887297)
@@ -805,7 +815,7 @@ fi
* Fri Mar 17 2006 Kai Engert <kengert at redhat.com> 1.0-8
- Changed license to MPL
* Tue Mar 14 2006 Kai Engert <kengert at redhat.com> 1.0-7
-- updated %files section, removed %preun,
+- updated %%files section, removed %%preun,
- removed explicit nspr/nss requires
* Thu Mar 02 2006 Kai Engert <kengert at redhat.com> 1.0-6
- Use a single package for all included applications.
diff --git a/sources b/sources
index 01e5d28..187d2f4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e6c747c409b9e3a8e09af32492c1b42b seamonkey-2.16.2.source.tar.bz2
-063b25639bb39cab86ec9919e357a241 seamonkey-langpacks-2.16.2-20130315.tar.xz
+931f027dd6e2aac3e36e788f6d86979b seamonkey-2.17.source.tar.bz2
+f19fdef1fa4b639f8479e445a07a8b92 seamonkey-langpacks-2.17-20130403.tar.xz
More information about the scm-commits
mailing list