From aafe63ed78c36b8ccfbdec3796167de27979b7f76994a532e8e257a3a59d6301 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 21 Nov 2008 15:06:17 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=46 --- MozillaFirefox.changes | 11 ++++++ MozillaFirefox.spec | 30 ++++++++++------ firefox-ui-lockdown.patch | 72 +++++++++++++++++++++++++++------------ 3 files changed, 81 insertions(+), 32 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index e97c369..5fdfbe7 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Nov 21 03:11:41 EST 2008 - hfiguiere@suse.de + +- Update firefox-lockdown-ui.patch + * Print Setup is now properly locked down. bnc#431028 + * Bookmark editing it now properly locked down. bnc#439335 + * Bookmars are properly hidden. + * History is properly locked down. bnc#439343 + * Make sure the search bar is not put back when resetting the + toolbar. bnc#439358 + ------------------------------------------------------------------- Thu Nov 20 18:49:19 CST 2008 - maw@suse.de diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 78595cd..aaf4810 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -27,7 +27,7 @@ License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL Provides: web_browser Provides: firefox Version: 3.0.4 -Release: 2 +Release: 3 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -140,7 +140,7 @@ cd $RPM_BUILD_DIR/mozilla %patch2 %patch14 %patch17 -%patch20 -p2 +%patch20 -p0 %build export MOZ_BUILD_DATE=%{releasedate} @@ -339,6 +339,14 @@ fi %{progdir}/defaults/profile/bookmarks.html %changelog +* Fri Nov 21 2008 hfiguiere@suse.de +- Update firefox-lockdown-ui.patch + * Print Setup is now properly locked down. bnc#431028 + * Bookmark editing it now properly locked down. bnc#439335 + * Bookmars are properly hidden. + * History is properly locked down. bnc#439343 + * Make sure the search bar is not put back when resetting the + toolbar. bnc#439358 * Thu Nov 20 2008 maw@suse.de - Review and approve changes. * Thu Nov 13 2008 wr@rosenauer.org @@ -801,7 +809,7 @@ fi UI option (#132398) * Mon Apr 03 2006 stark@suse.de - fixed keyword fixup patch (#162532) -* Mon Mar 27 2006 stark@suse.de +* Tue Mar 28 2006 stark@suse.de - don't use keyword fixup for pasted text (#160034, bmo #331522) * Mon Mar 20 2006 stark@suse.de - added Tango theme @@ -817,7 +825,7 @@ fi - merged dbus reconnection patch (#150042) - default to autodetect proxy (network.proxy.type=4) (#151811) - added GTK category to desktop file -* Mon Feb 13 2006 stark@suse.de +* Tue Feb 14 2006 stark@suse.de - modified lockdown patches (#67281, #67282) - applied set of security patches (#148876) bmo bugs: 282105, 307989, 315625, 320459, 323634, 325403, 325947 @@ -1000,7 +1008,7 @@ fi (it's not needed and caused problems: bnc #75418) - fixed NLD lockdown patch (bnc #75418) - don't write prefs back to gconf for now -* Tue Jun 21 2005 stark@suse.de +* Wed Jun 22 2005 stark@suse.de - new NLD lockdown patch which is syncing user prefs to gconf - update to 1.0.5pre security-release * Wed Jun 08 2005 stark@suse.de @@ -1108,7 +1116,7 @@ fi - bumped version number to 1.0.1 * Tue Feb 15 2005 stark@suse.de - got updates from 1.0.1 branch -* Wed Feb 09 2005 stark@suse.de +* Thu Feb 10 2005 stark@suse.de - additional fireflashing fix (#50635, bmo #280664) - some more security related fixes (bmo #268483, #273498, #277322) @@ -1161,7 +1169,7 @@ fi - update to 1.0rc2 * Sat Oct 30 2004 stark@suse.de - added missing s390(x) patch -* Tue Oct 26 2004 stark@suse.de +* Wed Oct 27 2004 stark@suse.de - update to 1.0rc1 codebase - printing via XFT/fontconfig - freetype changes to avoid API conflicts with newer freetype2 @@ -1180,7 +1188,7 @@ fi - fixed chrome registration * Wed Oct 06 2004 joeshaw@suse.de - disable gconf settings as default (Ximian #67718) -* Tue Oct 05 2004 stark@suse.de +* Wed Oct 06 2004 stark@suse.de - fixed inclusion of RealPlayer plugin again * Tue Oct 05 2004 stark@suse.de - small important fix in firefox-download.patch (Ximian #65472) @@ -1198,7 +1206,7 @@ fi * Mon Sep 27 2004 joeshaw@suse.de - Update the industrial default patch, for some reason it didn't take before. -* Thu Sep 23 2004 stark@suse.de +* Fri Sep 24 2004 stark@suse.de - fix for Ximian #65176 (mozilla.org #240068) - revised patch for update function (Ximian #65615) * Thu Sep 23 2004 joeshaw@suse.de @@ -1299,12 +1307,12 @@ fi - enabled gnomevfs extension * Fri Mar 26 2004 uli@suse.de - fixed hang during build on s390* (bug #35440) -* Tue Mar 02 2004 stark@suse.de +* Wed Mar 03 2004 stark@suse.de - removed unused patches for GTK2 build - more fixes for (#35179) * Mon Mar 01 2004 stark@suse.de - improved start-script to interact with thunderbird (#35179) -* Wed Feb 25 2004 stark@suse.de +* Thu Feb 26 2004 stark@suse.de - use official releasedate - added official (trademarked) artwork - added firefox icon to /usr/share/pixmaps diff --git a/firefox-ui-lockdown.patch b/firefox-ui-lockdown.patch index ad13eee..fa5cad4 100644 --- a/firefox-ui-lockdown.patch +++ b/firefox-ui-lockdown.patch @@ -1,7 +1,7 @@ -diff --git a/mozilla/browser/base/content/browser-menubar.inc b/mozilla/browser/base/content/browser-menubar.inc -index 07795f1..c035302 100644 ---- a/mozilla/browser/base/content/browser-menubar.inc -+++ b/mozilla/browser/base/content/browser-menubar.inc +Index: browser/base/content/browser-menubar.inc +=================================================================== +--- browser/base/content/browser-menubar.inc.orig ++++ browser/base/content/browser-menubar.inc @@ -68,9 +68,9 @@