Hello community,
here is the log from the commit of package MozillaFirefox for openSUSE:Factory
checked in at Wed Feb 2 01:48:45 CET 2011.
--------
--- MozillaFirefox/MozillaFirefox.changes 2011-01-24 10:14:26.000000000 +0100
+++ /mounts/work_src_done/STABLE/MozillaFirefox/MozillaFirefox.changes 2011-01-28 18:09:26.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Jan 28 08:56:12 UTC 2011 - wr@rosenauer.org
+
+- set correct desktop file name within KDE for 11.4 and up
+- add devel package with macros for extensions (from lnussel@suse.de)
+
+-------------------------------------------------------------------
@@ -8 +13,0 @@
-- use new macros for desktop file and icon registration
calling whatdependson for head-i586
New:
----
firefox-kde-114.patch
mozilla-get-app-id
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaFirefox.spec ++++++
--- /var/tmp/diff_new_pack.HvbtKE/_old 2011-02-02 01:47:16.000000000 +0100
+++ /var/tmp/diff_new_pack.HvbtKE/_new 2011-02-02 01:47:16.000000000 +0100
@@ -18,6 +18,8 @@
# norootforbuild
+%define major 4
+%define mainver %major.0
Name: MozillaFirefox
%define use_xulrunner 1
@@ -32,10 +34,11 @@
BuildRequires: %{xulrunner}-devel = 2.0b10
%endif
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version: 4.0b10
-Release: 1
+Version: %{mainver}b10
+Release: 2
Provides: web_browser
-Provides: firefox = %{version}
+Provides: firefox = %{version}-%{release}
+Provides: firefox = %{mainver}
%define releasedate 2011012100
Summary: Mozilla Firefox Web Browser
Url: http://www.mozilla.org/
@@ -52,17 +55,19 @@
Source9: firefox-lockdown.js
Source10: compare-locales.tar.bz2
Source11: firefox.1
+Source12: mozilla-get-app-id
Patch1: toolkit-download-folder.patch
Patch2: firefox-linkorder.patch
Patch3: firefox-browser-css.patch
Patch4: firefox-cross-desktop.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-shellservice.patch
+Patch6: firefox-kde-114.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
+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
@@ -75,6 +80,7 @@
%endif
%endif
Requires: %{name}-branding >= 4.0
+%define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
%define _use_internal_dependency_generator 0
%define __find_requires sh %{SOURCE4}
%global provfind sh -c "grep -v '.so' | %__find_provides"
@@ -102,6 +108,17 @@
compliance and performance. Its functionality can be enhanced via a
plethora of extensions.
+%package devel
+License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+Summary: Devel package for Firefox
+Group: Development/Tools/Other
+Provides: firefox-devel = %{version}-%{release}
+Requires: %{name} = %{version}
+Requires: perl(XML::Simple)
+Requires: perl(Archive::Zip)
+
+%description devel
+Development files for Firefox to make packaging of addons easier.
%if %localize
@@ -128,7 +145,6 @@
%description translations-other
This package contains rarely used languages for the user interface
of MozillaFirefox.
-
%endif
%package branding-upstream
@@ -166,12 +182,15 @@
# install kde.js
install -m 644 %{SOURCE6} browser/app/profile/kde.js
%endif
-#%patch6 -p1
-%patch7 -p1
+%if %suse_version >= 1140
+%patch6 -p1
+%endif
+#%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
%build
export MOZ_BUILD_DATE=%{releasedate}
@@ -288,6 +307,8 @@
##########
# ADDONS
#
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{firefox_appid}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_appid}
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
ln -sf %{progdir}/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.png
ln -sf %{progdir}/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}-gnome.png
@@ -306,6 +327,35 @@
rm -f $RPM_BUILD_ROOT%{progdir}/old-homepage-default.properties
rm -f $RPM_BUILD_ROOT%{progdir}/run-mozilla.sh
rm -f $RPM_BUILD_ROOT%{progdir}/LICENSE
+# devel
+mkdir -p %{buildroot}%{_bindir}
+install -m 755 %SOURCE12 %{buildroot}%{_bindir}
+# inspired by mandriva
+mkdir -p %{buildroot}/etc/rpm
+cat <<'FIN' >%{buildroot}/etc/rpm/macros.%{progname}
+# Macros from %{name} package
+%%firefox_major %{major}
+%%firefox_version %{version}
+%%firefox_mainver %{mainver}
+%%firefox_mozillapath %{progdir}
+%%firefox_xulrunner %{xulrunner}
+%%firefox_xulrunner_version %(rpm -q --queryformat '%{VERSION}' %{xulrunner})
+%%firefox_pluginsdir %{_libdir}/browser-plugins
+%%firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
+%%firefox_extdir %%(if [ "%%_target_cpu" = "noarch" ]; then echo %%{_datadir}/mozilla/extensions/%%{firefox_appid}; else echo %%{_libdir}/mozilla/extensions/%%{firefox_appid}; fi)
+
+%%firefox_ext_install() \
+ extdir="%%{buildroot}%%{firefox_extdir}/`mozilla-get-app-id '%%1'`" \
+ mkdir -p "$extdir" \
+ %%{__unzip} -q -d "$extdir" "%%1" \
+ %%{nil}
+FIN
+# just dumping an xpi file there doesn't work...
+#%%firefox_ext_install() \
+# extdir="%%{buildroot}%%{firefox_extdir}" \
+# mkdir -p "$extdir" \
+# cp "%%1" "$extdir" \
+# %%{nil}
# fdupes
%fdupes $RPM_BUILD_ROOT%{progdir}
%fdupes $RPM_BUILD_ROOT%{_datadir}
@@ -377,12 +427,23 @@
%{_datadir}/applications/%{desktop_file_name}.desktop
%{_datadir}/mime/packages/%{progname}.xml
%{_datadir}/pixmaps/firefox*
+%dir %{_datadir}/mozilla
+%dir %{_datadir}/mozilla/extensions
+%dir %{_datadir}/mozilla/extensions/%{firefox_appid}
+%dir %{_libdir}/mozilla
+%dir %{_libdir}/mozilla/extensions
+%dir %{_libdir}/mozilla/extensions/%{firefox_appid}
%if %branding
%{gnome_dir}/share/icons/hicolor/
%endif
%{_bindir}/%{progname}
%doc %{_mandir}/man1/%{progname}.1.gz
+%files devel
+%defattr(-,root,root)
+%{_bindir}/mozilla-get-app-id
+%config /etc/rpm/macros.%{progname}
+
%if %localize
%files translations-common -f %{_tmppath}/translations.common
++++++ firefox-cross-desktop.patch ++++++
--- /var/tmp/diff_new_pack.HvbtKE/_old 2011-02-02 01:47:18.000000000 +0100
+++ /var/tmp/diff_new_pack.HvbtKE/_new 2011-02-02 01:47:18.000000000 +0100
@@ -1,13 +1,15 @@
From: Wolfgang Rosenauer
-Subject: NonGnome/KDE integration
+NonGnome/KDE integration
+
References:
https://bugzilla.novell.com/show_bug.cgi?id=170055
-Caveats: desktop file name of Firefox is hardcoded to MozillaFirefox
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
-@@ -210,13 +210,15 @@ nsContextMenu.prototype = {
+@@ -237,17 +237,19 @@ nsContextMenu.prototype = {
+ this.showItem("context-sep-viewsource", shouldShow);
+
// Set as Desktop background depends on whether an image was clicked on,
// and only works if we have a shell service.
var haveSetDesktopBackground = false;
@@ -24,46 +26,5 @@
haveSetDesktopBackground && this.onLoadedImage);
if (haveSetDesktopBackground && this.onLoadedImage) {
-diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
---- a/browser/components/preferences/advanced.js
-+++ b/browser/components/preferences/advanced.js
-@@ -594,20 +594,38 @@ var gAdvancedPane = {
- var brandShortName = brandBundle.getString("brandShortName");
- var promptTitle = shellBundle.getString("setDefaultBrowserTitle");
- var promptMessage;
- const IPS = Components.interfaces.nsIPromptService;
- var psvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
- .getService(IPS);
-+
-+ var env = Components.classes["@mozilla.org/process/environment;1"]
-+ .getService(Components.interfaces.nsIEnvironment);
-+ var kde_session = 0;
-+ if (env.get('KDE_FULL_SESSION') == "true")
-+ kde_session = 1;
-+
- if (!shellSvc.isDefaultBrowser(false)) {
- promptMessage = shellBundle.getFormattedString("setDefaultBrowserMessage",
- [brandShortName]);
- var rv = psvc.confirmEx(window, promptTitle, promptMessage,
- IPS.STD_YES_NO_BUTTONS,
- null, null, null, null, { });
-- if (rv == 0)
-+ if (rv == 0) {
- shellSvc.setDefaultBrowser(true, false);
-+ if (kde_session == 1) {
-+ var shellObj = Components.classes["@mozilla.org/file/local;1"]
-+ .createInstance(Components.interfaces.nsILocalFile);
-+ shellObj.initWithPath("/usr/bin/kwriteconfig");
-+ var process = Components.classes["@mozilla.org/process/util;1"]
-+ .createInstance(Components.interfaces.nsIProcess);
-+ process.init(shellObj);
-+ var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "MozillaFirefox"];
-+ process.run(false, args, args.length);
-+ }
-+ }
- }
- else {
- promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser",
- [brandShortName]);
- psvc.alert(window, promptTitle, promptMessage);
- }
+ document.getElementById("context-setDesktopBackground")
+ .disabled = this.disableSetDesktopBackground();
++++++ firefox-kde-114.patch ++++++
# HG changeset patch
# User Wolfgang Rosenauer