Hello community, here is the log from the commit of package mozilla-xulrunner20 for openSUSE:Factory checked in at Wed Dec 29 00:17:17 CET 2010. -------- --- mozilla-xulrunner20/mozilla-xulrunner20.changes 2010-11-12 19:55:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-xulrunner20/mozilla-xulrunner20.changes 2010-12-15 09:33:54.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 15 07:48:50 UTC 2010 - wr@rosenauer.org + +- update to 2.0b8 +- removed obsolete patches + * mozilla-jemalloc-symbols + * mozilla-buildsymbols + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mozilla-buildsymbols.patch mozilla-jemalloc-symbols.patch New: ---- mozilla-firefox-sync.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner20.spec ++++++ --- /var/tmp/diff_new_pack.gF9P25/_old 2010-12-29 00:16:57.000000000 +0100 +++ /var/tmp/diff_new_pack.gF9P25/_new 2010-12-29 00:16:57.000000000 +0100 @@ -31,9 +31,9 @@ %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Version: 2.0b -Release: 3 -%define releasedate 2010110500 -%define version_internal 2.0b7 +Release: 4 +%define releasedate 2010121400 +%define version_internal 2.0b8 %define apiversion 2.0 %define uaweight 199900 Summary: Mozilla Runtime Environment 2.0 @@ -70,9 +70,8 @@ Patch10: toolkit-ui-lockdown.patch # --- Patch11: mozilla-cpuid.patch -Patch12: mozilla-buildsymbols.patch -Patch13: mozilla-language.patch -Patch14: mozilla-jemalloc-symbols.patch +Patch12: mozilla-language.patch +Patch13: mozilla-firefox-sync.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js20 = %{version} Requires(post): update-alternatives coreutils @@ -215,7 +214,6 @@ %endif %patch12 -p1 %patch13 -p1 -%patch14 -p1 %build kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3) ++++++ compare-locales.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/lib/Mozilla/CompareLocales.py new/compare-locales/lib/Mozilla/CompareLocales.py --- old/compare-locales/lib/Mozilla/CompareLocales.py 2010-11-06 13:43:49.000000000 +0100 +++ new/compare-locales/lib/Mozilla/CompareLocales.py 2010-12-15 09:07:39.000000000 +0100 @@ -418,7 +418,11 @@ shutil.copyfile(l10n_file.fullpath, outfile) f = codecs.open(outfile, 'ab', p.encoding) print "adding to " + outfile - f.write(''.join(trailing)) + def ensureNewline(s): + if not s.endswith('\n'): + return s + '\n' + return s + f.write(''.join(map(ensureNewline,trailing))) f.close() def notify(self, category, file, data): '''Check filterObserver for the found data, and if it's diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/lib/Mozilla/__init__.py new/compare-locales/lib/Mozilla/__init__.py --- old/compare-locales/lib/Mozilla/__init__.py 2010-11-06 13:43:49.000000000 +0100 +++ new/compare-locales/lib/Mozilla/__init__.py 2010-12-15 09:07:39.000000000 +0100 @@ -1 +1 @@ -version="0.9" +version="0.9.1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/lib/Mozilla/tests/unitMerge.py new/compare-locales/lib/Mozilla/tests/unitMerge.py --- old/compare-locales/lib/Mozilla/tests/unitMerge.py 1970-01-01 01:00:00.000000000 +0100 +++ new/compare-locales/lib/Mozilla/tests/unitMerge.py 2010-12-15 09:07:39.000000000 +0100 @@ -0,0 +1,132 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is l10n test automation. +# +# The Initial Developer of the Original Code is +# Mozilla Foundation +# Portions created by the Initial Developer are Copyright (C) 2010 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Axel Hecht <l10n@mozilla.com> +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +import unittest +import os +from tempfile import mkdtemp +import shutil + +from Mozilla.Parser import getParser +from Mozilla.Paths import File +from Mozilla.CompareLocales import ContentComparer, Observer + +class TestProperties(unittest.TestCase): + def setUp(self): + self.tmp = mkdtemp() + os.mkdir(os.path.join(self.tmp, "merge")) + self.ref = os.path.join(self.tmp, "en-reference.properties") + open(self.ref, "w").write("""foo = fooVal +bar = barVal +eff = effVal""") + def tearDown(self): + shutil.rmtree(self.tmp) + del self.tmp + def testGood(self): + self.assertTrue(os.path.isdir(self.tmp)) + l10n = os.path.join(self.tmp, "l10n.properties") + open(l10n, "w").write("""foo = lFoo +bar = lBar +eff = lEff +""") + obs = Observer() + cc = ContentComparer(obs) + cc.set_merge_stage(os.path.join(self.tmp, "merge")) + cc.compare(File(self.ref, "en-reference.properties", ""), + File(l10n, "l10n.properties", "")) + print obs.serialize() + def testMissing(self): + self.assertTrue(os.path.isdir(self.tmp)) + l10n = os.path.join(self.tmp, "l10n.properties") + open(l10n, "w").write("""bar = lBar +""") + obs = Observer() + cc = ContentComparer(obs) + cc.set_merge_stage(os.path.join(self.tmp, "merge")) + cc.compare(File(self.ref, "en-reference.properties", ""), + File(l10n, "l10n.properties", "")) + print obs.serialize() + mergefile = os.path.join(self.tmp, "merge", "l10n.properties") + self.assertTrue(os.path.isfile(mergefile)) + p = getParser(mergefile) + p.readFile(mergefile) + [m,n] = p.parse() + self.assertEqual(map(lambda e:e.key,m), ["bar", "eff", "foo"]) + +class TestDTD(unittest.TestCase): + def setUp(self): + self.tmp = mkdtemp() + os.mkdir(os.path.join(self.tmp, "merge")) + self.ref = os.path.join(self.tmp, "en-reference.dtd") + open(self.ref, "w").write("""<!ENTITY foo 'fooVal'> +<!ENTITY bar 'barVal'> +<!ENTITY eff 'effVal'>""") + def tearDown(self): + shutil.rmtree(self.tmp) + del self.tmp + def testGood(self): + self.assertTrue(os.path.isdir(self.tmp)) + l10n = os.path.join(self.tmp, "l10n.dtd") + open(l10n, "w").write("""<!ENTITY foo 'lFoo'> +<!ENTITY bar 'lBar'> +<!ENTITY eff 'lEff'> +""") + obs = Observer() + cc = ContentComparer(obs) + cc.set_merge_stage(os.path.join(self.tmp, "merge")) + cc.compare(File(self.ref, "en-reference.dtd", ""), + File(l10n, "l10n.dtd", "")) + print obs.serialize() + def testMissing(self): + self.assertTrue(os.path.isdir(self.tmp)) + l10n = os.path.join(self.tmp, "l10n.dtd") + open(l10n, "w").write("""<!ENTITY bar 'lBar'> +""") + obs = Observer() + cc = ContentComparer(obs) + cc.set_merge_stage(os.path.join(self.tmp, "merge")) + cc.compare(File(self.ref, "en-reference.dtd", ""), + File(l10n, "l10n.dtd", "")) + print obs.serialize() + mergefile = os.path.join(self.tmp, "merge", "l10n.dtd") + self.assertTrue(os.path.isfile(mergefile)) + p = getParser(mergefile) + p.readFile(mergefile) + [m,n] = p.parse() + self.assertEqual(map(lambda e:e.key,m), ["bar", "eff", "foo"]) + +if __name__ == '__main__': + unittest.main() ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.gF9P25/_old 2010-12-29 00:16:57.000000000 +0100 +++ /var/tmp/diff_new_pack.gF9P25/_new 2010-12-29 00:16:57.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash BRANCH="mozilla-central" -RELEASE_TAG="FIREFOX_4_0b7_RELEASE" +RELEASE_TAG="FIREFOX_4_0b8_RELEASE" VERSION="2.0b" # mozilla ++++++ l10n-2.0b.tar.bz2 ++++++ mozilla-xulrunner20/l10n-2.0b.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner20/l10n-2.0b.tar.bz2 differ: char 11, line 1 ++++++ mozilla-firefox-sync.patch ++++++ ++++ 2068 lines (skipped) ++++++ xulrunner-source-2.0b.tar.bz2 ++++++ mozilla-xulrunner20/xulrunner-source-2.0b.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner20/xulrunner-source-2.0b.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org