OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox-branding-openSUSE?expand=0&rev=8

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
 

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
+Version:        3.5
-Release:        4
+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

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);

firefox.schemas

@@ -7,8 +7,8 @@
         <type>bool</type>
         <default>false</default>
         <locale name="C">
-        <short>To disable the History.</short>
+        <short>Disable the browser history</short>
-        <long>To disable the histroy.</long>
+        <long>Prevent the browser from keeping a history of visited sites</long>
         </locale>
       </schema>
      <schema>
@@ -18,9 +18,8 @@
         <type>bool</type>
         <default>false</default>
         <locale name="C">
-        <short>Disable toolbar editing.</short>
+        <short>Disable toolbar editing</short>
-        <long>Disable ToolBar Editing.
+        <long>Prevent the user from editing the toolbar</long>
-        </long>
         </locale>
       </schema>
        <schema>
@@ -31,8 +30,7 @@
         <default>false</default>
         <locale name="C">
         <short>Disable installing themes</short>
-        <long>Disable installing theme
+        <long>To prevent the user from installing themes</long>
-        </long>
         </locale>
       </schema>
       <schema>
@@ -43,20 +41,7 @@
         <default>false</default>
         <locale name="C">
         <short>Disable installing extensions</short>
-        <long>Disable installing extensions
+        <long>Prevent the user from installing extensions</long>
-        </long>
-        </locale>
-       </schema>
-      <schema>
-        <key>/schemas/apps/firefox/lockdown/disable_show_passwords</key>
-        <applyto>/apps/firefox/lockdown/disable_show_passwords</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-        <short>Disable showing passwords</short>
-        <long>Disable showing passwords in the password manager.
-        </long>
         </locale>
        </schema>
      <schema>
@@ -66,9 +51,8 @@
         <type>bool</type>
         <default>false</default>
         <locale name="C">
-        <short>Allow Popups.</short>
+        <short>Enable popup blocker</short>
-        <long>Allow Popups.
+        <long>Enable popup blocker without warning about blocked popups</long>
-        </long>
         </locale>
       </schema>
      <schema>
@@ -78,9 +62,8 @@
         <type>bool</type>
         <default>true</default>
         <locale name="C">
-        <short>Enable java.</short>
+        <short>Enable java</short>
-        <long>Enable java.
+        <long>Enable java</long>
-        </long>
         </locale>
       </schema>
      <schema>
@@ -90,9 +73,8 @@
         <type>bool</type>
         <default>true</default>
         <locale name="C">
-        <short>Enable javascript.</short>
+        <short>Enable javascript</short>
-        <long>Enable javascript.
+        <long>Enable javascript</long>
-        </long>
         </locale>
       </schema>
      <schema>
@@ -102,9 +84,8 @@
         <type>bool</type>
         <default>false</default>
         <locale name="C">
-        <short>Disable URL bar.</short>
+        <short>Disable location bar</short>
-        <long>Disable URL bar.
+        <long>Prevent the user from entering URLs in the location bar</long>
-        </long>
         </locale>
       </schema>
      <schema>
@@ -114,9 +95,8 @@
         <type>bool</type>
         <default>false</default>
         <locale name="C">
-        <short>Disable search bar.</short>
+        <short>Disable search bar</short>
-        <long>Disable search bar.
+        <long>Prevent the user from using the search bar</long>
-        </long>
         </locale>
       </schema>
      <schema>
@@ -126,9 +106,8 @@
         <type>bool</type>
         <default>false</default>
         <locale name="C">
-        <short>Disable Cookies.</short>
+        <short>Disable cookies</short>
-        <long>Disable Cookies.
+        <long>Prevent the browser from storing cookies</long>
-        </long>
         </locale>
       </schema>
      <schema>
@@ -138,9 +117,8 @@
         <type>bool</type>
         <default>false</default>
         <locale name="C">
-        <short>Disable Save Password.</short>
+        <short>Disable saved passwords</short>
-        <long>Disable Save Password.
+        <long>Prevent the browser from storing saved passwords</long>
-        </long>
         </locale>
       </schema>
      <schema>
@@ -150,9 +128,8 @@
         <type>int</type>
         <default>50000</default>
         <locale name="C">
-        <short>Cache Size.</short>
+        <short>Disk cache size in KB</short>
-        <long>Cache Size.
+        <long>Disk cache size in KB</long>
-        </long>
         </locale>
       </schema>
      <schema>
@@ -160,11 +137,10 @@
         <applyto>/apps/firefox/general/homepage_url</applyto>
         <owner>firefox</owner>
         <type>string</type>
-        <default>http://www.opensuse.org/</default>
+        <default>www.novell.com/linux</default>
         <locale name="C">
-        <short>Home Page URL.</short>
+        <short>Home Page URL</short>
-        <long>Home Page URL.
+        <long>Home Page URL</long>
-        </long>
         </locale>
       </schema>
       <schema>
@@ -174,9 +150,8 @@
         <type>string</type>
         <default>Desktop</default>
         <locale name="C">
-        <short>Default downloadfolder location.</short>
+        <short>Default download location</short>
-        <long> This is the default download folder location. 
+        <long>Default download location.  Possible values include: "Desktop", "My Downloads", and "Home"</long>
-        </long>
         </locale>
       </schema>
      <schema>
@@ -186,9 +161,8 @@
         <type>bool</type>
         <default>false</default>
         <locale name="C">
-        <short>Disable Unsafe Protocol.</short>
+        <short>Disable unsafe protocols</short>
-        <long>Disable Unsafe Protocol.
+        <long>Disable non-builtin protocols not explicitly enabled</long>
-        </long>
         </locale>
       </schema>
      <schema>
@@ -198,9 +172,8 @@
         <type>bool</type>
         <default>false</default>
         <locale name="C">
-        <short>disable_bookmark_editing.</short>
+        <short>Disable editing bookmarks</short>
-        <long>disable_bookmark_editing.
+        <long>Prevent the user from editing browser bookmarks</long>
-        </long>
         </locale>
       </schema>
      <schema>
@@ -210,9 +183,19 @@
         <type>bool</type>
         <default>false</default>
         <locale name="C">
-        <short>Hide Bookmarks</short>
+        <short>Disable bookmarks feature</short>
-        <long>Hide Bookmarks.
+        <long>Prevent the user from editing or viewing bookmarks</long>
-        </long>
+        </locale>
+      </schema>
+     <schema>
+        <key>/schemas/apps/firefox/lockdown/disable_show_passwords</key>
+        <applyto>/apps/firefox/lockdown/disable_show_passwords</applyto>
+        <owner>firefox</owner>
+        <type>bool</type>
+        <default>false</default>
+        <locale name="C">
+        <short>Disable display of stored web passwords</short>
+        <long>Disable plain text display of stored web passwords in Preferences dialog</long>
         </locale>
       </schema>
      <schema>
@@ -222,9 +205,8 @@
         <type>bool</type>
         <default>false</default>
         <locale name="C">
-        <short>Disable Javascript Chrome.</short>
+        <short>Prevent javascript windows from hiding chrome</short>
-        <long>Disable Javascript Chrome.
+        <long>Prevent windows opened by javascript from hiding window chrome (location bar, status bar, etc.)</long>
-        </long>
         </locale>
       </schema>
 	<schema>
@@ -234,9 +216,8 @@
         <type>int</type>
         <default>0</default>
         <locale name="C">
-        <short>Setting Cookies.</short>
+        <short>Cookie Lifetime Policy</short>
-        <long>Setting Cookies.
+        <long>Cookie Lifetime Policy: 0 = Accept cookies normally; 1 = Prompt for each cookie; 2 = Accept for current session only; 3 = Accept for N days</long>
-        </long>
         </locale>
       </schema>
         <schema>
@@ -246,12 +227,10 @@
         <type>int</type>
         <default>0</default>
         <locale name="C">
-        <short>Setting Loadimages.</short>
+        <short>Image loading policy</short>
-        <long>Setting Loadimages.
+        <long>Image loading policy: 0 = load all images; 1 = exclude third-party image loading; 2 = exclude all image loading</long>
-        </long>
         </locale>
       </schema>
-
      <schema>
         <key>/schemas/apps/firefox/lockdown/additional_safe_protocols</key>
         <applyto>/apps/firefox/lockdown/additional_safe_protocols</applyto>
@@ -259,12 +238,10 @@
         <type>string</type>
         <default></default>
         <locale name="C">
-        <short>Additional Safe Protocols.</short>
+        <short>Additional Safe Protocols</short>
-        <long>Additional Safe Protocols.
+        <long>Additional Safe Protocols</long>
-        </long>
         </locale>
       </schema>
-
      <schema>
         <key>/schemas/apps/firefox/general/trusted_URIs</key>
         <applyto>/apps/firefox/general/trusted_URIs</applyto>
@@ -295,5 +272,18 @@
         </long>
         </locale>
       </schema>
+      <schema>
+        <key>/schemas/apps/firefox/general/allowed_indirect_gnomevfs_loads</key>
+        <applyto>/apps/firefox/general/allowed_indirect_gnomevfs_loads</applyto>
+        <owner>firefox</owner>
+        <type>string</type>
+        <default>""</default>
+        <locale name="C">
+          <short>A list of protocols, handled by gnome-vfs, that are permitted</short>
+          <long>A comma-separated list of protocols, handled by
+          gnome-vfs and of the form [scheme "://"], whose loads are
+          allowed.</long>
+        </locale>
+      </schema>
     </schemalist>
 </gconfschemafile>