[seamonkey] Update to 2.13 - WIP

[Martin Stransky]

commit 0477a97f5a90c583430551f5459a9948bc617749
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Oct 9 16:56:21 2012 +0200

    Update to 2.13 - WIP

 .gitignore          |    2 ++
 seamonkey-mozconfig |    4 +---
 seamonkey.spec      |   34 +++++++++++++++++++++++++++++-----
 sources             |    4 ++--
 4 files changed, 34 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 938be82..9f3797f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,5 @@ seamonkey-2.0.6.source.tar.bz2
 /seamonkey-langpacks-2.12-20120828.tar.xz
 /seamonkey-2.12.1.source.tar.bz2
 /seamonkey-langpacks-2.12.1-20120912.tar.xz
+/seamonkey-2.13.source.tar.bz2
+/seamonkey-langpacks-2.13-20121009.tar.xz
diff --git a/seamonkey-mozconfig b/seamonkey-mozconfig
index a36e9a0..7cbee3f 100644
--- a/seamonkey-mozconfig
+++ b/seamonkey-mozconfig
@@ -2,8 +2,6 @@ ac_add_options --enable-application=suite
 
 ac_add_options --prefix="$PREFIX"
 ac_add_options --libdir="$LIBDIR"
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 #ac_add_options --with-system-png
@@ -40,5 +38,5 @@ export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
diff --git a/seamonkey.spec b/seamonkey.spec
index 9d09a58..e5d39b7 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -1,9 +1,14 @@
+# Use system nspr/nss?
+%define system_nss        1
+
 %define homepage http://start.fedoraproject.org/
 %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 %define cairo_version 0.5
 
+%if %{?system_nss}
 %define minimum_build_nspr_version 4.9
 %define minimum_build_nss_version 3.13.3
+%endif
 
 %define build_langpacks 1
 
@@ -15,14 +20,14 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        2.12.1
+Version:        2.13
 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}-20120912.tar.xz
+Source1:        seamonkey-langpacks-%{version}-20121009.tar.xz
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
 Source7:        seamonkey-make-package.pl
@@ -39,8 +44,11 @@ Patch5:         seamonkey-8.0-enable-addons.patch
 Patch10:        seamonkey-idl-parser-cachepath.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{?system_nss}
 BuildRequires:  nspr-devel >= %{minimum_build_nspr_version}
 BuildRequires:  nss-devel >= %{minimum_build_nss_version}
+BuildRequires:  nss-static >= %{minimum_build_nss_version}
+%endif
 BuildRequires:  cairo-devel >= %{cairo_version}
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
@@ -67,13 +75,14 @@ BuildRequires:  system-bookmarks
 BuildRequires:  libnotify-devel
 BuildRequires:  libvpx-devel
 BuildRequires:  mesa-libGL-devel
-BuildRequires:  nss-static
 Requires:       system-bookmarks
 Requires:       mozilla-filesystem
 Requires:       hicolor-icon-theme
 Requires:       libvpx
+%if %{?system_nss}
 Requires:       nspr >= %{minimum_build_nspr_version}
 Requires:       nss >= %{minimum_build_nss_version}
+%endif
 
 Obsoletes: seamonkey-chat
 Obsoletes: seamonkey-devel
@@ -116,6 +125,14 @@ popd
 echo "ac_add_options --disable-elf-hack" >> .mozconfig
 %endif
 
+%if %{?system_nss}
+echo "ac_add_options --with-system-nspr" >> .mozconfig
+echo "ac_add_options --with-system-nss" >> .mozconfig
+%else
+echo "ac_add_options --without-system-nspr" >> .mozconfig
+echo "ac_add_options --without-system-nss" >> .mozconfig
+%endif
+
 %build
 cd %{sources_subdir}
 
@@ -145,10 +162,10 @@ make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
 %{__rm} -rf $RPM_BUILD_ROOT
 cd %{sources_subdir}
 
-DESTDIR=$RPM_BUILD_ROOT make install
+DESTDIR=$RPM_BUILD_ROOT make -C objdir install
 
 # fix omni.jar to actually work
-pushd mozilla/dist/bin
+pushd objdir/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
 zip -9r $RPM_BUILD_ROOT/%{mozdir}/omni.ja chrome.manifest components/*.xpt chrome/*.manifest components/*.manifest components/*.js
 popd
@@ -404,10 +421,17 @@ fi
 %{_datadir}/applications/mozilla-%{name}.desktop
 %{_datadir}/applications/mozilla-%{name}-mail.desktop
 
+%if !%{?system_nss}
+%{mozdir}/*.chk
+%endif
+
 %ghost %{mozdir}/removed-files
 
 
 %changelog
+* Tue Oct 9 2012 Martin Stransky <stransky at redhat.com> 2.13-1
+- Update to 2.13
+
 * Tue Aug 28 2012 Martin Stransky <stransky at redhat.com> 2.12.1-1
 - Update to 2.12.1
 
diff --git a/sources b/sources
index 65d3fe6..0699c99 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-89bc1360aa1eb59c5b4177373bb16502  seamonkey-2.12.1.source.tar.bz2
-a269491c16f403d242b34ff417805ac7  seamonkey-langpacks-2.12.1-20120912.tar.xz
+fe4c432cf1e88536c06448131739cb1a  seamonkey-2.13.source.tar.bz2
+9252004fc6adfdd808922ace82979229  seamonkey-langpacks-2.13-20121009.tar.xz