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.
transplant cleanup firefox31
authorWolfgang Rosenauer <wr@rosenauer.org>
Sat, 01 Nov 2014 14:03:32 +0100
branchfirefox31
changeset 795 ca27ee37d62e
parent 794 b6bd5c64dccd
child 796 c9d29e45a974
transplant cleanup
MozillaFirefox/MozillaFirefox.changes file | annotate | diff | comparison | revisions
MozillaFirefox/firefox-esr.changes file | annotate | diff | comparison | revisions
MozillaFirefox/firefox-esr.spec file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox/MozillaFirefox.changes	Sat Oct 25 10:49:33 2014 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Sat Nov 01 14:03:32 2014 +0100
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Sat Oct 25 08:45:43 UTC 2014 - wr@rosenauer.org
+
+- define /usr/share/myspell as additional dictionary location
+  and remove add-plugins.sh finally (bnc#900639)
+
+-------------------------------------------------------------------
 Sat Oct 11 16:39:46 UTC 2014 - wr@rosenauer.org
 
 - update to Firefox 31.2.0 (bnc#900941)
--- a/MozillaFirefox/firefox-esr.changes	Sat Oct 25 10:49:33 2014 +0200
+++ b/MozillaFirefox/firefox-esr.changes	Sat Nov 01 14:03:32 2014 +0100
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Sat Oct 25 08:45:43 UTC 2014 - wr@rosenauer.org
+
+- define /usr/share/myspell as additional dictionary location
+  and remove add-plugins.sh finally (bnc#900639)
+
+-------------------------------------------------------------------
 Sat Oct 11 16:39:46 UTC 2014 - wr@rosenauer.org
 
 - update to Firefox 31.2.0 (bnc#900941)
--- a/MozillaFirefox/firefox-esr.spec	Sat Oct 25 10:49:33 2014 +0200
+++ b/MozillaFirefox/firefox-esr.spec	Sat Nov 01 14:03:32 2014 +0100
@@ -104,7 +104,7 @@
 Source10:       compare-locales.tar.xz
 Source11:       firefox.1
 Source12:       mozilla-get-app-id
-Source13:       add-plugins.sh.in
+Source13:       spellcheck.js
 Source14:       create-tar.sh
 # Gecko/Toolkit
 Patch1:         toolkit-download-folder.patch
@@ -384,13 +384,11 @@
 mkdir -p $RPM_BUILD_ROOT%{progdir}/distribution/extensions
 mkdir -p $RPM_BUILD_ROOT%{progdir}/browser/searchplugins
 mkdir -p $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/
-# install kde.js
+# install gre prefs
+install -m 644 %{SOURCE13} %{buildroot}%{progdir}/defaults/pref/
+# install browser prefs
 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/kde.js
 install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/firefox.js
-# install add-plugins.sh
-sed "s:%%PROGDIR:%{progdir}:g" \
-  %{SOURCE13} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh
-chmod 755 $RPM_BUILD_ROOT%{progdir}/add-plugins.sh
 # install additional locales
 %if %localize
 rm -f %{_tmppath}/translations.*
@@ -545,7 +543,6 @@
   usr/bin/update-desktop-database > /dev/null || :
 fi
 %endif
-%{progdir}/add-plugins.sh > /dev/null 2>&1
 exit 0
 
 %postun
@@ -563,15 +560,6 @@
 %endif
 exit 0
 
-%posttrans
-[ -e %{progdir}/add-plugins.sh ] && \
-  %{progdir}/add-plugins.sh > /dev/null 2>&1
-exit 0
-
-%preun
-rm -f %{progdir}/dictionaries/*
-exit 0
-
 %files
 %defattr(-,root,root)
 %dir %{progdir}
@@ -596,7 +584,6 @@
 %attr(755,root,root) %{progdir}/%{progname}.sh
 %{progdir}/firefox
 %{progdir}/firefox-bin
-%{progdir}/add-plugins.sh
 %{progdir}/application.ini
 %{progdir}/dependentlibs.list
 %{progdir}/*.so
mozilla