This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
1c015f8b0c
commit
fd4d0ed4fe
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 8 00:14:18 CEST 2009 - wr@rosenauer.org
|
||||
|
||||
- split -translations package into -common and -other
|
||||
(bnc#529180)
|
||||
- remove "set as background" from context menu if not running in
|
||||
Gnome (part of bnc#170055)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 31 09:01:57 CEST 2009 - wr@rosenauer.org
|
||||
|
||||
|
||||
@ -25,11 +25,11 @@ BuildRequires: mozilla-xulrunner191-devel = 1.9.1.2
|
||||
%if %suse_version > 1020
|
||||
BuildRequires: fdupes
|
||||
%endif
|
||||
License: GPL v2 or later ; LGPL v2.1 or later ; MPL
|
||||
License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
|
||||
Provides: web_browser
|
||||
Provides: firefox
|
||||
Version: 3.5.2
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: Mozilla Firefox Web Browser
|
||||
Url: http://www.mozilla.org/
|
||||
Group: Productivity/Networking/Web/Browsers
|
||||
@ -49,6 +49,7 @@ Patch2: firefox-no-update.patch
|
||||
Patch3: toolkit-download-folder.patch
|
||||
Patch4: mozilla-linkorder.patch
|
||||
Patch5: firefox-bug506901.patch
|
||||
Patch6: firefox-contextmenu-gnome.patch
|
||||
Patch14: credits.patch
|
||||
Patch17: firefox-appname.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -86,16 +87,30 @@ plethora of extensions.
|
||||
|
||||
%if %localize
|
||||
|
||||
%package translations
|
||||
Summary: Translations for MozillaFirefox
|
||||
License: GPL v2 or later ; LGPL v2.1 or later ; MPL
|
||||
Provides: locale(%{name}:af;ar;as;be;bg;bn_BD;bn_IN;ca;cs;cy;da;de;el;en_GB;eo;es_AR;es_CL;es_ES;ex_MX;et;eu;fa;fi;fr;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;hu;id;is;it;ja;ka;kk;kn;ko;ku;lt;lv;mk;ml;mr;nb_NO;nl;nn_NO;oc;or;pa_IN;pl;pt_BR;pt_PT;rm;ro;ru;si;sk;sl;sq;sr;sv_SE;ta;ta_LK;te;th;uk;vi;zh_CN;zh_TW)
|
||||
%package translations-common
|
||||
Summary: Common translations for MozillaFirefox
|
||||
License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
|
||||
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)
|
||||
Group: System/Localization
|
||||
PreReq: %{name} = %{version}
|
||||
Requires: mozilla-xulrunner191-translations
|
||||
Requires: mozilla-xulrunner191-translations-common
|
||||
Obsoletes: %{name}-translations < %{version}-%{release}
|
||||
|
||||
%description translations
|
||||
This package contains several optional languages for the user interface
|
||||
%description translations-common
|
||||
This package contains several common languages for the user interface
|
||||
of MozillaFirefox.
|
||||
|
||||
%package translations-other
|
||||
Summary: Extra translations for MozillaFirefox
|
||||
License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
|
||||
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;mn;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi)
|
||||
Group: System/Localization
|
||||
PreReq: %{name} = %{version}
|
||||
Requires: mozilla-xulrunner191-translations-other
|
||||
Obsoletes: %{name}-translations < %{version}-%{release}
|
||||
|
||||
%description translations-other
|
||||
This package contains rarely used languages for the user interface
|
||||
of MozillaFirefox.
|
||||
|
||||
%endif
|
||||
@ -131,6 +146,7 @@ cd $RPM_BUILD_DIR/mozilla
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch14
|
||||
%patch17
|
||||
|
||||
@ -184,7 +200,7 @@ mkdir -p $RPM_BUILD_ROOT/%{progdir}
|
||||
cp -rf $RPM_BUILD_DIR/mozilla/dist/firefox/* $RPM_BUILD_ROOT/%{progdir}
|
||||
# install additional locales
|
||||
%if %localize
|
||||
echo %defattr\(-,root,root\) > %{_tmppath}/translations.list
|
||||
rm -f %{_tmppath}/translations.*
|
||||
for locale in $(awk '{ print $1; }' browser/locales/shipped-locales); do
|
||||
case $locale in
|
||||
ja-JP-mac|en-US)
|
||||
@ -192,11 +208,17 @@ for locale in $(awk '{ print $1; }' browser/locales/shipped-locales); do
|
||||
*)
|
||||
make -C browser/locales libs-$locale
|
||||
cp dist/xpi-stage/locale-$locale/chrome/$locale.jar \
|
||||
$RPM_BUILD_ROOT/%{progdir}/chrome
|
||||
$RPM_BUILD_ROOT%{progdir}/chrome
|
||||
cp dist/xpi-stage/locale-$locale/chrome/$locale.manifest \
|
||||
$RPM_BUILD_ROOT/%{progdir}/chrome
|
||||
echo %{progdir}/chrome/$locale.jar >> %{_tmppath}/translations.list
|
||||
echo %{progdir}/chrome/$locale.manifest >> %{_tmppath}/translations.list
|
||||
$RPM_BUILD_ROOT%{progdir}/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 %{progdir}/chrome/$locale.jar >> %{_tmppath}/translations.$_l10ntarget
|
||||
echo %{progdir}/chrome/$locale.manifest >> %{_tmppath}/translations.$_l10ntarget
|
||||
esac
|
||||
done
|
||||
%endif
|
||||
@ -208,7 +230,7 @@ s:%%APPNAME:%{progname}:g
|
||||
s:%%PROFILE:.mozilla/firefox:g" \
|
||||
%{SOURCE3} > $RPM_BUILD_ROOT%{progdir}/%{progname}.sh
|
||||
chmod 755 $RPM_BUILD_ROOT%{progdir}/%{progname}.sh
|
||||
ln -sf ../..%{progdir}/%{progname}.sh $RPM_BUILD_ROOT/usr/bin/%{progname}
|
||||
ln -sf ../..%{progdir}/%{progname}.sh $RPM_BUILD_ROOT%{_bindir}/%{progname}
|
||||
# desktop definition
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
|
||||
install -m 644 %{SOURCE1} \
|
||||
@ -258,6 +280,9 @@ rm -f $RPM_BUILD_ROOT%{progdir}/run-mozilla.sh
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%if %localize
|
||||
rm -rf %{_tmppath}/translations.*
|
||||
%endif
|
||||
|
||||
%post
|
||||
# update mime and desktop database
|
||||
@ -328,7 +353,10 @@ fi
|
||||
%doc %{_mandir}/man1/%{progname}.1.gz
|
||||
%if %localize
|
||||
|
||||
%files translations -f %{_tmppath}/translations.list
|
||||
%files translations-common -f %{_tmppath}/translations.common
|
||||
%defattr(-,root,root)
|
||||
|
||||
%files translations-other -f %{_tmppath}/translations.other
|
||||
%defattr(-,root,root)
|
||||
%endif
|
||||
|
||||
|
||||
26
firefox-contextmenu-gnome.patch
Normal file
26
firefox-contextmenu-gnome.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From: Wolfgang Rosenauer
|
||||
Subject: Some context menu items are really confusing if not running in Gnome
|
||||
References:
|
||||
https://bugzilla.novell.com/show_bug.cgi?id=170055
|
||||
|
||||
|
||||
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 = {
|
||||
// Set as Desktop background depends on whether an image was clicked on,
|
||||
// and only works if we have a shell service.
|
||||
var haveSetDesktopBackground = false;
|
||||
#ifdef HAVE_SHELL_SERVICE
|
||||
// Only enable Set as Desktop Background if we can get the shell service.
|
||||
var shell = getShellService();
|
||||
- if (shell)
|
||||
+ var env = Components.classes["@mozilla.org/process/environment;1"]
|
||||
+ .getService(Components.interfaces.nsIEnvironment);
|
||||
+ if (shell && env.get('DESKTOP_SESSION') == "gnome")
|
||||
haveSetDesktopBackground = true;
|
||||
#endif
|
||||
this.showItem("context-setDesktopBackground",
|
||||
haveSetDesktopBackground && this.onLoadedImage);
|
||||
|
||||
if (haveSetDesktopBackground && this.onLoadedImage) {
|
||||
Loading…
Reference in New Issue
Block a user