--- a/MozillaFirefox/MozillaFirefox.spec Wed Jun 09 21:28:04 2010 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Wed Jun 09 22:14:00 2010 +0200
@@ -22,7 +22,7 @@
Name: MozillaFirefox
%define xulrunner mozilla-xulrunner193
BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip fdupes Mesa
-BuildRequires: %{xulrunner}-devel = 1.9.3a4
+BuildRequires: %{xulrunner}-devel = 1.9.3a
%if %suse_version > 1110
BuildRequires: libiw-devel
%else
@@ -67,7 +67,7 @@
Requires: %{xulrunner}-32bit >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' %{xulrunner})
Requires: %{xulrunner}-32bit = %(rpm -q --queryformat '%{VERSION}' %{xulrunner})
%endif
-Requires: %{name}-branding >= 3.7
+Requires: %{name}-branding > 3.6
%define _use_internal_dependency_generator 0
%define __find_requires sh %{SOURCE4}
%global provfind sh -c "grep -v '.so' | %__find_provides"
@@ -120,7 +120,7 @@
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
Summary: Upstream branding for MozillaFirefox
Group: Productivity/Networking/Web/Browsers
-Provides: %{name}-branding = 3.5
+Provides: %{name}-branding = 3.7
Conflicts: otherproviders(%{name}-branding)
Supplements: packageand(%{name}:branding-upstream)
#BRAND: Provide three files -
--- a/mozilla-disable-javaxpcom.patch Wed Jun 09 21:28:04 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-diff --git a/configure.in b/configure.in
---- a/configure.in
-+++ b/configure.in
-@@ -5760,24 +5760,26 @@ fi
-
- AC_SUBST(MOZ_IPDL_TESTS)
-
- dnl ========================================================
- dnl = Disable plugin support
- dnl ========================================================
- MOZ_ARG_DISABLE_BOOL(plugins,
- [ --disable-plugins Disable plugins support],
-- MOZ_PLUGINS=,)
-+ MOZ_PLUGINS=,
-+ MOZ_PLUGINS=1)
-
- dnl ========================================================
- dnl = Disable building dbm
- dnl ========================================================
- MOZ_ARG_DISABLE_BOOL(dbm,
- [ --disable-dbm Disable building dbm],
-- NSS_DISABLE_DBM=1,)
-+ NSS_DISABLE_DBM=1,
-+ NSS_DISABLE_DBM=)
-
- dnl bi-directional support always on
- IBMBIDI=1
- AC_DEFINE(IBMBIDI)
-
- dnl ========================================================
- dnl view source support on by default
- dnl ========================================================
-@@ -5817,17 +5819,18 @@ if test "$MOZ_JSLOADER"; then
- AC_DEFINE(MOZ_JSLOADER)
- fi
-
- dnl ========================================================
- dnl Disable printing
- dnl ========================================================
- MOZ_ARG_DISABLE_BOOL(printing,
- [ --disable-printing Disable printing support],
-- NS_PRINTING=,)
-+ NS_PRINTING=,
-+ NS_PRINTING=1)
-
- if test "$MOZ_WIDGET_TOOLKIT" = "qt"; then
- AC_MSG_WARN([Printing does not work with Qt at this time. Omitting printing support.])
- NS_PRINTING=
- fi
-
- if test "$NS_PRINTING"; then
- AC_DEFINE(NS_PRINTING)
-@@ -5876,17 +5879,18 @@ if test -n "$MOZ_NO_FAST_LOAD"; then
- AC_DEFINE(MOZ_NO_FAST_LOAD)
- fi
-
- dnl ========================================================
- dnl = Disable Ogg Codecs
- dnl ========================================================
- MOZ_ARG_DISABLE_BOOL(ogg,
- [ --disable-ogg Disable support for OGG media (Theora video and Vorbis audio)],
-- MOZ_OGG=,)
-+ MOZ_OGG=,
-+ MOZ_OGG=1)
-
- if test -n "$MOZ_OGG"; then
- AC_DEFINE(MOZ_OGG)
- MOZ_SYDNEYAUDIO=1
- MOZ_MEDIA=1
- MOZ_VORBIS=1
-
- dnl Checks for __attribute__(aligned()) directive
-@@ -5967,17 +5971,18 @@ if test -n "$MOZ_WEBM"; then
- fi
- fi
-
- dnl ========================================================
- dnl = Disable Wave decoder support
- dnl ========================================================
- MOZ_ARG_DISABLE_BOOL(wave,
- [ --disable-wave Disable Wave decoder support],
-- MOZ_WAVE=,)
-+ MOZ_WAVE=,
-+ MOZ_WAVE=1)
-
- if test -n "$MOZ_WAVE"; then
- AC_DEFINE(MOZ_WAVE)
- MOZ_SYDNEYAUDIO=1
- MOZ_MEDIA=1
- fi
-
- dnl ========================================================
-@@ -6077,17 +6082,18 @@ case "${target}" in
- *-wince*)
- MOZ_JAVAXPCOM=
- ;;
- esac
-
- MOZ_ARG_ENABLE_BOOL(javaxpcom,
- [ --enable-javaxpcom
- Enable Java-XPCOM bridge],
-- MOZ_JAVAXPCOM=1,)
-+ MOZ_JAVAXPCOM=1,
-+ MOZ_JAVAXPCOM=)
-
- case "$host_os" in
- cygwin*|msvc*|mks*)
- if test -n "$JAVA_HOME"; then
- JAVA_HOME=`cygpath -u \`cygpath -m -s "$JAVA_HOME"\``
- fi
- ;;
- *mingw*)
-@@ -6154,17 +6160,18 @@ i?86-*-linux*|x86_64-*-linux*|arm-*-linu
- ;;
- *solaris*)
- MOZ_CRASHREPORTER=1
- ;;
- esac
-
- MOZ_ARG_DISABLE_BOOL(crashreporter,
- [ --disable-crashreporter Disable breakpad crash reporting],
-- MOZ_CRASHREPORTER=,)
-+ MOZ_CRASHREPORTER=,
-+ MOZ_CRASHREPORTER=1)
-
- if test -n "$MOZ_CRASHREPORTER"; then
- AC_DEFINE(MOZ_CRASHREPORTER)
-
- if (test "$OS_ARCH" = "Linux" || test "$OS_ARCH" = "SunOS") && \
- test -z "$SKIP_LIBRARY_CHECKS"; then
- PKG_CHECK_MODULES(MOZ_GTHREAD, gthread-2.0)
- AC_SUBST(MOZ_GTHREAD_CFLAGS)
-@@ -6431,17 +6438,18 @@ dnl ====================================
- case "$target_os" in
- aix*|solaris*|linux*|msvc*|mks*|cygwin*|mingw*|os2*|wince*|winmo*)
- MOZ_INSTALLER=1
- ;;
- esac
-
- MOZ_ARG_DISABLE_BOOL(installer,
- [ --disable-installer Disable building of installer],
-- MOZ_INSTALLER=,)
-+ MOZ_INSTALLER=,
-+ MOZ_INSTALLER=1)
- if test -n "$MOZ_INSTALLER" -a "$OS_ARCH" = "WINNT"; then
- # Disable installer for Windows builds that use the new toolkit if NSIS
- # isn't in the path.
- MOZ_PATH_PROGS(MAKENSIS, makensis)
- if test -z "$MAKENSIS" || test "$MAKENSIS" = ":"; then
- AC_MSG_ERROR([To build the installer makensis is required in your path. To build without the installer reconfigure using --disable-installer.])
- fi
- # The Windows build for NSIS requires the iconv command line utility to
-@@ -8482,17 +8490,18 @@ if test "$NECKO_DISK_CACHE"; then
- AC_DEFINE(NECKO_DISK_CACHE)
- fi
-
- dnl
- dnl option to disable necko's wifi scanner
- dnl
- MOZ_ARG_DISABLE_BOOL(necko-wifi,
- [ --disable-necko-wifi Disable necko wifi scanner],
-- NECKO_WIFI=,)
-+ NECKO_WIFI=,
-+ NECKO_WIFI=1)
-
- if test "$OS_ARCH" = "OS2"; then
- dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
- NECKO_WIFI=
- fi
- if test "$NECKO_WIFI" -a \
- "$OS_ARCH" != "Linux" -a \
- "$OS_ARCH" != "Darwin" -a \
--- a/mozilla-xulrunner193/mozilla-disable-javaxpcom.patch Wed Jun 09 21:28:04 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-disable-javaxpcom.patch
\ No newline at end of file
--- a/mozilla-xulrunner193/mozilla-xulrunner193.spec Wed Jun 09 21:28:04 2010 +0200
+++ b/mozilla-xulrunner193/mozilla-xulrunner193.spec Wed Jun 09 22:14:00 2010 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package mozilla-xulrunner193 (Version 1.9.3a4)
+# spec file for package mozilla-xulrunner193 (Version 1.9.3a)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# 2006-2010 Wolfgang Rosenauer
@@ -33,9 +33,9 @@
BuildRequires: wireless-tools
%endif
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version: 1.9.3a4
+Version: 1.9.3a
Release: 1
-%define releasedate 2010060800
+%define releasedate 2010060900
%define version_internal 1.9.3a5pre
%define apiversion 1.9.3
%define uaweight 192900
@@ -66,7 +66,6 @@
Patch3: mozilla-pkgconfig.patch
Patch4: idldir.patch
Patch5: mozilla-nongnome-proxies.patch
-Patch6: mozilla-disable-javaxpcom.patch
Patch7: mozilla-prefer_plugin_pref.patch
Patch8: mozilla-shared-nss-db.patch
Patch10: mozilla-kde.patch
@@ -205,7 +204,6 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
%patch7 -p1
#%patch8 -p1
#%if %suse_version >= 1110
--- a/series Wed Jun 09 21:28:04 2010 +0200
+++ b/series Wed Jun 09 22:14:00 2010 +0200
@@ -4,7 +4,6 @@
mozilla-pkgconfig.patch
idldir.patch
mozilla-nongnome-proxies.patch
-mozilla-disable-javaxpcom.patch
mozilla-prefer_plugin_pref.patch
#mozilla-shared-nss-db.patch
#mozilla-kde.patch