--- a/mozilla-libproxy.patch Fri May 21 14:18:47 2010 +0200
+++ b/mozilla-libproxy.patch Wed Jun 09 07:53:55 2010 +0200
@@ -6,7 +6,7 @@
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
-@@ -539,16 +539,20 @@ FT2_CFLAGS = @FT2_CFLAGS@
+@@ -538,16 +538,20 @@ FT2_CFLAGS = @FT2_CFLAGS@
FT2_LIBS = @FT2_LIBS@
MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@
@@ -23,35 +23,36 @@
MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@
MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@
+ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@
+
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
- GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@
- LIBIDL_CFLAGS = @LIBIDL_CFLAGS@
diff --git a/config/system-headers b/config/system-headers
--- a/config/system-headers
+++ b/config/system-headers
-@@ -1013,8 +1013,11 @@ hunspell.hxx
- #if MOZ_NATIVE_BZ2==1
- bzlib.h
+@@ -1028,8 +1028,12 @@ gio/gio.h
+ #ifdef MOZ_ENABLE_LIBCONIC
+ conic/conicconnection.h
+ conic/conicconnectionevent.h
+ conic/conicstatisticsevent.h
#endif
- #if MOZ_PLATFORM_MAEMO==5
- hildon-uri.h
- hildon-mime.h
- libosso.h
+ #if MOZ_NATIVE_LIBEVENT==1
+ event.h
#endif
+#ifdef MOZ_ENABLE_LIBPROXY
+proxy.h
+#endif
++
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -5289,16 +5289,39 @@ then
- AC_DEFINE(MOZ_ENABLE_DBUS)
+@@ -5564,16 +5564,39 @@ then
fi
+
+ AC_SUBST(MOZ_ENABLE_GCONF)
+ AC_SUBST(MOZ_GCONF_CFLAGS)
+ AC_SUBST(MOZ_GCONF_LIBS)
fi
- AC_SUBST(MOZ_ENABLE_DBUS)
- AC_SUBST(MOZ_DBUS_GLIB_CFLAGS)
- AC_SUBST(MOZ_DBUS_GLIB_LIBS)
dnl ========================================================
+dnl = libproxy support
@@ -88,7 +89,7 @@
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
-@@ -243,16 +243,20 @@ endif
+@@ -222,16 +222,20 @@ endif
ifdef MOZ_TREE_FREETYPE
EXTRA_DSO_LDOPTS += $(FT2_LIBS)
endif
@@ -106,7 +107,7 @@
endif
ifeq ($(OS_ARCH),SunOS)
- EXTRA_DSO_LDOPTS += -lelf -ldemangle -lCstd
+ EXTRA_DSO_LDOPTS += -lelf -ldemangle
endif
diff --git a/toolkit/system/unixproxy/Makefile.in b/toolkit/system/unixproxy/Makefile.in
@@ -130,21 +131,21 @@
# 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
-@@ -53,15 +54,30 @@ LIBXUL_LIBRARY = 1
+@@ -46,16 +47,30 @@ MODULE = unixproxy
+ LIBRARY_NAME = unixproxy
- REQUIRES = \
- xpcom \
- string \
- necko \
- mozgnome \
- $(NULL)
+ EXPORT_LIBRARY = 1
+ IS_COMPONENT = 1
+ MODULE_NAME = nsUnixProxyModule
+ GRE_MODULE = 1
+ LIBXUL_LIBRARY = 1
+
++EXTRA_DSO_LDOPTS += \
++ $(MOZ_LIBPROXY_LIBS) \
++ $(MOZ_COMPONENT_LIBS) \
++ $(NULL)
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-+EXTRA_DSO_LDOPTS += \
-+ $(MOZ_LIBPROXY_LIBS) \
-+ $(MOZ_COMPONENT_LIBS) \
-+ $(NULL)
-+
+ifdef MOZ_ENABLE_LIBPROXY
+
+CPPSRCS = \
--- a/mozilla-pkgconfig.patch Fri May 21 14:18:47 2010 +0200
+++ b/mozilla-pkgconfig.patch Wed Jun 09 07:53:55 2010 +0200
@@ -24,11 +24,11 @@
# to register xulrunner per-user, override this with $HOME/.gre.d
regdir = /etc/gre.d
-@@ -116,16 +119,17 @@ endif
+@@ -109,16 +112,17 @@ pkg_config_files += mozilla-nss.pc
+ endif
%.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS)
cat $< | sed \
- -e "s|%ojidef%|$(OJIDEF)|" \
-e "s|%prefix%|$(prefix)|" \
-e "s|%includedir%|$(includedir)|" \
-e "s|%idldir%|$(idldir)|" \
@@ -54,9 +54,9 @@
Name: libxul-embedding
Description: Static library for version-independent embedding of the Mozilla runtime
Version: %MOZILLA_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue
+-Libs: -L${sdkdir}/lib -lxpcomglue -ldl
+Requires: %NSPR_NAME% >= %NSPR_VERSION%
-+Libs: -L${sdkdir}/sdk/lib -lxpcomglue
++Libs: -L${sdkdir}/sdk/lib -lxpcomglue -ldl
Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
diff --git a/xulrunner/installer/libxul.pc.in b/xulrunner/installer/libxul.pc.in
--- a/xulrunner/installer/libxul.pc.in
@@ -115,17 +115,3 @@
-Libs: -L${sdkdir}/lib -lmozjs
+Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib -lmozjs
Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
-diff --git a/xulrunner/installer/mozilla-plugin.pc.in b/xulrunner/installer/mozilla-plugin.pc.in
---- a/xulrunner/installer/mozilla-plugin.pc.in
-+++ b/xulrunner/installer/mozilla-plugin.pc.in
-@@ -1,9 +1,9 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
- includedir=%includedir%
-
- Name: Mozilla Plug-In API
- Description: Mozilla Plug-In API
- Version: %MOZILLA_VERSION%
--Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
-+Cflags: -I${includedir} -DXP_UNIX %ojidef%
-
--- a/mozilla-system-nspr.patch Fri May 21 14:18:47 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-# HG changeset patch
-# Date 1270816624 -7200
-# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent b2b5137c9473108008a9ff0fd1f858aa400040e8
-Bug 558299 - ipc does not build with system nspr.
-
-diff --git a/ipc/chromium/src/base/basictypes.h b/ipc/chromium/src/base/basictypes.h
---- a/ipc/chromium/src/base/basictypes.h
-+++ b/ipc/chromium/src/base/basictypes.h
-@@ -14,29 +14,29 @@
- #error You_must_include_basictypes.h_before_prtypes.h!
- #endif
-
- #ifndef NO_NSPR_10_SUPPORT
- #define NO_NSPR_10_SUPPORT
- #define NO_NSPR_10_SUPPORT_SAVE
- #endif
-
--#include "nspr/prtypes.h"
-+#include "prtypes.h"
-
- #ifdef NO_NSPR_10_SUPPORT_SAVE
- #undef NO_NSPR_10_SUPPORT_SAVE
- #undef NO_NSPR_10_SUPPORT
- #endif
-
- #ifdef _WIN32
- #undef _WIN32
- #define _WIN32_SAVE
- #endif
-
--#include "nspr/obsolete/protypes.h"
-+#include "obsolete/protypes.h"
-
- #define _INT32
- #define _UINT32
-
- #ifdef _WIN32_SAVE
- #undef _WIN32_SAVE
- #define _WIN32
- #endif
--- a/mozilla-xulrunner193/baselibs.conf Fri May 21 14:18:47 2010 +0200
+++ b/mozilla-xulrunner193/baselibs.conf Wed Jun 09 07:53:55 2010 +0200
@@ -1,21 +1,21 @@
-mozilla-xulrunner192
+mozilla-xulrunner193
+/usr/lib(64)?/xulrunner-.*
+/etc/gre.d/.*
- recommends "mozilla-xulrunner192-gnome-<targettype>"
- requires "mozilla-js192-<targettype>"
+ recommends "mozilla-xulrunner193-gnome-<targettype>"
+ requires "mozilla-js193-<targettype>"
-mozilla-js192
+mozilla-js193
-mozilla-xulrunner192-translations-common
+mozilla-xulrunner193-translations-common
+/usr/lib(64)?/xulrunner-.*
- requires "mozilla-xulrunner192-<targettype> = <version>"
- supplements "packageand(mozilla-xulrunner192-translations-common:mozilla-xulrunner192-<targettype>)"
+ requires "mozilla-xulrunner193-<targettype> = <version>"
+ supplements "packageand(mozilla-xulrunner193-translations-common:mozilla-xulrunner193-<targettype>)"
-mozilla-xulrunner192-translations-other
+mozilla-xulrunner193-translations-other
+/usr/lib(64)?/xulrunner-.*
- requires "mozilla-xulrunner192-<targettype> = <version>"
- supplements "packageand(mozilla-xulrunner192-translations-other:mozilla-xulrunner192-<targettype>)"
+ requires "mozilla-xulrunner193-<targettype> = <version>"
+ supplements "packageand(mozilla-xulrunner193-translations-other:mozilla-xulrunner193-<targettype>)"
-mozilla-xulrunner192-gnome
+mozilla-xulrunner193-gnome
+/usr/lib(64)?/xulrunner-.*
- requires "mozilla-xulrunner192-<targettype> = <version>"
+ requires "mozilla-xulrunner193-<targettype> = <version>"
--- a/mozilla-xulrunner193/mozilla-system-nspr.patch Fri May 21 14:18:47 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-system-nspr.patch
\ No newline at end of file
--- a/mozilla-xulrunner193/mozilla-xulrunner192-rpmlintrc Fri May 21 14:18:47 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-addFilter("no-jar-manifest")
--- a/mozilla-xulrunner193/mozilla-xulrunner192.changes Fri May 21 14:18:47 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
--------------------------------------------------------------------
-Tue May 4 08:03:37 CEST 2010 - wr@rosenauer.org
-
-- security update to 1.9.2.4 (Lorentz)
- * enable crashreporter also for x86-64
- * provide mozilla-runtime to host NPAPI out of process plugins
-- removed libproxy debug message (bnc#604711)
-
--------------------------------------------------------------------
-Mon Apr 26 07:18:09 CEST 2010 - wr@rosenauer.org
-
-- point alternatives link to the stable version to improve
- robustness (bnc#589037)
-
--------------------------------------------------------------------
-Sat Apr 24 11:38:24 UTC 2010 - coolo@novell.com
-
-- buildrequire pkg-config to fix provides
-
--------------------------------------------------------------------
-Thu Apr 1 11:15:38 UTC 2010 - wr@rosenauer.org
-
-- security update to 1.9.2.3
- * MFSA 2010-25/CVE-2010-1121 (bmo#555109)
- Re-use of freed object due to scope confusion
-
--------------------------------------------------------------------
-Thu Mar 25 20:04:41 CET 2010 - wr@rosenauer.org
-
-- security update to 1.9.2.2 (bnc#586567)
- * MFSA 2010-08/CVE-2010-1028
- WOFF heap corruption due to integer overflow
- * MFSA 2010-09/CVE-2010-0164 (bmo#547143)
- Deleted frame reuse in multipart/x-mixed-replace image
- * MFSA 2010-10/CVE-2010-0170 (bmo#541530)
- XSS via plugins and unprotected Location object
- * MFSA 2010-11/CVE-2010-0165/CVE-2010-0166/CVE-2010-0167
- Crashes with evidence of memory corruption
- * MFSA 2010-12/CVE-2010-0171 (bmo#531364)
- XSS using addEventListener and setTimeout on a wrapped object
- * MFSA 2010-13/CVE-2010-0168 (bmo#540642)
- Content policy bypass with image preloading
- * MFSA 2010-14/CVE-2010-0169 (bmo#535806)
- Browser chrome defacement via cached XUL stylesheets
- * MFSA 2010-15/CVE-2010-0172 (bmo#537862)
- Asynchronous Auth Prompt attaches to wrong window
- * MFSA 2010-16/CVE-2010-0173/CVE-2010-0174
- Crashes with evidence of memory corruption
- * MFSA 2010-18/CVE-2010-0176 (bmo#538308)
- Dangling pointer vulnerability in nsTreeContentView
- * MFSA 2010-19/CVE-2010-0177 (bmo#538310)
- Dangling pointer vulnerability in nsPluginArray
- * MFSA 2010-20/CVE-2010-0178 (bmo#546909)
- Chrome privilege escalation via forced URL drag and drop
- * MFSA 2010-22/CVE-2009-3555 (bmo#545755)
- Update NSS to support TLS renegotiation indication
- * MFSA 2010-23/CVE-2010-0181 (bmo#452093)
- Image src redirect to mailto: URL opens email editor
- * MFSA 2010-24/CVE-2010-0182 (bmo#490790)
- XMLDocument::load() doesn't check nsIContentPolicy
-- general.useragent.locale in profile overrides
- intl.locale.matchOS (bmo#542999)
-- split mozilla-js192 package which contains libmozjs only
- to allow its installation w/o all GUI dependencies
-
--------------------------------------------------------------------
-Mon Jan 18 09:28:56 CET 2010 - wr@rosenauer.org
-
-- update to 1.9.2rc2
-- add update-alternatives %ghost file to filelist starting
- with 11.2 (%ghost files are conflicting in earlier versions)
-- fixed mozilla-plugin.pc (remove obsolete stable reference)
-
--------------------------------------------------------------------
-Wed Jan 6 14:10:25 CET 2010 - wr@rosenauer.org
-
-- update to 1.9.2rc1
- * removed obsolete mozilla-breakpad.patch
-- expand -translations-* and -gnome filelists to clean up the
- filesystem for upgrades and removals correctly
-- enable crashreporter and create breakpad buildsymbols package
- for mozilla crashreporter (for ix86)
-- drop PreReq usage by cleaning up the different Requires tags
-
--------------------------------------------------------------------
-Thu Dec 24 14:21:02 CET 2009 - wr@rosenauer.org
-
-- update to 1.9.2b5
-- removed upstreamed mozilla-abi.patch
-- integrated mozilla-kde.patch
-- use .autoreg file for autoregistration when needed (bnc#440872)
-- enable libproxy support from 11.2 on
-- renamed -gnomevfs subpackage to -gnome
-- readded lockdown patches and preferences
-- fix baselibs.conf
-
--------------------------------------------------------------------
-Tue Nov 10 14:48:39 CET 2009 - wr@rosenauer.org
-
-- update to 1.9.2b2
-- merge from xulrunner191 package
-
--------------------------------------------------------------------
-Sun Nov 1 13:10:23 CET 2009 - wr@rosenauer.org
-
-- update to 1.9.2b1
-- use newer internal cairo for 11.1 and older
-
--------------------------------------------------------------------
-Sun Oct 18 13:04:22 CEST 2009 - wr@rosenauer.org
-
-- reworked PreReq list
-
--------------------------------------------------------------------
-Fri Oct 16 09:14:47 CEST 2009 - wr@rosenauer.org
-
-- update to snapshot 1.9.2b2pre (20091015)
- (entering beta phase)
-
--------------------------------------------------------------------
-Mon Sep 21 16:43:18 CEST 2009 - wr@rosenauer.org
-
-- BuildRequire libiw-devel instead of wireless-tools from 11.2 on
-
--------------------------------------------------------------------
-Wed Sep 16 23:42:58 CEST 2009 - wr@rosenauer.org
-
-- new snapshot (20090916)
-
--------------------------------------------------------------------
-Mon Aug 24 17:37:06 CEST 2009 - wr@rosenauer.org
-
-- first alpha package of XULRunner 1.9.2
-
--- a/mozilla-xulrunner193/mozilla-xulrunner192.spec Fri May 21 14:18:47 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,580 +0,0 @@
-#
-# spec file for package mozilla-xulrunner192 (Version 1.9.2.4)
-#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# 2006-2010 Wolfgang Rosenauer
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# norootforbuild
-
-
-Name: mozilla-xulrunner192
-BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel zip pkg-config
-# needed for brp-check-bytecode-version (jar, fastjar would do as well)
-BuildRequires: unzip
-%if %suse_version > 1020
-BuildRequires: fdupes
-%endif
-%if %suse_version > 1030
-BuildRequires: hunspell-devel
-%endif
-%if %suse_version > 1100
-BuildRequires: nss-shared-helper-devel
-%endif
-%if %suse_version > 1110
-BuildRequires: libiw-devel
-BuildRequires: libproxy-devel
-%else
-BuildRequires: wireless-tools
-%endif
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version: 1.9.2.4
-Release: 1
-%define releasedate 2010050300
-%define version_internal 1.9.2.4
-%define apiversion 1.9.2
-%define uaweight 192040
-Summary: Mozilla Runtime Environment 1.9.2
-Url: http://www.mozilla.org
-Group: Productivity/Other
-Provides: gecko192
-%if %suse_version >= 1110
-# this is needed to match this package with the kde4 helper package without the main package
-# having a hard requirement on the kde4 package
-%define kde_helper_version 6
-Provides: mozilla-kde4-version = %{kde_helper_version}
-%endif
-%ifarch %ix86
-Provides: mozilla-xulrunner192-32bit = %{version}-%{release}
-%endif
-Source: xulrunner-source-%{version}.tar.bz2
-Source1: l10n-%{version}.tar.bz2
-Source2: find-external-requires.sh
-Source3: %{name}-rpmlintrc
-Source4: xulrunner-openSUSE-prefs.js
-Source5: add-plugins.sh.in
-Source6: create-tar.sh
-Source7: baselibs.conf
-Source8: toolkit-lockdown.js
-Patch1: toolkit-download-folder.patch
-Patch2: mozilla-libproxy.patch
-Patch3: mozilla-pkgconfig.patch
-Patch4: idldir.patch
-Patch5: mozilla-nongnome-proxies.patch
-Patch6: mozilla-helper-app.patch
-Patch7: mozilla-prefer_plugin_pref.patch
-Patch8: mozilla-shared-nss-db.patch
-Patch10: mozilla-kde.patch
-# PATCH-FEATURE-SLED FATE#302023, FATE#302024
-Patch11: mozilla-gconf-backend.patch
-Patch12: gecko-lockdown.patch
-Patch13: toolkit-ui-lockdown.patch
-# ---
-Patch14: mozilla-system-nspr.patch
-Patch15: mozilla-ua-locale-pref.patch
-Patch16: mozilla-crashreporter-x86_64.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: mozilla-js192
-Requires(post): update-alternatives coreutils
-Requires(preun): update-alternatives coreutils
-### build configuration ###
-%define crashreporter 1
-%define has_system_nspr 0
-%define has_system_nss 0
-%define has_system_cairo 0
-%define localize 1
-%if %suse_version > 1030 || 0%{?opensuse_bs}
-%define has_system_nspr 1
-%define has_system_nss 1
-%endif
-%if %suse_version > 1110
-%define has_system_cairo 1
-%endif
-### configuration end ###
-%define _use_internal_dependency_generator 0
-%define __find_requires sh %{SOURCE2}
-%global provfind sh -c "grep -v 'libsqlite3.so' | %__find_provides"
-%global __find_provides %provfind
-%if %has_system_nspr
-BuildRequires: mozilla-nspr-devel
-Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
-%endif
-%if %has_system_nss
-BuildRequires: mozilla-nss-devel >= 3.12.6
-Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
-%endif
-Recommends: %{name}-gnome
-
-%description
-XULRunner is a single installable package that can be used to bootstrap
-multiple XUL+XPCOM applications that are as rich as Firefox and
-Thunderbird.
-
-
-%package -n mozilla-js192
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Summary: Mozilla JS 1.8 engine
-Group: Productivity/Other
-
-%description -n mozilla-js192
-JavaScript is the Netscape-developed object scripting language used in millions
-of web pages and server applications worldwide. Netscape's JavaScript is a
-superset of the ECMA-262 Edition 3 (ECMAScript) standard scripting language,
-with only mild differences from the published standard.
-
-
-%package devel
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Summary: XULRunner/Gecko SDK 1.9.2
-Group: Development/Libraries/Other
-%if %has_system_nspr
-Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel)
-%endif
-%if %has_system_nss
-Requires: mozilla-nss-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss-devel)
-%endif
-Requires: %{name} = %{version}
-
-%description devel
-Software Development Kit to embed XUL or Gecko into other applications.
-
-%if %localize
-
-%package translations-common
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Summary: Common translations for XULRunner 1.9.2
-Group: System/Localization
-Requires: %{name} = %{version}
-Provides: locale(%{name}:ar;ca;cs;da;de;en_GB;es_AR;es_CL;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW)
-Obsoletes: %{name}-translations < %{version}-%{release}
-
-%description translations-common
-XULRunner is a single installable package that can be used to bootstrap
-multiple XUL+XPCOM applications that are as rich as Firefox and
-Thunderbird.
-
-This package contains the most common languages but en-US which is
-delivered in the main package.
-
-
-%package translations-other
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Summary: Extra translations for XULRunner 1.9.2
-Group: System/Localization
-Requires: %{name} = %{version}
-Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi)
-Obsoletes: %{name}-translations < %{version}-%{release}
-
-%description translations-other
-XULRunner is a single installable package that can be used to bootstrap
-multiple XUL+XPCOM applications that are as rich as Firefox and
-Thunderbird.
-
-This package contains rarely used languages.
-%endif
-
-%package gnome
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Summary: XULRunner components depending on gnome-vfs
-Group: Productivity/Other
-Requires: %{name} = %{version}-%{release}
-Requires(post): coreutils
-
-%description gnome
-This subpackage contains the Necko Gnome-VFS and Gnome components which
-rely on the gnome-vfs subsystem to be installed. They are recommended
-for full desktop integration but not mandatory for small disk footprint
-KDE installations for example.
-
-
-%if %crashreporter
-%package buildsymbols
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Summary: Breakpad buildsymbols for %{name}
-Group: Development/Debug
-
-%description buildsymbols
-This subpackage contains the Breakpad created and compatible debugging
-symbols meant for upload to Mozilla's crash collector database.
-%endif
-
-%prep
-%setup -n mozilla -q -b 1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%if %suse_version >= 1110
-%patch10 -p1
-%endif
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-# bmo#542999
-%patch15 -p1
-%patch16 -p1
-
-%build
-%if %suse_version >= 1110
-kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3)
-if test "$kdehelperversion" != %{kde_helper_version}; then
- echo fix kde helper version in the .spec file
- exit 1
-fi
-%endif
-MOZ_APP_DIR=%{_libdir}/xulrunner-%{version_internal}
-export MOZ_BUILD_DATE=%{releasedate}
-export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing"
-%ifarch ppc64
-export CFLAGS="$CFLAGS -mminimal-toc"
-%endif
-# 10.3-x86_64 build fails probably because gcc bug
-%if %suse_version == 1030
-%ifarch x86_64
-export ac_cv_visibility_hidden="no"
-%endif
-%endif
-export CXXFLAGS="$CFLAGS"
-export LDFLAGS="-Wl,-rpath -Wl,${MOZ_APP_DIR}"
-export MOZCONFIG=$RPM_BUILD_DIR/mozconfig
-export MOZILLA_OFFICIAL=1
-export BUILD_OFFICIAL=1
-export MOZ_MILESTONE_RELEASE=1
-#
-cat << EOF > $MOZCONFIG
-mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZ_MILESTONE_RELEASE=1
-mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs}
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj
-. \$topsrcdir/xulrunner/config/mozconfig
-ac_add_options --prefix=%{_prefix}
-ac_add_options --libdir=%{_libdir}
-ac_add_options --sysconfdir=%{_sysconfdir}
-ac_add_options --mandir=%{_mandir}
-ac_add_options --includedir=%{_includedir}
-ac_add_options --enable-optimize
-ac_add_options --enable-extensions=default
-ac_add_options --with-system-jpeg
-#ac_add_options --with-system-png # no APNG support
-ac_add_options --with-system-zlib
-ac_add_options --with-l10n-base=../l10n
-ac_add_options --enable-xft
-ac_add_options --disable-freetype2
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-ac_add_options --disable-javaxpcom
-ac_add_options --enable-startup-notification
-ac_add_options --enable-url-classifier
-#ac_add_options --enable-debug
-EOF
-%if %has_system_nspr
-cat << EOF >> $MOZCONFIG
-ac_add_options --with-system-nspr
-EOF
-%endif
-%if %has_system_nss
-cat << EOF >> $MOZCONFIG
-ac_add_options --with-system-nss
-EOF
-%endif
-%if %has_system_cairo
-cat << EOF >> $MOZCONFIG
-ac_add_options --enable-system-cairo
-EOF
-%endif
-%if %suse_version > 1030
-cat << EOF >> $MOZCONFIG
-ac_add_options --enable-system-hunspell
-EOF
-%endif
-#%if %suse_version > 1100
-#cat << EOF >> $MOZCONFIG
-#ac_add_options --enable-system-sqlite
-#EOF
-#%endif
-%if %suse_version > 1110
-cat << EOF >> $MOZCONFIG
-ac_add_options --enable-libproxy
-EOF
-%endif
-%if ! %crashreporter
-cat << EOF >> $MOZCONFIG
-ac_add_options --disable-crashreporter
-EOF
-%endif
-make -f client.mk build
-
-%install
-cd ../obj
-%makeinstall STRIP=/bin/true
-# remove some executable permissions
-find $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version_internal} \
- -type f -perm -111 -exec chmod a-x {} \;
-find $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/ \
- -name "*.js" -o -name "*.xpm" -o -name "*.png" | xargs chmod a-x
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/extensions
-# fixing SDK dynamic libs (symlink instead of copy)
-rm $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/lib/*.so
-ln -sf ../../../xulrunner-%{version_internal}/libmozjs.so \
- $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/lib/
-ln -sf ../../../xulrunner-%{version_internal}/libxpcom.so \
- $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/lib/
-ln -sf ../../../xulrunner-%{version_internal}/libxul.so \
- $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/lib/
-# include basic buildenv for xulapps to use
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/xulrunner-%{version_internal}
-pushd ..
-# this list has been compiled by trial and error for prism
-tar --exclude=*.cpp --exclude=*.mm \
- -cvjf $RPM_BUILD_ROOT%{_datadir}/xulrunner-%{version_internal}/mozilla-src.tar.bz2 \
- mozilla/configure.in mozilla/Makefile.in mozilla/client.py mozilla/allmakefiles.sh \
- mozilla/config mozilla/client.mk mozilla/aclocal.m4 mozilla/build mozilla/js/src/* \
- mozilla/testing mozilla/toolkit/mozapps/installer mozilla/probes mozilla/memory \
- mozilla/toolkit/xre mozilla/nsprpub/config mozilla/tools mozilla/xpcom/build
-popd
-# XPI example
-#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
-cp %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/greprefs/lockdown.js
-# install add-plugins.sh
-sed "s:%%PROGDIR:%{_libdir}/xulrunner-%{version_internal}:g" \
- %{SOURCE5} > $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh
-# 64bit classification for GRE config
-%ifarch x86_64 s390x ppc64
-mv $RPM_BUILD_ROOT%{_sysconfdir}/gre.d/%{version_internal}.system.conf \
- $RPM_BUILD_ROOT%{_sysconfdir}/gre.d/%{version_internal}-64bit.system.conf
-%endif
-# ghosts
-touch $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/global.reginfo
-# install additional locales
-%if %localize
-rm -f %{_tmppath}/translations.*
-for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); do
- case $locale in
- ja-JP-mac|en-US)
- ;;
- *)
- make -C toolkit/locales libs-$locale
- cp dist/xpi-stage/locale-$locale/chrome/$locale.jar \
- $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/chrome
- cp dist/xpi-stage/locale-$locale/chrome/$locale.manifest \
- $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/chrome
- # check against the fixed common list and sort into the right filelist
- _matched=0
- for _match in ar ca cs da de en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do
- [ "$_match" = "$locale" ] && _matched=1
- done
- [ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other
- echo %{_libdir}/xulrunner-%{version_internal}/chrome/$locale.jar \
- >> %{_tmppath}/translations.$_l10ntarget
- echo %{_libdir}/xulrunner-%{version_internal}/chrome/$locale.manifest \
- >> %{_tmppath}/translations.$_l10ntarget
- esac
-done
-%endif
-# API symlink
-ln -sf xulrunner-%{version_internal} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{apiversion}
-# compat links
-%if 0%{?ga_version:1}
-touch $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{ga_version}
-%endif
-# excludes
-%if %suse_version < 1120
-rm -f $RPM_BUILD_ROOT%{_bindir}/xulrunner
-%endif
-rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/updater
-rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/update.locale
-rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/LICENSE
-rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/README.txt
-rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/dictionaries/en-US*
-# autoreg
-touch $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/.autoreg
-# fdupes
-%if %suse_version > 1020
-%fdupes $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version_internal}/
-%fdupes $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/
-%endif
-# create breakpad debugsymbols
-%if %crashreporter
-SYMBOLS_NAME="xulrunner-%{version}-%{release}.%{_arch}-%{suse_version}-symbols"
-make buildsymbols \
- SYMBOL_INDEX_NAME="$SYMBOLS_NAME.txt" \
- SYMBOL_ARCHIVE_BASENAME="$SYMBOLS_NAME"
-if [ -e dist/*symbols.zip ]; then
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/mozilla/
- cp dist/*symbols.zip $RPM_BUILD_ROOT%{_datadir}/mozilla/
-fi
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-%if %localize
-rm -rf %{_tmppath}/translations.*
-%endif
-
-%post
-/usr/sbin/update-alternatives --install %{_bindir}/xulrunner \
- xulrunner %{_libdir}/xulrunner-%{apiversion}/xulrunner %{uaweight} || :
-%{_libdir}/xulrunner-%{apiversion}/add-plugins.sh > /dev/null 2>&1
-exit 0
-
-%posttrans
-# needed for updates which transition directory to symlink
-%if 0%{?ga_version:1}
-test -d %{_libdir}/xulrunner-%{ga_version} && rm -rf %{_libdir}/xulrunner-%{ga_version}
-ln -sf xulrunner-%{version_internal} %{_libdir}/xulrunner-%{ga_version}
-%endif
-[ -e %{_libdir}/xulrunner-%{version_internal}/add-plugins.sh ] && \
- %{_libdir}/xulrunner-%{version_internal}/add-plugins.sh > /dev/null 2>&1
-exit 0
-
-%preun
-if [ "$1" = "0" ]; then # deinstallation
- # that's not quite nice since old versions should be removed on update as well
- # but that's problematic for updates w/o raising the version number
- /usr/sbin/update-alternatives --remove xulrunner %{_libdir}/xulrunner-%{apiversion}/xulrunner
-fi
-rm -f %{_libdir}/xulrunner-%{version_internal}/dictionaries/*
-exit 0
-
-%triggerin -- myspell-dictionary
-%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh > /dev/null 2>&1
-exit 0
-
-%triggerpostun -- myspell-dictionary
-%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh > /dev/null 2>&1
-exit 0
-
-%post gnome
-touch %{_libdir}/xulrunner-%{version_internal}/.autoreg
-exit 0
-
-%files
-%defattr(-,root,root)
-%dir %{_libdir}/xulrunner-%{version_internal}/
-%dir %{_libdir}/xulrunner-%{version_internal}/chrome/
-%dir %{_libdir}/xulrunner-%{version_internal}/dictionaries/
-%dir %{_libdir}/xulrunner-%{version_internal}/extensions/
-%{_libdir}/xulrunner-%{version_internal}/chrome/classic.*
-%{_libdir}/xulrunner-%{version_internal}/chrome/comm.*
-%{_libdir}/xulrunner-%{version_internal}/chrome/en-US.*
-%{_libdir}/xulrunner-%{version_internal}/chrome/pippki.*
-%{_libdir}/xulrunner-%{version_internal}/chrome/toolkit.*
-%{_libdir}/xulrunner-%{version_internal}/chrome/icons/
-%{_libdir}/xulrunner-%{version_internal}/components/
-%exclude %{_libdir}/xulrunner-%{version_internal}/components/libmozgnome.so
-%exclude %{_libdir}/xulrunner-%{version_internal}/components/libnkgnomevfs.so
-%{_libdir}/xulrunner-%{version_internal}/defaults/
-%dir %{_libdir}/xulrunner-%{version_internal}/greprefs/
-%{_libdir}/xulrunner-%{version_internal}/greprefs/all.js
-%{_libdir}/xulrunner-%{version_internal}/greprefs/security-prefs.js
-%{_libdir}/xulrunner-%{version_internal}/greprefs/xpinstall.js
-%{_libdir}/xulrunner-%{version_internal}/greprefs/all-openSUSE.js
-%{_libdir}/xulrunner-%{version_internal}/greprefs/lockdown.js
-%{_libdir}/xulrunner-%{version_internal}/icons/
-%{_libdir}/xulrunner-%{version_internal}/modules/
-%{_libdir}/xulrunner-%{version_internal}/plugins/
-%{_libdir}/xulrunner-%{version_internal}/res/
-%{_libdir}/xulrunner-%{version_internal}/*.so
-%exclude %{_libdir}/xulrunner-%{version_internal}/libmozjs.so
-%{_libdir}/xulrunner-%{version_internal}/.autoreg
-%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh
-%{_libdir}/xulrunner-%{version_internal}/dependentlibs.list
-%{_libdir}/xulrunner-%{version_internal}/mozilla-xremote-client
-%{_libdir}/xulrunner-%{version_internal}/plugin-container
-%{_libdir}/xulrunner-%{version_internal}/run-mozilla.sh
-%{_libdir}/xulrunner-%{version_internal}/xulrunner
-%{_libdir}/xulrunner-%{version_internal}/xulrunner-bin
-%{_libdir}/xulrunner-%{version_internal}/xulrunner-stub
-%{_libdir}/xulrunner-%{version_internal}/platform.ini
-# crashreporter files
-%if %crashreporter
-%{_libdir}/xulrunner-%{version_internal}/crashreporter
-%{_libdir}/xulrunner-%{version_internal}/crashreporter.ini
-%{_libdir}/xulrunner-%{version_internal}/Throbber-small.gif
-%endif
-# ghosts
-%ghost %{_libdir}/xulrunner-%{version_internal}/global.reginfo
-%if %suse_version >= 1120
-%ghost %{_bindir}/xulrunner
-%endif
-# GRE
-%dir %{_sysconfdir}/gre.d/
-%attr(644,root,root) %{_sysconfdir}/gre.d/*
-# API symlink
-%{_libdir}/xulrunner-%{apiversion}
-# compat symlinks
-%if 0%{?ga_version:1}
-%ghost %{_libdir}/xulrunner-%{ga_version}
-%endif
-
-%files -n mozilla-js192
-%defattr(-,root,root)
-%dir %{_libdir}/xulrunner-%{version_internal}/
-%{_libdir}/xulrunner-%{apiversion}
-%{_libdir}/xulrunner-%{version_internal}/libmozjs.so
-
-%files devel
-%defattr(-,root,root)
-%{_libdir}/xulrunner-%{version_internal}/xpcshell
-%{_libdir}/xulrunner-%{version_internal}/xpidl
-%{_libdir}/xulrunner-%{version_internal}/xpt_dump
-%{_libdir}/xulrunner-%{version_internal}/xpt_link
-%{_libdir}/xulrunner-devel-%{version_internal}/
-# FIXME symlink dynamic libs below sdk/lib
-%attr(644,root,root) %{_libdir}/pkgconfig/*
-%{_includedir}/xulrunner-%{version_internal}/
-%{_datadir}/xulrunner-%{version_internal}/
-
-%files gnome
-%defattr(-,root,root)
-%dir %{_libdir}/xulrunner-%{version_internal}/
-%dir %{_libdir}/xulrunner-%{version_internal}/components/
-%ghost %{_libdir}/xulrunner-%{version_internal}/.autoreg
-%{_libdir}/xulrunner-%{version_internal}/components/libmozgnome.so
-%{_libdir}/xulrunner-%{version_internal}/components/libnkgnomevfs.so
-
-%if %localize
-
-%files translations-common -f %{_tmppath}/translations.common
-%defattr(-,root,root)
-%dir %{_libdir}/xulrunner-%{version_internal}/
-%dir %{_libdir}/xulrunner-%{version_internal}/chrome/
-
-%files translations-other -f %{_tmppath}/translations.other
-%defattr(-,root,root)
-%dir %{_libdir}/xulrunner-%{version_internal}/
-%dir %{_libdir}/xulrunner-%{version_internal}/chrome/
-%endif
-
-%if %crashreporter
-
-%files buildsymbols
-%defattr(-,root,root)
-%{_datadir}/mozilla/
-%endif
-
-%changelog
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-xulrunner193/mozilla-xulrunner193-rpmlintrc Wed Jun 09 07:53:55 2010 +0200
@@ -0,0 +1,1 @@
+addFilter("no-jar-manifest")
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-xulrunner193/mozilla-xulrunner193.changes Wed Jun 09 07:53:55 2010 +0200
@@ -0,0 +1,134 @@
+-------------------------------------------------------------------
+Tue May 4 08:03:37 CEST 2010 - wr@rosenauer.org
+
+- security update to 1.9.2.4 (Lorentz)
+ * enable crashreporter also for x86-64
+ * provide mozilla-runtime to host NPAPI out of process plugins
+- removed libproxy debug message (bnc#604711)
+
+-------------------------------------------------------------------
+Mon Apr 26 07:18:09 CEST 2010 - wr@rosenauer.org
+
+- point alternatives link to the stable version to improve
+ robustness (bnc#589037)
+
+-------------------------------------------------------------------
+Sat Apr 24 11:38:24 UTC 2010 - coolo@novell.com
+
+- buildrequire pkg-config to fix provides
+
+-------------------------------------------------------------------
+Thu Apr 1 11:15:38 UTC 2010 - wr@rosenauer.org
+
+- security update to 1.9.2.3
+ * MFSA 2010-25/CVE-2010-1121 (bmo#555109)
+ Re-use of freed object due to scope confusion
+
+-------------------------------------------------------------------
+Thu Mar 25 20:04:41 CET 2010 - wr@rosenauer.org
+
+- security update to 1.9.2.2 (bnc#586567)
+ * MFSA 2010-08/CVE-2010-1028
+ WOFF heap corruption due to integer overflow
+ * MFSA 2010-09/CVE-2010-0164 (bmo#547143)
+ Deleted frame reuse in multipart/x-mixed-replace image
+ * MFSA 2010-10/CVE-2010-0170 (bmo#541530)
+ XSS via plugins and unprotected Location object
+ * MFSA 2010-11/CVE-2010-0165/CVE-2010-0166/CVE-2010-0167
+ Crashes with evidence of memory corruption
+ * MFSA 2010-12/CVE-2010-0171 (bmo#531364)
+ XSS using addEventListener and setTimeout on a wrapped object
+ * MFSA 2010-13/CVE-2010-0168 (bmo#540642)
+ Content policy bypass with image preloading
+ * MFSA 2010-14/CVE-2010-0169 (bmo#535806)
+ Browser chrome defacement via cached XUL stylesheets
+ * MFSA 2010-15/CVE-2010-0172 (bmo#537862)
+ Asynchronous Auth Prompt attaches to wrong window
+ * MFSA 2010-16/CVE-2010-0173/CVE-2010-0174
+ Crashes with evidence of memory corruption
+ * MFSA 2010-18/CVE-2010-0176 (bmo#538308)
+ Dangling pointer vulnerability in nsTreeContentView
+ * MFSA 2010-19/CVE-2010-0177 (bmo#538310)
+ Dangling pointer vulnerability in nsPluginArray
+ * MFSA 2010-20/CVE-2010-0178 (bmo#546909)
+ Chrome privilege escalation via forced URL drag and drop
+ * MFSA 2010-22/CVE-2009-3555 (bmo#545755)
+ Update NSS to support TLS renegotiation indication
+ * MFSA 2010-23/CVE-2010-0181 (bmo#452093)
+ Image src redirect to mailto: URL opens email editor
+ * MFSA 2010-24/CVE-2010-0182 (bmo#490790)
+ XMLDocument::load() doesn't check nsIContentPolicy
+- general.useragent.locale in profile overrides
+ intl.locale.matchOS (bmo#542999)
+- split mozilla-js192 package which contains libmozjs only
+ to allow its installation w/o all GUI dependencies
+
+-------------------------------------------------------------------
+Mon Jan 18 09:28:56 CET 2010 - wr@rosenauer.org
+
+- update to 1.9.2rc2
+- add update-alternatives %ghost file to filelist starting
+ with 11.2 (%ghost files are conflicting in earlier versions)
+- fixed mozilla-plugin.pc (remove obsolete stable reference)
+
+-------------------------------------------------------------------
+Wed Jan 6 14:10:25 CET 2010 - wr@rosenauer.org
+
+- update to 1.9.2rc1
+ * removed obsolete mozilla-breakpad.patch
+- expand -translations-* and -gnome filelists to clean up the
+ filesystem for upgrades and removals correctly
+- enable crashreporter and create breakpad buildsymbols package
+ for mozilla crashreporter (for ix86)
+- drop PreReq usage by cleaning up the different Requires tags
+
+-------------------------------------------------------------------
+Thu Dec 24 14:21:02 CET 2009 - wr@rosenauer.org
+
+- update to 1.9.2b5
+- removed upstreamed mozilla-abi.patch
+- integrated mozilla-kde.patch
+- use .autoreg file for autoregistration when needed (bnc#440872)
+- enable libproxy support from 11.2 on
+- renamed -gnomevfs subpackage to -gnome
+- readded lockdown patches and preferences
+- fix baselibs.conf
+
+-------------------------------------------------------------------
+Tue Nov 10 14:48:39 CET 2009 - wr@rosenauer.org
+
+- update to 1.9.2b2
+- merge from xulrunner191 package
+
+-------------------------------------------------------------------
+Sun Nov 1 13:10:23 CET 2009 - wr@rosenauer.org
+
+- update to 1.9.2b1
+- use newer internal cairo for 11.1 and older
+
+-------------------------------------------------------------------
+Sun Oct 18 13:04:22 CEST 2009 - wr@rosenauer.org
+
+- reworked PreReq list
+
+-------------------------------------------------------------------
+Fri Oct 16 09:14:47 CEST 2009 - wr@rosenauer.org
+
+- update to snapshot 1.9.2b2pre (20091015)
+ (entering beta phase)
+
+-------------------------------------------------------------------
+Mon Sep 21 16:43:18 CEST 2009 - wr@rosenauer.org
+
+- BuildRequire libiw-devel instead of wireless-tools from 11.2 on
+
+-------------------------------------------------------------------
+Wed Sep 16 23:42:58 CEST 2009 - wr@rosenauer.org
+
+- new snapshot (20090916)
+
+-------------------------------------------------------------------
+Mon Aug 24 17:37:06 CEST 2009 - wr@rosenauer.org
+
+- first alpha package of XULRunner 1.9.2
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-xulrunner193/mozilla-xulrunner193.spec Wed Jun 09 07:53:55 2010 +0200
@@ -0,0 +1,561 @@
+#
+# spec file for package mozilla-xulrunner193 (Version 1.9.3a4)
+#
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 2006-2010 Wolfgang Rosenauer
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+
+Name: mozilla-xulrunner193
+BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel zip pkg-config fdupes hunspell-devel
+# needed for brp-check-bytecode-version (jar, fastjar would do as well)
+BuildRequires: unzip
+%if %suse_version > 1100
+BuildRequires: nss-shared-helper-devel
+%endif
+%if %suse_version > 1110
+BuildRequires: libiw-devel
+BuildRequires: libproxy-devel
+%else
+BuildRequires: wireless-tools
+%endif
+License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+Version: 1.9.3a4
+Release: 1
+%define releasedate 2010060800
+%define version_internal 1.9.3a5pre
+%define apiversion 1.9.3
+%define uaweight 192900
+Summary: Mozilla Runtime Environment 1.9.3
+Url: http://www.mozilla.org
+Group: Productivity/Other
+Provides: gecko193
+%if %suse_version >= 1110
+# this is needed to match this package with the kde4 helper package without the main package
+# having a hard requirement on the kde4 package
+%define kde_helper_version 6
+Provides: mozilla-kde4-version = %{kde_helper_version}
+%endif
+%ifarch %ix86
+Provides: mozilla-xulrunner193-32bit = %{version}-%{release}
+%endif
+Source: xulrunner-source-%{version}.tar.bz2
+Source1: l10n-%{version}.tar.bz2
+Source2: find-external-requires.sh
+Source3: %{name}-rpmlintrc
+Source4: xulrunner-openSUSE-prefs.js
+Source5: add-plugins.sh.in
+Source6: create-tar.sh
+Source7: baselibs.conf
+Source8: toolkit-lockdown.js
+Patch1: toolkit-download-folder.patch
+Patch2: mozilla-libproxy.patch
+Patch3: mozilla-pkgconfig.patch
+Patch4: idldir.patch
+Patch5: mozilla-nongnome-proxies.patch
+Patch7: mozilla-prefer_plugin_pref.patch
+Patch8: mozilla-shared-nss-db.patch
+Patch10: mozilla-kde.patch
+# PATCH-FEATURE-SLED FATE#302023, FATE#302024
+Patch11: mozilla-gconf-backend.patch
+Patch12: gecko-lockdown.patch
+Patch13: toolkit-ui-lockdown.patch
+# ---
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: mozilla-js193
+Requires(post): update-alternatives coreutils
+Requires(preun): update-alternatives coreutils
+### build configuration ###
+%define crashreporter 1
+%define has_system_nspr 1
+%define has_system_nss 1
+%define has_system_cairo 0
+%define localize 1
+%if %suse_version > 1110
+%define has_system_cairo 1
+%endif
+### configuration end ###
+%define _use_internal_dependency_generator 0
+%define __find_requires sh %{SOURCE2}
+%global provfind sh -c "grep -v 'libsqlite3.so' | %__find_provides"
+%global __find_provides %provfind
+%if %has_system_nspr
+BuildRequires: mozilla-nspr-devel
+Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
+%endif
+%if %has_system_nss
+BuildRequires: mozilla-nss-devel >= 3.12.6
+Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
+%endif
+Recommends: %{name}-gnome
+
+%description
+XULRunner is a single installable package that can be used to bootstrap
+multiple XUL+XPCOM applications that are as rich as Firefox and
+Thunderbird.
+
+
+%package -n mozilla-js193
+License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+Summary: Mozilla JS 1.8 engine
+Group: Productivity/Other
+
+%description -n mozilla-js193
+JavaScript is the Netscape-developed object scripting language used in millions
+of web pages and server applications worldwide. Netscape's JavaScript is a
+superset of the ECMA-262 Edition 3 (ECMAScript) standard scripting language,
+with only mild differences from the published standard.
+
+
+%package devel
+License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+Summary: XULRunner/Gecko SDK 1.9.3
+Group: Development/Libraries/Other
+%if %has_system_nspr
+Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel)
+%endif
+%if %has_system_nss
+Requires: mozilla-nss-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss-devel)
+%endif
+Requires: %{name} = %{version}
+
+%description devel
+Software Development Kit to embed XUL or Gecko into other applications.
+
+%if %localize
+
+%package translations-common
+License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+Summary: Common translations for XULRunner 1.9.3
+Group: System/Localization
+Requires: %{name} = %{version}
+Provides: locale(%{name}:ar;ca;cs;da;de;en_GB;es_AR;es_CL;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW)
+Obsoletes: %{name}-translations < %{version}-%{release}
+
+%description translations-common
+XULRunner is a single installable package that can be used to bootstrap
+multiple XUL+XPCOM applications that are as rich as Firefox and
+Thunderbird.
+
+This package contains the most common languages but en-US which is
+delivered in the main package.
+
+
+%package translations-other
+License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+Summary: Extra translations for XULRunner 1.9.3
+Group: System/Localization
+Requires: %{name} = %{version}
+Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi)
+Obsoletes: %{name}-translations < %{version}-%{release}
+
+%description translations-other
+XULRunner is a single installable package that can be used to bootstrap
+multiple XUL+XPCOM applications that are as rich as Firefox and
+Thunderbird.
+
+This package contains rarely used languages.
+%endif
+
+%package gnome
+License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+Summary: XULRunner components depending on gnome-vfs
+Group: Productivity/Other
+Requires: %{name} = %{version}-%{release}
+Requires(post): coreutils
+
+%description gnome
+This subpackage contains the Necko Gnome-VFS and Gnome components which
+rely on the gnome-vfs subsystem to be installed. They are recommended
+for full desktop integration but not mandatory for small disk footprint
+KDE installations for example.
+
+
+%if %crashreporter
+%package buildsymbols
+License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+Summary: Breakpad buildsymbols for %{name}
+Group: Development/Debug
+
+%description buildsymbols
+This subpackage contains the Breakpad created and compatible debugging
+symbols meant for upload to Mozilla's crash collector database.
+%endif
+
+%prep
+%setup -n mozilla -q -b 1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch7 -p1
+#%patch8 -p1
+#%if %suse_version >= 1110
+#%patch10 -p1
+#%endif
+#%patch11 -p1
+#%patch12 -p1
+#%patch13 -p1
+
+%build
+%if %suse_version >= 1110
+kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3)
+if test "$kdehelperversion" != %{kde_helper_version}; then
+ echo fix kde helper version in the .spec file
+ exit 1
+fi
+%endif
+MOZ_APP_DIR=%{_libdir}/xulrunner-%{version_internal}
+export MOZ_BUILD_DATE=%{releasedate}
+export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing"
+%ifarch ppc64
+export CFLAGS="$CFLAGS -mminimal-toc"
+%endif
+# 10.3-x86_64 build fails probably because gcc bug
+%if %suse_version == 1030
+%ifarch x86_64
+export ac_cv_visibility_hidden="no"
+%endif
+%endif
+export CXXFLAGS="$CFLAGS"
+export LDFLAGS="-Wl,-rpath -Wl,${MOZ_APP_DIR}"
+export MOZCONFIG=$RPM_BUILD_DIR/mozconfig
+export MOZILLA_OFFICIAL=1
+export BUILD_OFFICIAL=1
+export MOZ_MILESTONE_RELEASE=1
+#
+cat << EOF > $MOZCONFIG
+mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZ_MILESTONE_RELEASE=1
+mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs}
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj
+. \$topsrcdir/xulrunner/config/mozconfig
+ac_add_options --prefix=%{_prefix}
+ac_add_options --libdir=%{_libdir}
+ac_add_options --sysconfdir=%{_sysconfdir}
+ac_add_options --mandir=%{_mandir}
+ac_add_options --includedir=%{_includedir}
+ac_add_options --enable-optimize
+ac_add_options --enable-extensions=default
+ac_add_options --with-system-jpeg
+#ac_add_options --with-system-png # no APNG support
+ac_add_options --with-system-zlib
+ac_add_options --with-l10n-base=../l10n
+ac_add_options --enable-xft
+ac_add_options --disable-freetype2
+ac_add_options --enable-svg
+ac_add_options --enable-canvas
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-startup-notification
+ac_add_options --enable-url-classifier
+#ac_add_options --enable-debug
+EOF
+%if %has_system_nspr
+cat << EOF >> $MOZCONFIG
+ac_add_options --with-system-nspr
+EOF
+%endif
+%if %has_system_nss
+cat << EOF >> $MOZCONFIG
+ac_add_options --with-system-nss
+EOF
+%endif
+%if %has_system_cairo
+cat << EOF >> $MOZCONFIG
+ac_add_options --enable-system-cairo
+EOF
+%endif
+%if %suse_version > 1030
+cat << EOF >> $MOZCONFIG
+ac_add_options --enable-system-hunspell
+EOF
+%endif
+#%if %suse_version > 1100
+#cat << EOF >> $MOZCONFIG
+#ac_add_options --enable-system-sqlite
+#EOF
+#%endif
+%if %suse_version > 1110
+cat << EOF >> $MOZCONFIG
+ac_add_options --enable-libproxy
+EOF
+%endif
+%if ! %crashreporter
+cat << EOF >> $MOZCONFIG
+ac_add_options --disable-crashreporter
+EOF
+%endif
+make -f client.mk build
+
+%install
+cd ../obj
+%makeinstall STRIP=/bin/true
+# remove some executable permissions
+find $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version_internal} \
+ -type f -perm -111 -exec chmod a-x {} \;
+find $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/ \
+ -name "*.js" -o -name "*.xpm" -o -name "*.png" | xargs chmod a-x
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/extensions
+# fixing SDK dynamic libs (symlink instead of copy)
+rm $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/lib/*.so
+ln -sf ../../../xulrunner-%{version_internal}/libmozjs.so \
+ $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/lib/
+ln -sf ../../../xulrunner-%{version_internal}/libxpcom.so \
+ $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/lib/
+ln -sf ../../../xulrunner-%{version_internal}/libxul.so \
+ $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/lib/
+# include basic buildenv for xulapps to use
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xulrunner-%{version_internal}
+pushd ..
+# this list has been compiled by trial and error for prism
+tar --exclude=*.cpp --exclude=*.mm \
+ -cvjf $RPM_BUILD_ROOT%{_datadir}/xulrunner-%{version_internal}/mozilla-src.tar.bz2 \
+ mozilla/configure.in mozilla/Makefile.in mozilla/client.py mozilla/allmakefiles.sh \
+ mozilla/config mozilla/client.mk mozilla/aclocal.m4 mozilla/build mozilla/js/src/* \
+ mozilla/testing mozilla/toolkit/mozapps/installer mozilla/probes mozilla/memory \
+ mozilla/toolkit/xre mozilla/nsprpub/config mozilla/tools mozilla/xpcom/build
+popd
+# XPI example
+#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
+cp %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/greprefs/lockdown.js
+# install add-plugins.sh
+sed "s:%%PROGDIR:%{_libdir}/xulrunner-%{version_internal}:g" \
+ %{SOURCE5} > $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh
+# 64bit classification for GRE config
+%ifarch x86_64 s390x ppc64
+mv $RPM_BUILD_ROOT%{_sysconfdir}/gre.d/%{version_internal}.system.conf \
+ $RPM_BUILD_ROOT%{_sysconfdir}/gre.d/%{version_internal}-64bit.system.conf
+%endif
+# ghosts
+touch $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/global.reginfo
+# install additional locales
+%if %localize
+rm -f %{_tmppath}/translations.*
+for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); do
+ case $locale in
+ ja-JP-mac|en-US)
+ ;;
+ *)
+ make -C toolkit/locales libs-$locale
+ cp dist/xpi-stage/locale-$locale/chrome/$locale.jar \
+ $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/chrome
+ cp dist/xpi-stage/locale-$locale/chrome/$locale.manifest \
+ $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/chrome
+ # check against the fixed common list and sort into the right filelist
+ _matched=0
+ for _match in ar ca cs da de en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do
+ [ "$_match" = "$locale" ] && _matched=1
+ done
+ [ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other
+ echo %{_libdir}/xulrunner-%{version_internal}/chrome/$locale.jar \
+ >> %{_tmppath}/translations.$_l10ntarget
+ echo %{_libdir}/xulrunner-%{version_internal}/chrome/$locale.manifest \
+ >> %{_tmppath}/translations.$_l10ntarget
+ esac
+done
+%endif
+# API symlink
+ln -sf xulrunner-%{version_internal} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{apiversion}
+# compat links
+%if 0%{?ga_version:1}
+touch $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{ga_version}
+%endif
+# excludes
+%if %suse_version < 1120
+rm -f $RPM_BUILD_ROOT%{_bindir}/xulrunner
+%endif
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/updater
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/update.locale
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/LICENSE
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/README.txt
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/dictionaries/en-US*
+# autoreg
+touch $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/.autoreg
+# fdupes
+%if %suse_version > 1020
+%fdupes $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version_internal}/
+%fdupes $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/
+%endif
+# create breakpad debugsymbols
+%if %crashreporter
+SYMBOLS_NAME="xulrunner-%{version}-%{release}.%{_arch}-%{suse_version}-symbols"
+make buildsymbols \
+ SYMBOL_INDEX_NAME="$SYMBOLS_NAME.txt" \
+ SYMBOL_ARCHIVE_BASENAME="$SYMBOLS_NAME"
+if [ -e dist/*symbols.zip ]; then
+ mkdir -p $RPM_BUILD_ROOT%{_datadir}/mozilla/
+ cp dist/*symbols.zip $RPM_BUILD_ROOT%{_datadir}/mozilla/
+fi
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+%if %localize
+rm -rf %{_tmppath}/translations.*
+%endif
+
+%post
+/usr/sbin/update-alternatives --install %{_bindir}/xulrunner \
+ xulrunner %{_libdir}/xulrunner-%{apiversion}/xulrunner %{uaweight} || :
+%{_libdir}/xulrunner-%{apiversion}/add-plugins.sh > /dev/null 2>&1
+exit 0
+
+%posttrans
+# needed for updates which transition directory to symlink
+%if 0%{?ga_version:1}
+test -d %{_libdir}/xulrunner-%{ga_version} && rm -rf %{_libdir}/xulrunner-%{ga_version}
+ln -sf xulrunner-%{version_internal} %{_libdir}/xulrunner-%{ga_version}
+%endif
+[ -e %{_libdir}/xulrunner-%{version_internal}/add-plugins.sh ] && \
+ %{_libdir}/xulrunner-%{version_internal}/add-plugins.sh > /dev/null 2>&1
+exit 0
+
+%preun
+if [ "$1" = "0" ]; then # deinstallation
+ # that's not quite nice since old versions should be removed on update as well
+ # but that's problematic for updates w/o raising the version number
+ /usr/sbin/update-alternatives --remove xulrunner %{_libdir}/xulrunner-%{apiversion}/xulrunner
+fi
+rm -f %{_libdir}/xulrunner-%{version_internal}/dictionaries/*
+exit 0
+
+%triggerin -- myspell-dictionary
+%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh > /dev/null 2>&1
+exit 0
+
+%triggerpostun -- myspell-dictionary
+%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh > /dev/null 2>&1
+exit 0
+
+%post gnome
+touch %{_libdir}/xulrunner-%{version_internal}/.autoreg
+exit 0
+
+%files
+%defattr(-,root,root)
+%dir %{_libdir}/xulrunner-%{version_internal}/
+%dir %{_libdir}/xulrunner-%{version_internal}/chrome/
+%dir %{_libdir}/xulrunner-%{version_internal}/dictionaries/
+%dir %{_libdir}/xulrunner-%{version_internal}/extensions/
+%{_libdir}/xulrunner-%{version_internal}/chrome/classic.*
+%{_libdir}/xulrunner-%{version_internal}/chrome/comm.*
+%{_libdir}/xulrunner-%{version_internal}/chrome/en-US.*
+%{_libdir}/xulrunner-%{version_internal}/chrome/pippki.*
+%{_libdir}/xulrunner-%{version_internal}/chrome/toolkit.*
+%{_libdir}/xulrunner-%{version_internal}/chrome/icons/
+%{_libdir}/xulrunner-%{version_internal}/components/
+%exclude %{_libdir}/xulrunner-%{version_internal}/components/libmozgnome.so
+%exclude %{_libdir}/xulrunner-%{version_internal}/components/libnkgnomevfs.so
+%{_libdir}/xulrunner-%{version_internal}/defaults/
+%dir %{_libdir}/xulrunner-%{version_internal}/greprefs/
+%{_libdir}/xulrunner-%{version_internal}/greprefs/all.js
+%{_libdir}/xulrunner-%{version_internal}/greprefs/security-prefs.js
+%{_libdir}/xulrunner-%{version_internal}/greprefs/xpinstall.js
+%{_libdir}/xulrunner-%{version_internal}/greprefs/all-openSUSE.js
+%{_libdir}/xulrunner-%{version_internal}/greprefs/lockdown.js
+%{_libdir}/xulrunner-%{version_internal}/icons/
+%{_libdir}/xulrunner-%{version_internal}/modules/
+%{_libdir}/xulrunner-%{version_internal}/plugins/
+%{_libdir}/xulrunner-%{version_internal}/res/
+%{_libdir}/xulrunner-%{version_internal}/*.so
+%exclude %{_libdir}/xulrunner-%{version_internal}/libmozjs.so
+%{_libdir}/xulrunner-%{version_internal}/.autoreg
+%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh
+%{_libdir}/xulrunner-%{version_internal}/dependentlibs.list
+%{_libdir}/xulrunner-%{version_internal}/mozilla-xremote-client
+%{_libdir}/xulrunner-%{version_internal}/plugin-container
+%{_libdir}/xulrunner-%{version_internal}/run-mozilla.sh
+%{_libdir}/xulrunner-%{version_internal}/xulrunner
+%{_libdir}/xulrunner-%{version_internal}/xulrunner-bin
+%{_libdir}/xulrunner-%{version_internal}/xulrunner-stub
+%{_libdir}/xulrunner-%{version_internal}/platform.ini
+# crashreporter files
+%if %crashreporter
+%{_libdir}/xulrunner-%{version_internal}/crashreporter
+%{_libdir}/xulrunner-%{version_internal}/crashreporter.ini
+%{_libdir}/xulrunner-%{version_internal}/Throbber-small.gif
+%endif
+# ghosts
+%ghost %{_libdir}/xulrunner-%{version_internal}/global.reginfo
+%if %suse_version >= 1120
+%ghost %{_bindir}/xulrunner
+%endif
+# GRE
+%dir %{_sysconfdir}/gre.d/
+%attr(644,root,root) %{_sysconfdir}/gre.d/*
+# API symlink
+%{_libdir}/xulrunner-%{apiversion}
+# compat symlinks
+%if 0%{?ga_version:1}
+%ghost %{_libdir}/xulrunner-%{ga_version}
+%endif
+
+%files -n mozilla-js193
+%defattr(-,root,root)
+%dir %{_libdir}/xulrunner-%{version_internal}/
+%{_libdir}/xulrunner-%{apiversion}
+%{_libdir}/xulrunner-%{version_internal}/libmozjs.so
+
+%files devel
+%defattr(-,root,root)
+%{_libdir}/xulrunner-%{version_internal}/xpcshell
+%{_libdir}/xulrunner-%{version_internal}/xpidl
+%{_libdir}/xulrunner-%{version_internal}/xpt_dump
+%{_libdir}/xulrunner-%{version_internal}/xpt_link
+%{_libdir}/xulrunner-devel-%{version_internal}/
+# FIXME symlink dynamic libs below sdk/lib
+%attr(644,root,root) %{_libdir}/pkgconfig/*
+%{_includedir}/xulrunner-%{version_internal}/
+%{_datadir}/xulrunner-%{version_internal}/
+
+%files gnome
+%defattr(-,root,root)
+%dir %{_libdir}/xulrunner-%{version_internal}/
+%dir %{_libdir}/xulrunner-%{version_internal}/components/
+%ghost %{_libdir}/xulrunner-%{version_internal}/.autoreg
+%{_libdir}/xulrunner-%{version_internal}/components/libmozgnome.so
+%{_libdir}/xulrunner-%{version_internal}/components/libnkgnomevfs.so
+
+%if %localize
+
+%files translations-common -f %{_tmppath}/translations.common
+%defattr(-,root,root)
+%dir %{_libdir}/xulrunner-%{version_internal}/
+%dir %{_libdir}/xulrunner-%{version_internal}/chrome/
+
+%files translations-other -f %{_tmppath}/translations.other
+%defattr(-,root,root)
+%dir %{_libdir}/xulrunner-%{version_internal}/
+%dir %{_libdir}/xulrunner-%{version_internal}/chrome/
+%endif
+
+%if %crashreporter
+
+%files buildsymbols
+%defattr(-,root,root)
+%{_datadir}/mozilla/
+%endif
+
+%changelog
--- a/series Fri May 21 14:18:47 2010 +0200
+++ b/series Wed Jun 09 07:53:55 2010 +0200
@@ -1,18 +1,15 @@
# xulrunner/gecko patches
-mozilla-system-nspr.patch
toolkit-download-folder.patch
mozilla-libproxy.patch
mozilla-pkgconfig.patch
idldir.patch
mozilla-nongnome-proxies.patch
-mozilla-helper-app.patch
mozilla-prefer_plugin_pref.patch
-mozilla-shared-nss-db.patch
-mozilla-kde.patch
-mozilla-gconf-backend.patch
-gecko-lockdown.patch
-toolkit-ui-lockdown.patch
-mozilla-ua-locale-pref.patch
+#mozilla-shared-nss-db.patch
+#mozilla-kde.patch
+#mozilla-gconf-backend.patch
+#gecko-lockdown.patch
+#toolkit-ui-lockdown.patch
# Firefox patches
firefox-libxul-sdk.patch
--- a/temp/widgetproperty Fri May 21 14:18:47 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,188 +0,0 @@
-diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
---- a/xpcom/build/Makefile.in
-+++ b/xpcom/build/Makefile.in
-@@ -161,17 +161,18 @@ OS_LIBS += $(LIBICONV)
- GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
-
- include $(topsrcdir)/config/rules.mk
-
- DEFINES += \
- -D_IMPL_NS_COM \
- -D_IMPL_NS_STRINGAPI \
- -DEXPORT_XPT_API \
-- -DEXPORT_XPTC_API
-+ -DEXPORT_XPTC_API \
-+ -DMOZ_WIDGET_TOOLKIT=\"$(MOZ_WIDGET_TOOLKIT)\"
-
- EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
-
- ifdef GC_LEAK_DETECTOR
- DEFINES += -DGC_LEAK_DETECTOR
- endif
-
- ifdef TARGET_XPCOM_ABI
-diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in
---- a/xpcom/glue/Makefile.in
-+++ b/xpcom/glue/Makefile.in
-@@ -157,11 +157,13 @@ include $(topsrcdir)/config/rules.mk
-
- ifdef _MSC_VER
- # Don't include directives about which CRT to use
- OS_COMPILE_CXXFLAGS += -Zl
- OS_COMPILE_CFLAGS += -Zl
- DEFINES += -D_USE_ANSI_CPP
- endif
-
-+DEFINES += -DMOZ_WIDGET_TOOLKIT=\"$(MOZ_WIDGET_TOOLKIT)\"
-+
- ifdef TARGET_XPCOM_ABI
- DEFINES += -DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\"
- endif
-diff --git a/xpcom/glue/nsGREGlue.cpp b/xpcom/glue/nsGREGlue.cpp
---- a/xpcom/glue/nsGREGlue.cpp
-+++ b/xpcom/glue/nsGREGlue.cpp
-@@ -157,36 +157,46 @@ GRE_GetPathFromRegKey(HKEY aRegKey,
-
- nsresult
- GRE_GetGREPathWithProperties(const GREVersionRange *versions,
- PRUint32 versionsLength,
- const GREProperty *properties,
- PRUint32 propertiesLength,
- char *aBuffer, PRUint32 aBufLen)
- {
-+ // append the widget information to be able to have multiple xulrunners
-+ // based on different widget toolkits installed
-+ static const GREProperty kWidgetProperty =
-+ { "widget", MOZ_WIDGET_TOOLKIT };
-+
- #ifdef TARGET_XPCOM_ABI
-- // append the ABI to the properties to match only binary
-+ // append the ABI to the properties to match only binary
- // compatible GREs
-- static const GREProperty kExtraProperty =
-- { "abi", TARGET_XPCOM_ABI };
-+ static const GREProperty kAbiProperty =
-+ { "abi", TARGET_XPCOM_ABI };
-
-+ GREProperty *allProperties = new GREProperty[propertiesLength + 2];
-+#else
- GREProperty *allProperties = new GREProperty[propertiesLength + 1];
-+#endif
- if (!allProperties)
- return NS_ERROR_OUT_OF_MEMORY;
-
- for (PRUint32 i=0; i<propertiesLength; i++) {
- allProperties[i].property = properties[i].property;
- allProperties[i].value = properties[i].value;
- }
-- allProperties[propertiesLength].property = kExtraProperty.property;
-- allProperties[propertiesLength].value = kExtraProperty.value;
-+ allProperties[propertiesLength].property = kWidgetProperty.property;
-+ allProperties[propertiesLength].value = kWidgetProperty.value;
-+#ifdef TARGET_XPCOM_ABI
-+ allProperties[propertiesLength+1].property = kAbiProperty.property;
-+ allProperties[propertiesLength+1].value = kAbiProperty.value;
-+ PRUint32 allPropertiesLength = propertiesLength + 2;
-+#else
- PRUint32 allPropertiesLength = propertiesLength + 1;
--#else
-- const GREProperty *allProperties = properties;
-- PRUint32 allPropertiesLength = propertiesLength;
- #endif
-
- // if GRE_HOME is in the environment, use that GRE
- const char* env = getenv("GRE_HOME");
- if (env && *env) {
- char p[MAXPATHLEN];
- snprintf(p, sizeof(p), "%s" XPCOM_FILE_PATH_SEPARATOR XPCOM_DLL, env);
- p[sizeof(p) - 1] = '\0';
-diff --git a/xpcom/glue/standalone/Makefile.in b/xpcom/glue/standalone/Makefile.in
---- a/xpcom/glue/standalone/Makefile.in
-+++ b/xpcom/glue/standalone/Makefile.in
-@@ -120,14 +120,15 @@ OS_COMPILE_CFLAGS += -Zl
- DEFINES += -D_USE_ANSI_CPP
- endif
-
- export:: $(XPCOM_GLUE_SRC_CSRCS) $(XPCOM_GLUE_SRC_CPPSRCS) $(topsrcdir)/xpcom/glue/nsStringAPI.cpp
- $(INSTALL) $^ .
-
- GARBAGE += nsStringAPI.cpp
-
--DEFINES += -DXPCOM_GLUE
-+DEFINES += -DXPCOM_GLUE \
-+ -DMOZ_WIDGET_TOOLKIT=\"$(MOZ_WIDGET_TOOLKIT)\"
-
- ifdef TARGET_XPCOM_ABI
- DEFINES += -DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\"
- endif
-
-diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in
---- a/xulrunner/app/Makefile.in
-+++ b/xulrunner/app/Makefile.in
-@@ -59,17 +59,18 @@ PROGRAM = xulrunner$(BIN_SUFFIX)
- else
- ifeq ($(OS_ARCH), BeOS)
- PROGRAM = xulrunner$(BIN_SUFFIX)
- else
- PROGRAM = xulrunner-bin$(BIN_SUFFIX)
- endif
- endif
-
--DEFINES += -DXULRUNNER_PROGNAME=\"xulrunner\"
-+DEFINES += -DXULRUNNER_PROGNAME=\"xulrunner\" \
-+ -DMOZ_WIDGET_TOOLKIT=\"$(MOZ_WIDGET_TOOLKIT)\"
-
- ifdef MOZ_JAVAXPCOM
- DEFINES += -DMOZ_JAVAXPCOM
- endif
-
- ifdef TARGET_XPCOM_ABI
- DEFINES += -DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\"
- endif
-diff --git a/xulrunner/app/nsXULRunnerApp.cpp b/xulrunner/app/nsXULRunnerApp.cpp
---- a/xulrunner/app/nsXULRunnerApp.cpp
-+++ b/xulrunner/app/nsXULRunnerApp.cpp
-@@ -257,17 +257,18 @@ InstallXULApp(nsIFile* aXULRunnerDir,
-
- if (NS_FAILED(rv))
- return 3;
-
- return 0;
- }
-
- static const GREProperty kGREProperties[] = {
-- { "xulrunner", "true" }
-+ { "xulrunner", "true" },
-+ { "widget", MOZ_WIDGET_TOOLKIT }
- #ifdef TARGET_XPCOM_ABI
- , { "abi", TARGET_XPCOM_ABI }
- #endif
- #ifdef MOZ_JAVAXPCOM
- , { "javaxpcom", "1" }
- #endif
- };
-
-diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in
---- a/xulrunner/installer/Makefile.in
-+++ b/xulrunner/installer/Makefile.in
-@@ -63,18 +63,18 @@ endif
-
- include $(topsrcdir)/config/rules.mk
-
- INSTALL_SDK = 1
-
- include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
-
- $(MOZILLA_VERSION).system.conf: $(topsrcdir)/config/milestone.txt Makefile
-- printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \
-- $(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@
-+ printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nwidget=%s\nabi=%s" \
-+ $(MOZILLA_VERSION) $(installdir) $(MOZ_WIDGET_TOOLKIT) $(TARGET_XPCOM_ABI)> $@
-
- ifndef SKIP_GRE_REGISTRATION
- # to register xulrunner per-user, override this with $HOME/.gre.d
- regdir = /etc/gre.d
-
- install:: $(MOZILLA_VERSION).system.conf
- $(NSINSTALL) -D $(DESTDIR)$(regdir)
- $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(regdir)