Hello community,
here is the log from the commit of package MozillaFirefox for openSUSE:Factory
checked in at Fri Jan 14 02:26:56 CET 2011.
--------
--- MozillaFirefox/MozillaFirefox.changes 2011-01-03 17:36:26.000000000 +0100
+++ MozillaFirefox/MozillaFirefox.changes 2011-01-13 12:12:52.000000000 +0100
@@ -1,0 +2,15 @@
+Tue Jan 11 06:13:40 UTC 2011 - wr@rosenauer.org
+
+- update to version 4.0b9
+- added x-scheme-handler for http and https to desktop file for
+ newer Gnome environments
+- fixed default browser check/set for GIO (bmo#611953)
+ (mozilla-shellservice.patch)
+- removed obsolete firefox-appname.patch (integrated into
+ shellservice patch)
+- renamed desktop file to firefox.desktop for 11.4 and newer
+ (bnc#664211)
+- removed support for 10.3 and older from the spec file
+- removed obsolete "Ximian" categories from desktop file
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
firefox-4.0b-source.tar.bz2
firefox-appname.patch
l10n-4.0b.tar.bz2
mozilla-firefox-sync.patch
New:
----
firefox-4.0b9-source.tar.bz2
firefox-shell-bmo624267.patch
firefox-shellservice.patch
l10n-4.0b9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaFirefox.spec ++++++
--- /var/tmp/diff_new_pack.NWKfzS/_old 2011-01-14 02:20:38.000000000 +0100
+++ /var/tmp/diff_new_pack.NWKfzS/_new 2011-01-14 02:20:38.000000000 +0100
@@ -1,8 +1,8 @@
#
-# spec file for package MozillaFirefox (Version 4.0b)
+# spec file for package MozillaFirefox
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# 2006-2010 Wolfgang Rosenauer
+# 2006-2011 Wolfgang Rosenauer
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,14 +29,14 @@
BuildRequires: wireless-tools
%endif
%if 0%{?use_xulrunner}
-BuildRequires: %{xulrunner}-devel = 2.0b
+BuildRequires: %{xulrunner}-devel = 2.0b9
%endif
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version: 4.0b
-Release: 3
+Version: 4.0b9
+Release: 1
Provides: web_browser
Provides: firefox = %{version}
-%define releasedate 2010121400
+%define releasedate 2011011000
Summary: Mozilla Firefox Web Browser
Url: http://www.mozilla.org/
Group: Productivity/Networking/Web/Browsers
@@ -52,18 +52,18 @@
Source9: firefox-lockdown.js
Source10: compare-locales.tar.bz2
Source11: firefox.1
-Patch0: mozilla-firefox-sync.patch
Patch1: toolkit-download-folder.patch
Patch2: firefox-linkorder.patch
Patch3: firefox-browser-css.patch
Patch4: firefox-cross-desktop.patch
-Patch5: firefox-appname.patch
-Patch6: firefox-kde.patch
-Patch7: firefox-ui-lockdown.patch
-Patch8: firefox-no-sync-l10n.patch
-Patch9: firefox-libxulsdk-locales.patch
-Patch10: firefox-no-default-ualocale.patch
-Patch11: firefox-multilocale-chrome.patch
+Patch5: firefox-kde.patch
+Patch6: firefox-ui-lockdown.patch
+Patch7: firefox-no-sync-l10n.patch
+Patch8: firefox-libxulsdk-locales.patch
+Patch9: firefox-no-default-ualocale.patch
+Patch10: firefox-multilocale-chrome.patch
+Patch11: firefox-shell-bmo624267.patch
+Patch12: firefox-shellservice.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): coreutils shared-mime-info desktop-file-utils
Requires(postun): shared-mime-info desktop-file-utils
@@ -83,6 +83,11 @@
%define progname firefox
%define progdir %{_prefix}/%_lib/%{progname}
%define gnome_dir %{_prefix}
+%if %suse_version > 1130
+%define desktop_file_name firefox
+%else
+%define desktop_file_name %{name}
+%endif
### build options
%define branding 1
%define localize 1
@@ -153,22 +158,22 @@
%prep
%setup -q -n mozilla -b 7 -b 10
cd $RPM_BUILD_DIR/mozilla
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%if %suse_version >= 1110
-%patch6 -p1
+%patch5 -p1
# install kde.js
install -m 644 %{SOURCE6} browser/app/profile/kde.js
%endif
-#%patch7 -p1
+#%patch6 -p1
+%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
%build
export MOZ_BUILD_DATE=%{releasedate}
@@ -227,7 +232,10 @@
make -C browser/installer STRIP=/bin/true
# copy tree into RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{progdir}
-cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT/%{progdir}
+cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT%{progdir}
+# remove some executable permissions
+find $RPM_BUILD_ROOT%{progdir} \
+ -name "*.js" -o -name "*.jsm" -o -name "*.rdf" | xargs chmod a-x
mkdir -p $RPM_BUILD_ROOT%{progdir}/searchplugins
# install additional locales
%if %localize
@@ -272,7 +280,7 @@
# desktop definition
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
install -m 644 %{SOURCE1} \
- $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+ $RPM_BUILD_ROOT%{_datadir}/applications/%{desktop_file_name}.desktop
# additional mime-types
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages
cp %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mime/packages/%{progname}.xml
@@ -292,7 +300,7 @@
$RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/%{progname}.png
done
%endif
-%suse_update_desktop_file %{name} Network WebBrowser X-Ximian-Main X-Ximian-Toplevel GTK
+%suse_update_desktop_file %{desktop_file_name} Network WebBrowser GTK
# excludes
rm -f $RPM_BUILD_ROOT%{progdir}/updater.ini
rm -f $RPM_BUILD_ROOT%{progdir}/removed-files
@@ -315,38 +323,18 @@
if [ -f usr/bin/update-mime-database ] ; then
usr/bin/update-mime-database %{_datadir}/mime > /dev/null || :
fi
-%if %suse_version >= 1030
if [ -f usr/bin/update-desktop-database ] ; then
usr/bin/update-desktop-database > /dev/null || :
fi
-%else
-if [ -f opt/gnome/bin/update-mime-database ] ; then
- opt/gnome/bin/update-mime-database > /dev/null || :
-fi
-%endif
-# move plugins to new location
-if [ "$1" = "2" ]; then
- if [ -d /opt/MozillaFirefox/%{_lib}/plugins ]; then
- rm -rf /opt/MozillaFirefox/%{_lib}/plugins/libnullplugin.so
- cp -fud /opt/MozillaFirefox/%{_lib}/plugins/* %{progdir}/plugins
- rm -rf /opt/MozillaFirefox/%{_lib}/plugins
- fi
-fi
exit 0
%postun
if [ -f usr/bin/update-mime-database ] ; then
usr/bin/update-mime-database %{_datadir}/mime > /dev/null || :
fi
-%if %suse_version >= 1030
if [ -f usr/bin/update-desktop-database ] ; then
usr/bin/update-desktop-database > /dev/null || :
fi
-%else
-if [ -f opt/gnome/bin/update-mime-database ] ; then
- opt/gnome/bin/update-mime-database > /dev/null || :
-fi
-%endif
%files
%defattr(-,root,root)
@@ -374,7 +362,7 @@
%{progdir}/crashreporter-override.ini
%endif
%{progdir}/chrome.manifest
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{desktop_file_name}.desktop
%{_datadir}/mime/packages/%{progname}.xml
%{_datadir}/pixmaps/firefox*
%if %branding
++++++ MozillaFirefox.desktop ++++++
--- /var/tmp/diff_new_pack.NWKfzS/_old 2011-01-14 02:20:38.000000000 +0100
+++ /var/tmp/diff_new_pack.NWKfzS/_new 2011-01-14 02:20:38.000000000 +0100
@@ -8,5 +8,5 @@
Icon=firefox
Terminal=false
StartupNotify=true
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;application/x-xpinstall;
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;application/x-xpinstall;x-scheme-handler/http;x-scheme-handler/https;
Type=Application
++++++ compare-locales.tar.bz2 ++++++
++++++ firefox-4.0b-source.tar.bz2 -> firefox-4.0b9-source.tar.bz2 ++++++
MozillaFirefox/firefox-4.0b-source.tar.bz2 MozillaFirefox/firefox-4.0b9-source.tar.bz2 differ: char 11, line 1
++++++ firefox-kde.patch ++++++
--- /var/tmp/diff_new_pack.NWKfzS/_old 2011-01-14 02:20:38.000000000 +0100
+++ /var/tmp/diff_new_pack.NWKfzS/_new 2011-01-14 02:20:38.000000000 +0100
@@ -23,7 +23,7 @@
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1042 @@
+@@ -0,0 +1,1058 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -329,7 +329,8 @@
+ </menupopup>
+
+