diff --git a/MozillaFirefox-branding-openSUSE.changes b/MozillaFirefox-branding-openSUSE.changes index 1fdd8a8..049b3ff 100644 --- a/MozillaFirefox-branding-openSUSE.changes +++ b/MozillaFirefox-branding-openSUSE.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon May 4 08:40:26 CEST 2009 - wr@rosenauer.org + +- bumped version to 3.5 to reflect FF version bump +- updated firefox.schemas +- removed spec support for distributions before 10.3 +- removed obsolete prefs + ------------------------------------------------------------------- Mon Dec 8 11:16:41 EST 2008 - hfiguiere@suse.de diff --git a/MozillaFirefox-branding-openSUSE.spec b/MozillaFirefox-branding-openSUSE.spec index f150fb9..5e8804d 100644 --- a/MozillaFirefox-branding-openSUSE.spec +++ b/MozillaFirefox-branding-openSUSE.spec @@ -1,7 +1,7 @@ # -# spec file for package MozillaFirefox-branding-openSUSE (Version 3.0.3) +# spec file for package MozillaFirefox-branding-openSUSE (Version 3.5) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ # norootforbuild -BuildRequires: MozillaFirefox MozillaFirefox-branding-upstream +BuildRequires: MozillaFirefox Name: MozillaFirefox-branding-openSUSE License: BSD 3-Clause -Version: 3.0.3 -Release: 4 +Version: 3.5 +Release: 1 Summary: openSUSE branding of MozillaFirefox Group: Productivity/Networking/Web/Browsers Source0: %{name}-COPYING @@ -31,20 +31,15 @@ Source2: bookmarks.html.suse Source3: firefox-suse-default-prefs.js Source4: firefox.schemas Provides: MozillaFirefox-branding = %{version} +PreReq: MozillaFirefox >= 3.5 Conflicts: otherproviders(MozillaFirefox-branding) -PreReq: MozillaFirefox >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' MozillaFirefox) Supplements: packageand(MozillaFirefox:branding-openSUSE) BuildRoot: %{_tmppath}/%{name}-%{version}-build %define default_home_page http://www.opensuse.org/ %define progdir %{_prefix}/%_lib/firefox %define libgssapi libgssapi_krb5.so.2 -%if %suse_version > 1020 %define gnome_confdir %{_sysconfdir} %gconf_schemas_prereq -%else -%define gnome_confdir %{_sysconfdir}/opt/gnome -%define gnome_dir /opt/gnome -%endif %description This package provides openSUSE Look and Feel for MozillaFirefox. @@ -75,11 +70,9 @@ rm suse-default-prefs install -d $RPM_BUILD_ROOT/%{progdir}/searchplugins (cd $RPM_BUILD_ROOT%{progdir}/searchplugins ; tar xjf %{SOURCE1}) # browserconfig.properties -sed "s;browser.startup.homepage=.*;browser.startup.homepage=%{default_home_page};g -s;browser.startup.homepage_reset=.*;browser.startup.homepage_reset=%{default_home_page};g" \ - %{progdir}/browserconfig.properties > suse-browserconfig.properties cat << EOF >> suse-browserconfig.properties -startup.homepage_override_url=%{default_home_page} +browser.startup.homepage=%{default_home_page} +browser.startup.homepage_reset=%{default_home_page} EOF install -m0644 suse-browserconfig.properties $RPM_BUILD_ROOT%{progdir}/browserconfig.properties rm suse-browserconfig.properties @@ -87,47 +80,32 @@ rm suse-browserconfig.properties mkdir -p $RPM_BUILD_ROOT%{gnome_confdir}/gconf/schemas install -m 644 %{SOURCE4} \ $RPM_BUILD_ROOT/%{gnome_confdir}/gconf/schemas/ -%if %suse_version > 1020 %find_gconf_schemas -%endif %clean rm -rf $RPM_BUILD_ROOT -%if %suse_version > 1020 %pre -f %{name}.schemas_pre %preun -f %{name}.schemas_preun %posttrans -f %{name}.schemas_posttrans -%endif -%if %suse_version <= 1020 - -%post -if [ ! -f /.buildenv ]; then - export GCONF_CONFIG_SOURCE=`%{gnome_dir}/bin/gconftool-2 --get-default-source` - %{gnome_dir}bin/gconftool-2 --makefile-install-rule %{gnome_confdir}/gconf/schemas/firefox.schemas > /dev/null 2>&1 -fi -%endif -%if %suse_version > 1020 %files -f %{name}.schemas_list %defattr(-,root,root) -%else - -%files -%defattr(-,root,root) -%{gnome_confdir}/gconf/schemas/firefox.schemas -%endif %doc COPYING %{progdir}/defaults/preferences/firefox-openSUSE.js %{progdir}/defaults/profile/bookmarks.html %{progdir}/browserconfig.properties %{progdir}/searchplugins/* - %changelog +* Mon May 04 2009 wr@rosenauer.org +- bumped version to 3.5 to reflect FF version bump +- updated firefox.schemas +- removed spec support for distributions before 10.3 +- removed obsolete prefs * Mon Dec 08 2008 hfiguiere@suse.de - Fix a type in firefox-suse-default-prefs.js -* Thu Nov 20 2008 maw@suse.de +* Fri Nov 21 2008 maw@suse.de - Review and approve changes. * Fri Nov 14 2008 wr@rosenauer.org - Make sure that the base package is installed before installing @@ -135,10 +113,10 @@ fi (bnc#444682) * Fri Nov 07 2008 maw@suse.de - Review and approve changes. -* Tue Nov 04 2008 wr@rosenauer.org +* Wed Nov 05 2008 wr@rosenauer.org - added the Firefox Gconf schema for system prefs and changed the homepage URL to http://www.opensuse.org/ (bnc#441646) -* Mon Oct 20 2008 maw@suse.de +* Tue Oct 21 2008 maw@suse.de - Review and approve changes. * Tue Oct 07 2008 wr@rosenauer.org - bumped version to 3.0.3 diff --git a/firefox-suse-default-prefs.js b/firefox-suse-default-prefs.js index 8db2263..ef8589d 100644 --- a/firefox-suse-default-prefs.js +++ b/firefox-suse-default-prefs.js @@ -1,6 +1,5 @@ pref("browser.display.use_system_colors", true); pref("general.smoothScroll", true); -pref("browser.startup.homepage_override.mstone", "ignore"); pref("font.default", "sans-serif"); pref("font.default.x-western", "sans-serif"); pref("font.name.monospace.x-western", "monospace"); @@ -10,7 +9,6 @@ pref("print.print_edge_top", 14); // 1/100 of an inch pref("print.print_edge_left", 16); // 1/100 of an inch pref("print.print_edge_right", 16); // 1/100 of an inch pref("print.print_edge_bottom", 14); // 1/100 of an inch -pref("startup.homepage_override_url", "resource:/browserconfig.properties"); pref("browser.backspace_action", 2); pref("browser.tabs.loadFolderAndReplace", false); pref("browser.identity.ssl_domain_display", 1); diff --git a/firefox.schemas b/firefox.schemas index 1ed5329..5dc78b5 100644 --- a/firefox.schemas +++ b/firefox.schemas @@ -7,8 +7,8 @@ bool false - To disable the History. - To disable the histroy. + Disable the browser history + Prevent the browser from keeping a history of visited sites @@ -18,9 +18,8 @@ bool false - Disable toolbar editing. - Disable ToolBar Editing. - + Disable toolbar editing + Prevent the user from editing the toolbar @@ -31,8 +30,7 @@ false Disable installing themes - Disable installing theme - + To prevent the user from installing themes @@ -43,20 +41,7 @@ false Disable installing extensions - Disable installing extensions - - - - - /schemas/apps/firefox/lockdown/disable_show_passwords - /apps/firefox/lockdown/disable_show_passwords - firefox - bool - false - - Disable showing passwords - Disable showing passwords in the password manager. - + Prevent the user from installing extensions @@ -66,9 +51,8 @@ bool false - Allow Popups. - Allow Popups. - + Enable popup blocker + Enable popup blocker without warning about blocked popups @@ -78,9 +62,8 @@ bool true - Enable java. - Enable java. - + Enable java + Enable java @@ -90,9 +73,8 @@ bool true - Enable javascript. - Enable javascript. - + Enable javascript + Enable javascript @@ -102,9 +84,8 @@ bool false - Disable URL bar. - Disable URL bar. - + Disable location bar + Prevent the user from entering URLs in the location bar @@ -114,9 +95,8 @@ bool false - Disable search bar. - Disable search bar. - + Disable search bar + Prevent the user from using the search bar @@ -126,9 +106,8 @@ bool false - Disable Cookies. - Disable Cookies. - + Disable cookies + Prevent the browser from storing cookies @@ -138,9 +117,8 @@ bool false - Disable Save Password. - Disable Save Password. - + Disable saved passwords + Prevent the browser from storing saved passwords @@ -150,9 +128,8 @@ int 50000 - Cache Size. - Cache Size. - + Disk cache size in KB + Disk cache size in KB @@ -160,11 +137,10 @@ /apps/firefox/general/homepage_url firefox string - http://www.opensuse.org/ + www.novell.com/linux - Home Page URL. - Home Page URL. - + Home Page URL + Home Page URL @@ -174,9 +150,8 @@ string Desktop - Default downloadfolder location. - This is the default download folder location. - + Default download location + Default download location. Possible values include: "Desktop", "My Downloads", and "Home" @@ -186,9 +161,8 @@ bool false - Disable Unsafe Protocol. - Disable Unsafe Protocol. - + Disable unsafe protocols + Disable non-builtin protocols not explicitly enabled @@ -198,9 +172,8 @@ bool false - disable_bookmark_editing. - disable_bookmark_editing. - + Disable editing bookmarks + Prevent the user from editing browser bookmarks @@ -210,9 +183,19 @@ bool false - Hide Bookmarks - Hide Bookmarks. - + Disable bookmarks feature + Prevent the user from editing or viewing bookmarks + + + + /schemas/apps/firefox/lockdown/disable_show_passwords + /apps/firefox/lockdown/disable_show_passwords + firefox + bool + false + + Disable display of stored web passwords + Disable plain text display of stored web passwords in Preferences dialog @@ -222,9 +205,8 @@ bool false - Disable Javascript Chrome. - Disable Javascript Chrome. - + Prevent javascript windows from hiding chrome + Prevent windows opened by javascript from hiding window chrome (location bar, status bar, etc.) @@ -234,9 +216,8 @@ int 0 - Setting Cookies. - Setting Cookies. - + Cookie Lifetime Policy + Cookie Lifetime Policy: 0 = Accept cookies normally; 1 = Prompt for each cookie; 2 = Accept for current session only; 3 = Accept for N days @@ -246,12 +227,10 @@ int 0 - Setting Loadimages. - Setting Loadimages. - + Image loading policy + Image loading policy: 0 = load all images; 1 = exclude third-party image loading; 2 = exclude all image loading - /schemas/apps/firefox/lockdown/additional_safe_protocols /apps/firefox/lockdown/additional_safe_protocols @@ -259,12 +238,10 @@ string - Additional Safe Protocols. - Additional Safe Protocols. - + Additional Safe Protocols + Additional Safe Protocols - /schemas/apps/firefox/general/trusted_URIs /apps/firefox/general/trusted_URIs @@ -295,5 +272,18 @@ + + /schemas/apps/firefox/general/allowed_indirect_gnomevfs_loads + /apps/firefox/general/allowed_indirect_gnomevfs_loads + firefox + string + "" + + A list of protocols, handled by gnome-vfs, that are permitted + A comma-separated list of protocols, handled by + gnome-vfs and of the form [scheme "://"], whose loads are + allowed. + +