commit seamonkey for openSUSE:Factory
Hello community,
here is the log from the commit of package seamonkey for openSUSE:Factory checked in at 2018-01-13 21:46:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/seamonkey (Old)
and /work/SRC/openSUSE:Factory/.seamonkey.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "seamonkey"
Sat Jan 13 21:46:18 2018 rev:130 rq:562873 version:2.49.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/seamonkey/seamonkey.changes 2017-08-24 18:48:53.691023796 +0200
+++ /work/SRC/openSUSE:Factory/.seamonkey.new/seamonkey.changes 2018-01-13 21:46:41.568745160 +0100
@@ -1,0 +2,26 @@
+Tue Jan 9 07:53:08 UTC 2018 - wr@rosenauer.org
+
+- Explicitly buildrequires python2-xml: The build system relies on
+ it. We wrongly relied on other packages pulling it in for us.
+- use parallel compression in create-tar if available
+- use XZ instead of BZ2 for source archives
+- import upstream patch mozilla-bmo1338655.patch to fix failing
+ build
+
+-------------------------------------------------------------------
+Thu Dec 7 11:19:39 UTC 2017 - dimstar@opensuse.org
+
+- Escape the usage of %{VERSION} when calling out to rpm.
+ RPM 4.14 has %{VERSION} defined as 'the main packages version'.
+
+-------------------------------------------------------------------
+Fri Nov 10 22:30:10 UTC 2017 - zaitor@opensuse.org
+
+- Drop obsolete libgnomeui-devel BuildRequires: No longer needed.
+- Following the above, add explicit pkgconfig(gconf-2.0),
+ pkgconfig(gobject-2.0)pkgconfig(gdk-x11-2.0), pkgconfig(gtk+-2.0)
+ and pkgconfig(gtk+-unix-print-2.0) BuildRequires: previously
+ pulled in by libgnomeui-devel, and is what configure really
+ checks for.
+
+-------------------------------------------------------------------
@@ -12,0 +39,3 @@
+ * mozilla-binutils-visibility.patch
+ * mozilla-check_return.patch
+ * mozilla-skia-overflow.patch
Old:
----
compare-locales.tar.bz2
l10n-2.48.tar.bz2
mozilla-binutils-visibility.patch
mozilla-check_return.patch
mozilla-skia-overflow.patch
seamonkey-2.48-source.tar.bz2
New:
----
compare-locales.tar.xz
l10n-2.49.1.tar.xz
mozilla-bmo1338655.patch
seamonkey-2.49.1-source.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ seamonkey.spec ++++++
--- /var/tmp/diff_new_pack.XHUt0O/_old 2018-01-13 21:46:50.464330471 +0100
+++ /var/tmp/diff_new_pack.XHUt0O/_new 2018-01-13 21:46:50.468330284 +0100
@@ -1,7 +1,7 @@
#
# spec file for package seamonkey
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# 2006-2016 Wolfgang Rosenauer
#
# All modifications and additions to the file contributed by third parties
@@ -17,54 +17,70 @@
#
+%define _use_rust 0
+%if 0%{?suse_version} > 1320
+%ifarch x86_64
+%define _use_rust 1
+%endif
+%endif
+
Name: seamonkey
BuildRequires: Mesa-devel
+BuildRequires: alsa-devel
BuildRequires: autoconf213
BuildRequires: dbus-1-glib-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: hunspell-devel
-BuildRequires: libgnomeui-devel
BuildRequires: libidl-devel
BuildRequires: libiw-devel
BuildRequires: libnotify-devel
BuildRequires: libproxy-devel
BuildRequires: makeinfo
-BuildRequires: python
+BuildRequires: python-devel
+BuildRequires: python2-xml
BuildRequires: startup-notification-devel
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-libXt-devel
BuildRequires: yasm
BuildRequires: zip
-BuildRequires: pkgconfig(libpulse)
-BuildRequires: pkgconfig(xcomposite)
-%if 0%{?suse_version} > 1320
-BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gconf-2.0) >= 1.2.1
+BuildRequires: pkgconfig(gdk-x11-2.0)
+BuildRequires: pkgconfig(glib-2.0) >= 2.22
BuildRequires: pkgconfig(gobject-2.0)
+BuildRequires: pkgconfig(gtk+-2.0) >= 2.18.0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.0
+BuildRequires: pkgconfig(gtk+-unix-print-2.0)
BuildRequires: pkgconfig(gtk+-unix-print-3.0)
+BuildRequires: pkgconfig(libffi) > 3.0.9
+BuildRequires: pkgconfig(libpulse)
+BuildRequires: pkgconfig(xcomposite)
+%if 0%{?_use_rust}
+BuildRequires: cargo
+BuildRequires: rust >= 1.10
+BuildRequires: rust-std
%endif
Provides: web_browser
Provides: browser(npapi)
-Version: 2.48
+Version: 2.49.1
Release: 0
-%define releasedate 20170721000000
+%define releasedate 20171002000000
Summary: The successor of the Mozilla Application Suite
License: MPL-2.0
Group: Productivity/Networking/Web/Browsers
Url: http://www.mozilla.org/projects/seamonkey
-Source: seamonkey-%{version}-source.tar.bz2
+Source: seamonkey-%{version}-source.tar.xz
Source1: seamonkey-desktop.tar.bz2
Source2: spellcheck.js
Source3: mozilla.sh.in
Source4: suse-default-prefs.js
-Source5: l10n-%{version}.tar.bz2
+Source5: l10n-%{version}.tar.xz
Source6: search-addons.tar.bz2
Source7: seamonkey-rpmlintrc
Source8: find-external-requires.sh
Source9: create-tar.sh
-Source10: compare-locales.tar.bz2
+Source10: compare-locales.tar.xz
Source11: seamonkey-appdata.tar.bz2
Patch1: mozilla-nongnome-proxies.patch
Patch3: mozilla-language.patch
@@ -72,9 +88,7 @@
Patch5: mozilla-ua-locale.patch
Patch6: mozilla-no-stdcxx-check.patch
Patch7: mozilla-reduce-files-per-UnifiedBindings.patch
-Patch8: mozilla-check_return.patch
-Patch9: mozilla-binutils-visibility.patch
-Patch10: mozilla-skia-overflow.patch
+Patch8: mozilla-bmo1338655.patch
Patch100: seamonkey-ua-locale.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: /bin/sh coreutils
@@ -114,9 +128,9 @@
%global __find_provides %provfind
# the following conditions are always met in Factory by definition
BuildRequires: mozilla-nspr-devel >= 4.13.1
-PreReq: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
-BuildRequires: mozilla-nss-devel >= 3.28.5
-PreReq: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
+PreReq: mozilla-nspr >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr)
+BuildRequires: mozilla-nss-devel >= 3.28.6
+PreReq: mozilla-nss >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nss)
%description
Originally based on the Netscape Communicator source, the SeaMonkey
@@ -190,8 +204,6 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
-%patch10 -p1
popd
# comm patches
%patch100 -p1
@@ -268,6 +280,10 @@
ac_add_options --disable-updater
ac_add_options --enable-startup-notification
ac_add_options --enable-system-hunspell
+ac_add_options --enable-alsa
+%if 0%{?_use_rust}
+ac_add_options --enable-rust
+%endif
#ac_add_options --enable-system-mozldap
%if %has_system_cairo
ac_add_options --enable-system-cairo
@@ -405,13 +421,14 @@
%{progdir}/chrome/icons
%{progdir}/extensions/modern@themes.mozilla.org.xpi
%{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
+%{progdir}/fonts/
%{progdir}/isp/
%{progdir}/searchplugins/
%{progdir}/application.ini
%{progdir}/blocklist.xml
%{progdir}/chrome.manifest
%{progdir}/dependentlibs.list
-%{progdir}/icudt56l.dat
+%{progdir}/icudt58l.dat
%{progdir}/*.so
#%{progdir}/mozilla-xremote-client
%{progdir}/omni.ja
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.XHUt0O/_old 2018-01-13 21:46:50.520327860 +0100
+++ /var/tmp/diff_new_pack.XHUt0O/_new 2018-01-13 21:46:50.524327674 +0100
@@ -1,9 +1,9 @@
#!/bin/bash
-CHANNEL="release"
+CHANNEL="esr52"
BRANCH="releases/comm-$CHANNEL"
-RELEASE_TAG="SEAMONKEY_2_48_RELEASE"
-VERSION="2.48"
+RELEASE_TAG="SEAMONKEY_2_49_1_RELEASE"
+VERSION="2.49.1"
echo "cloning $BRANCH..."
hg clone http://hg.mozilla.org/$BRANCH seamonkey
@@ -14,8 +14,16 @@
_extra="--comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG --inspector-rev=$RELEASE_TAG --venkman-rev=$RELEASE_TAG --chatzilla-rev=$RELEASE_TAG"
python client.py checkout $_extra --mozilla-repo=http://hg.mozilla.org/releases/mozilla-$CHANNEL
popd
+
+# use parallel compression, if available
+compression='-J'
+pixz -h > /dev/null 2>&1
+if (($? != 127)); then
+ compression='-Ipixz'
+fi
+
echo "creating archive..."
-tar cjf seamonkey-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS seamonkey
+tar $compression -cf seamonkey-$VERSION-source.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS seamonkey
# l10n
echo "fetching locales..."
@@ -36,11 +44,11 @@
esac
done
echo "creating l10n archive..."
-tar cjf l10n-$VERSION.tar.bz2 \
+tar $compression -cf l10n-$VERSION.tar.xz \
--exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=calendar \
--exclude=mail \
l10n
# compare-locales
hg clone http://hg.mozilla.org/build/compare-locales
-tar cjf compare-locales.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg compare-locales
+tar $compression -cf compare-locales.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg compare-locales
++++++ mozilla-bmo1338655.patch ++++++
# HG changeset patch
# User Ralph Giles
participants (1)
-
root@hilbert.suse.de