Hello community,
here is the log from the commit of package mozilla-xulrunner190
checked in at Fri Sep 26 15:03:36 CEST 2008.
--------
--- mozilla-xulrunner190/mozilla-xulrunner190.changes 2008-09-04 14:56:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/mozilla-xulrunner190/mozilla-xulrunner190.changes 2008-09-25 21:46:05.000000000 +0200
@@ -1,0 +2,17 @@
+Thu Sep 25 14:45:48 CDT 2008 - maw@suse.de
+
+- Review and approve changes.
+
+-------------------------------------------------------------------
+Mon Sep 15 10:20:40 CEST 2008 - wr@rosenauer.org
+
+- update to security/maintenance release 1.9.0.2 (bnc#429179)
+ * support more locales
+ * removed upstreamed patches
+- added PyXPCOM subpackage python-xpcom190
+- fix helper app detection for application/octet-stream type
+ (bnc#406979, bmo#327323)
+- stop shipping the "simple" example
+- use system provided cairo from 11.1 on
+
+-------------------------------------------------------------------
Old:
----
bmo430450.patch
bmo435764.patch
l10n-1.9.0.1.tar.bz2
mozilla-system-hunspell.patch
xulrunner-source-1.9.0.1.tar.bz2
New:
----
l10n-1.9.0.2.tar.bz2
mozilla-helper-app.patch
mozilla-pyxpcom.patch
mozilla-system-hunspell.patch.bz2
mozilla-xulrunner190-rpmlintrc
xulrunner-source-1.9.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozilla-xulrunner190.spec ++++++
--- /var/tmp/diff_new_pack.j32406/_old 2008-09-26 15:01:34.000000000 +0200
+++ /var/tmp/diff_new_pack.j32406/_new 2008-09-26 15:01:34.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package mozilla-xulrunner190 (Version 1.9.0.1)
+# spec file for package mozilla-xulrunner190 (Version 1.9.0.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
Name: mozilla-xulrunner190
-BuildRequires: gcc-c++ libgnomeui-devel libidl-devel python startup-notification-devel update-desktop-files zip
+BuildRequires: gcc-c++ libgnomeui-devel libidl-devel python-devel startup-notification-devel update-desktop-files zip
# needed for brp-check-bytecode-version (jar, fastjar would do as well)
BuildRequires: unzip
%if %suse_version > 1020
@@ -29,8 +29,8 @@
BuildRequires: hunspell-devel
%endif
License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
-Version: 1.9.0.1
-Release: 17
+Version: 1.9.0.2
+Release: 1
Summary: Mozilla Runtime Environment 1.9
Url: http://www.mozilla.org
Group: Productivity/Other
@@ -38,6 +38,7 @@
Source: xulrunner-source-%{version}.tar.bz2
Source1: l10n-%{version}.tar.bz2
Source2: find-external-requires.sh
+Source3: mozilla-xulrunner190-rpmlintrc
Source4: xulrunner-openSUSE-prefs.js
Source5: add-plugins.sh.in
Patch1: mozilla-gcc43.patch
@@ -47,12 +48,12 @@
Patch5: mozilla-path_len.patch
Patch6: mozilla-sqlite-req.patch
Patch7: mozilla-nongnome-proxies.patch
-Patch9: mozilla-system-hunspell.patch
+Patch8: mozilla-helper-app.patch
+Patch9: mozilla-system-hunspell.patch.bz2
Patch10: mozilla-restart-cmd.patch
Patch11: mozilla-cairo-no-sse.patch
-Patch12: bmo435764.patch
-Patch13: bmo430450.patch
Patch14: mozilla-aboutAbout.patch
+Patch15: mozilla-pyxpcom.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: libstdc++ expat pango xorg-x11-libs fontconfig freetype2
PreReq: gtk2 atk glib2 update-alternatives coreutils
@@ -65,10 +66,13 @@
%define has_system_nspr 1
%define has_system_nss 1
%endif
-%define releasedate 2008070400
+%if %suse_version > 1100
+%define has_system_cairo 1
+%endif
+%define releasedate 2008091700
%define version_internal %{version}
%define apiversion 1.9
-%define uaweight 190100
+%define uaweight 190200
### configuration end ###
%define _use_internal_dependency_generator 0
%define __find_requires sh %{SOURCE2}
@@ -118,8 +122,8 @@
Summary: Translations for XULRunner 1.9
Group: System/Localization
PreReq: %{name} = %{version}
-Provides: locale(%{name}:af;ar;be;ca;cs;da;de;el;en_GB;es_AR;es_ES;eu;fi;fr;fy_NL;ga_IE;gu_IN;he;hu;id;it;ja;ka;ko;ku;lt;mk;mn;nb_NO;nl;nn_NO;pa_IN;pl;pt_BR;pt_PT;ro;ru;si;sk;sl;sq;sr;sv_SE;tr;uk;zh_CN;zh_TW)
-# Remove -lang, which had been shipped in the build service and 11.0 prereleases
+Provides: locale(%{name}:af;ar;be;bn_IN;ca;cs;da;de;el;en_GB;es_AR;es_ES;eu;fi;fr;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hu;id;is;it;ja;ka;kn;ko;ku;lt;mk;mn;mr;nb_NO;nl;nn_NO;pa_IN;pl;pt_BR;pt_PT;ro;ru;si;sk;sl;sq;sr;sv_SE;te;th;tr;uk;zh_CN;zh_TW)
+# from OBS and 11.0beta updates
Provides: %{name}-lang = %{version}
Obsoletes: %{name}-lang < %{version}
@@ -155,6 +159,26 @@
--------
Mozilla Foundation
+%package -n python-xpcom190
+License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
+Summary: Mozilla Runtime Environment 1.9
+Group: Productivity/Other
+Provides: python-xpcom
+Conflicts: python-xpcom191
+PreReq: %{name} = %{version}-%{release}
+%py_requires
+
+%description -n python-xpcom190
+XULRunner is a single installable package that can be used to bootstrap
+multiple XUL+XPCOM applications that are as rich as Firefox and
+Thunderbird.
+
+
+
+Authors:
+--------
+ Mozilla Foundation
+
%prep
%setup -n mozilla -b 1 -q
%patch1
@@ -164,14 +188,14 @@
%patch5 -p1
%patch6
%patch7
+%patch8
pushd extensions
%patch9
popd
%patch10
%patch11
-%patch12
-%patch13
%patch14
+%patch15
%build
MOZ_APP_DIR=%{_libdir}/%{name}-%{version_internal}
@@ -200,7 +224,7 @@
ac_add_options --mandir=%{_mandir}
ac_add_options --includedir=%{_includedir}
ac_add_options --enable-optimize
-ac_add_options --enable-extensions=default
+ac_add_options --enable-extensions=python,default
ac_add_options --with-system-jpeg
#ac_add_options --with-system-png # no APNG support
ac_add_options --with-system-zlib
@@ -257,7 +281,7 @@
ln -sf ../../../xulrunner-%{version_internal}/libxul.so \
$RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/lib/
# XPI example
-cp -rL dist/xpi-stage/simple $RPM_BUILD_ROOT/%{_libdir}/xulrunner-%{version_internal}/
+#cp -rL dist/xpi-stage/simple $RPM_BUILD_ROOT/%{_libdir}/xulrunner-%{version_internal}/
# preferences
cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/greprefs/all-openSUSE.js
# install add-plugins.sh
@@ -297,6 +321,11 @@
%if 0%{?ga_version:1}
touch $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{ga_version}
%endif
+# moving Python stuff
+mkdir -p $RPM_BUILD_ROOT%{py_sitedir}/
+cp -r $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/python/* \
+ $RPM_BUILD_ROOT%{py_sitedir}/ && \
+ rm -rf $RPM_BUILD_ROOT/%{_libdir}/xulrunner-%{version_internal}/python
# fdupes
%if %suse_version > 1020
%fdupes $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version_internal}/
@@ -386,13 +415,16 @@
%exclude %{_libdir}/xulrunner-%{version_internal}/updater
%exclude %{_libdir}/xulrunner-%{version_internal}/LICENSE
%exclude %{_libdir}/xulrunner-%{version_internal}/README.txt
+%exclude %{_libdir}/xulrunner-%{version_internal}/libpy*.so
+%exclude %{_libdir}/xulrunner-%{version_internal}/components/libpy*.so
+%exclude %{_libdir}/xulrunner-%{version_internal}/components/pyabout.py
# ghosts
%ghost %{_libdir}/xulrunner-%{version_internal}/global.reginfo
# GRE
%dir %{_sysconfdir}/gre.d/
%attr(644,root,root) %{_sysconfdir}/gre.d/*
# example
-%{_libdir}/xulrunner-%{version_internal}/simple/
+#%{_libdir}/xulrunner-%{version_internal}/simple/
# API symlink
%{_libdir}/xulrunner-%{apiversion}
# compat symlinks
@@ -416,6 +448,15 @@
%defattr(-,root,root)
%{_libdir}/xulrunner-%{version_internal}/components/libmozgnome.so
%{_libdir}/xulrunner-%{version_internal}/components/libnkgnomevfs.so
+
+%files -n python-xpcom190
+%defattr(-,root,root)
+%{_libdir}/xulrunner-%{version_internal}/libpyxpcom.so
+%{_libdir}/xulrunner-%{version_internal}/components/libpydom.so
+%{_libdir}/xulrunner-%{version_internal}/components/libpyloader.so
+%{_libdir}/xulrunner-%{version_internal}/components/pyabout.py
+%{py_sitedir}/nsdom/
+%{py_sitedir}/xpcom/
%if %localize
%files translations -f %{_tmppath}/translations.list
@@ -423,6 +464,17 @@
%endif
%changelog
+* Thu Sep 25 2008 maw@suse.de
+- Review and approve changes.
+* Mon Sep 15 2008 wr@rosenauer.org
+- update to security/maintenance release 1.9.0.2 (bnc#429179)
+ * support more locales
+ * removed upstreamed patches
+- added PyXPCOM subpackage python-xpcom190
+- fix helper app detection for application/octet-stream type
+ (bnc#406979, bmo#327323)
+- stop shipping the "simple" example
+- use system provided cairo from 11.1 on
* Thu Sep 04 2008 ro@suse.de
- get rid of at least one opensuse_bs check
(should really check project name and not buildsystem)
@@ -430,7 +482,7 @@
- Check whether the build is happening on the build service
by using 0%%{?opensuse_bs}
- Readd unzip to the list of build requirements.
-* Sat Aug 16 2008 maw@novell.com
+* Fri Aug 15 2008 maw@novell.com
- Review and approve changes.
* Wed Aug 06 2008 wr@rosenauer.org
- Fix releasedate and apiversion defines
@@ -462,11 +514,11 @@
* Mon May 26 2008 maw@suse.de
- Fix baselibs.conf to mention mozilla-xulrunner190-translations
(bnc#393856).
-* Wed May 21 2008 maw@suse.de
+* Tue May 20 2008 maw@suse.de
- Add mozilla-pkgconfig.patch (part of bnc#381154).
-* Wed May 21 2008 maw@suse.de
+* Tue May 20 2008 maw@suse.de
- Add mozilla-fsync-bmo499050.patch (bmo#499050).
-* Thu May 01 2008 maw@suse.de
+* Wed Apr 30 2008 maw@suse.de
- Merge changes from the build service (thanks, Wolfgang):
+ Only use gconf proxy settings under GNOME (bnc#381172)
+ Add mozilla-extensionmanager.patch (bnc#381733, and #382969)
++++++ l10n-1.9.0.1.tar.bz2 -> l10n-1.9.0.2.tar.bz2 ++++++
mozilla-xulrunner190/l10n-1.9.0.1.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner190/l10n-1.9.0.2.tar.bz2 differ: byte 11, line 1
++++++ mozilla-helper-app.patch ++++++
From: Wolfgang Rosenauer
Subject: no helper app for application/octet-stream but recognized extensions
References:
https://bugzilla.novell.com/show_bug.cgi?id=406979
https://bugzilla.mozilla.org/show_bug.cgi?id=327323
Index: uriloader/exthandler/nsMIMEInfoImpl.cpp
===================================================================
RCS file: /cvsroot/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp,v
retrieving revision 1.69
diff -u -p -6 -r1.69 nsMIMEInfoImpl.cpp
--- uriloader/exthandler/nsMIMEInfoImpl.cpp 19 Oct 2007 04:15:43 -0000 1.69
+++ uriloader/exthandler/nsMIMEInfoImpl.cpp 20 Aug 2008 15:45:32 -0000
@@ -408,13 +408,13 @@ nsMIMEInfoBase::LaunchWithURI(nsIURI* aU
}
void
nsMIMEInfoBase::CopyBasicDataTo(nsMIMEInfoBase* aOther)
{
aOther->mType = mType;
- aOther->mDefaultAppDescription = mDefaultAppDescription;
+ //aOther->mDefaultAppDescription = mDefaultAppDescription;
aOther->mExtensions = mExtensions;
aOther->mMacType = mMacType;
aOther->mMacCreator = mMacCreator;
}
Index: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
===================================================================
RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp,v
retrieving revision 1.5
diff -u -p -6 -r1.5 nsMIMEInfoUnix.cpp
--- uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 8 Apr 2008 23:18:16 -0000 1.5
+++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 20 Aug 2008 15:45:32 -0000
@@ -37,49 +37,63 @@
*
* ***** END LICENSE BLOCK ***** */
#include "nsMIMEInfoUnix.h"
#include "nsGNOMERegistry.h"
#include "nsIGnomeVFSService.h"
+#include "nsAutoPtr.h"
nsresult
nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI)
{
return nsGNOMERegistry::LoadURL(aURI);
}
NS_IMETHODIMP
nsMIMEInfoUnix::GetHasDefaultHandler(PRBool *_retval)
{
*_retval = PR_FALSE;
- nsCOMPtr<nsIGnomeVFSService> vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
- if (vfs) {
- nsCOMPtr<nsIGnomeVFSMimeApp> app;
- if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app)
- *_retval = PR_TRUE;
+ nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mType);
+ if (!mimeInfo) {
+ nsCAutoString ext;
+ GetPrimaryExtension(ext);
+ mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
}
+ if (mimeInfo)
+ *_retval = PR_TRUE;
+
if (*_retval)
return NS_OK;
// If we didn't find a VFS handler, fallback.
return nsMIMEInfoImpl::GetHasDefaultHandler(_retval);
}
nsresult
nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile *aFile)
{
nsCAutoString nativePath;
aFile->GetNativePath(nativePath);
-
+
nsCOMPtr<nsIGnomeVFSService> vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
if (vfs) {
nsCOMPtr<nsIGnomeVFSMimeApp> app;
if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app)
return app->Launch(nativePath);
+
+ // If we haven't got an app we try to get a valid one by searching for the
+ // extension mapped type
+ nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath);
+ if (mimeInfo) {
+ nsCAutoString type;
+ mimeInfo->GetType(type);
+ if (NS_SUCCEEDED(vfs->GetAppForMimeType(type, getter_AddRefs(app))) && app)
+ return app->Launch(nativePath);
+ }
}
if (!mDefaultApplication)
return NS_ERROR_FILE_NOT_FOUND;
return LaunchWithIProcess(mDefaultApplication, nativePath);
Index: uriloader/exthandler/unix/nsOSHelperAppService.cpp
===================================================================
RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v
retrieving revision 1.74
diff -u -p -6 -r1.74 nsOSHelperAppService.cpp
--- uriloader/exthandler/unix/nsOSHelperAppService.cpp 20 Feb 2008 06:10:33 -0000 1.74
+++ uriloader/exthandler/unix/nsOSHelperAppService.cpp 20 Aug 2008 15:45:33 -0000
@@ -1621,12 +1621,16 @@ nsOSHelperAppService::GetMIMEInfoFromOS(
return retval;
}
// Copy the attributes of retval onto miByExt, to return it
retval->CopyBasicDataTo(miByExt);
+ // But set the extensions primary since CopyBasicDataTo overwrites the
+ // list
+ if (!aFileExt.IsEmpty())
+ retval->SetPrimaryExtension(aFileExt);
miByExt.swap(retval);
}
return retval;
}
++++++ mozilla-pyxpcom.patch ++++++
Index: config/system-headers
===================================================================
RCS file: /cvsroot/mozilla/config/system-headers,v
retrieving revision 3.40
diff -u -p -6 -r3.40 system-headers
--- config/system-headers 17 Mar 2008 18:02:08 -0000 3.40
+++ config/system-headers 27 Aug 2008 12:08:18 -0000
@@ -571,12 +571,13 @@ proto/dos.h
proto/exec.h
psap.h
Pt.h
pthread.h
pwd.h
Python.h
+marshal.h
QDOffscreen.h
Quickdraw.h
QuickDraw.h
QuickTimeComponents.h
quipu/attr.h
rasdlg.h
Index: extensions/python/dom/test/pyxultest/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/extensions/python/dom/test/pyxultest/Makefile.in,v
retrieving revision 1.3
diff -u -p -6 -r1.3 Makefile.in
--- extensions/python/dom/test/pyxultest/Makefile.in 19 Jun 2006 23:13:14 -0000 1.3
+++ extensions/python/dom/test/pyxultest/Makefile.in 27 Aug 2008 15:42:08 -0000
@@ -52,11 +52,14 @@ XPI_NAME = pyxultest
# Do I really want these?
#USE_EXTENSION_MANIFEST = 1
#NO_JAR_AUTO_REG = 1
#INSTALL_EXTENSION_ID = pyxultest@mozilla.org
#XPI_PKGNAME = pyxultest-$(MOZ_APP_VERSION)
DIST_FILES = application.ini
+
+GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
+DEFINES += -DGRE_BUILDID=$(GRE_BUILDID)
endif
PREF_JS_EXPORTS = $(srcdir)/pyxultest-prefs.js
include $(topsrcdir)/config/rules.mk
Index: extensions/python/dom/test/pyxultest/application.ini
===================================================================
RCS file: /cvsroot/mozilla/extensions/python/dom/test/pyxultest/application.ini,v
retrieving revision 1.2
diff -u -p -6 -r1.2 application.ini
--- extensions/python/dom/test/pyxultest/application.ini 29 Apr 2006 01:56:36 -0000 1.2
+++ extensions/python/dom/test/pyxultest/application.ini 27 Aug 2008 15:42:08 -0000
@@ -12,13 +12,13 @@ Name=pyxultest
; This field specifies your application's version. This field is required.
Version=1.0
; This field specifies your application's build ID (timestamp). This field is
; required.
-BuildID=@BUILD_ID@
+BuildID=@GRE_BUILDID@
; This field specifies a compact copyright notice for your application. This
; field is optional.
Copyright=Copyright (c) 2006 Mozilla.org
; This ID is just an example. Every XUL app ought to have it's own unique ID.
++++++ mozilla-system-hunspell.patch.bz2 ++++++
+++ empty output from diff against mozilla-system-hunspell.patch
++++++ xulrunner-source-1.9.0.1.tar.bz2 -> xulrunner-source-1.9.0.2.tar.bz2 ++++++
mozilla-xulrunner190/xulrunner-source-1.9.0.1.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner190/xulrunner-source-1.9.0.2.tar.bz2 differ: byte 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