Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed loading of kde.js under KDE (bnc#718311)
authorWolfgang Rosenauer <wr@rosenauer.org>
Fri, 16 Sep 2011 08:58:30 +0200
changeset 327 34013ee9fafd
parent 325 f5966ab369fb
child 329 a93d6492e93a
fixed loading of kde.js under KDE (bnc#718311)
MozillaFirefox/MozillaFirefox.changes file | annotate | diff | comparison | revisions
MozillaFirefox/MozillaFirefox.spec file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox/MozillaFirefox.changes	Thu Sep 15 09:04:44 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Fri Sep 16 08:58:30 2011 +0200
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 16 06:57:38 UTC 2011 - wr@rosenauer.org
+
+- fixed loading of kde.js under KDE (bnc#718311)
+
 -------------------------------------------------------------------
 Wed Sep 14 07:02:04 UTC 2011 - wr@rosenauer.org
 
--- a/MozillaFirefox/MozillaFirefox.spec	Thu Sep 15 09:04:44 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Fri Sep 16 08:58:30 2011 +0200
@@ -212,8 +212,6 @@
 %patch32 -p1
 %if %suse_version >= 1110
 %patch33 -p1
-# install kde.js
-install -m 644 %{SOURCE6} browser/app/profile/kde.js
 %endif
 %if %suse_version >= 1140
 %patch34 -p1
@@ -310,6 +308,10 @@
 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 kde.js
+%if %suse_version >= 1110
+install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/pref/kde.js
+%endif
 # install add-plugins.sh
 sed "s:%%PROGDIR:%{progdir}:g" \
   %{SOURCE13} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh
mozilla