From 1d3fa30c01c713b5c0458bd8e1898dddd2cc0e875209ebd0c40f1dab0ba164dd Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Wed, 16 Dec 2009 12:30:10 +0000
Subject: [PATCH] checked in

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox-branding-openSUSE?expand=0&rev=62
---
 MozillaFirefox-branding-openSUSE.changes |  6 ------
 MozillaFirefox-branding-openSUSE.spec    | 19 ++++++++++---------
 firefox.schemas                          |  2 +-
 susefox-20091023.tar.bz2                 |  3 +++
 susefox-20091206.tar.bz2                 |  3 ---
 5 files changed, 14 insertions(+), 19 deletions(-)
 create mode 100644 susefox-20091023.tar.bz2
 delete mode 100644 susefox-20091206.tar.bz2

diff --git a/MozillaFirefox-branding-openSUSE.changes b/MozillaFirefox-branding-openSUSE.changes
index 79b520b..9c13b45 100644
--- a/MozillaFirefox-branding-openSUSE.changes
+++ b/MozillaFirefox-branding-openSUSE.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Sun Dec  6 13:51:22 CET 2009 - wr@rosenauer.org
-
-- update susefox to snapshot 20091206 (1.0.1)
-  * compatible with Firefox 3.6
-
 -------------------------------------------------------------------
 Wed Nov  4 19:53:19 UTC 2009 - wr@rosenauer.org
 
diff --git a/MozillaFirefox-branding-openSUSE.spec b/MozillaFirefox-branding-openSUSE.spec
index f279a15..0e3470d 100644
--- a/MozillaFirefox-branding-openSUSE.spec
+++ b/MozillaFirefox-branding-openSUSE.spec
@@ -19,13 +19,14 @@
 # norootforbuild
 
 BuildRequires:  MozillaFirefox bc unzip zip
+
 Name:           MozillaFirefox-branding-openSUSE
-License:        BSD 3-clause (or similar) ; GPLv2+
+License:        BSD 3-clause (or similar) ; GPL v2 or later
 Version:        3.5
-Release:        19
+Release:        9
 Summary:        openSUSE branding of MozillaFirefox
 Group:          Productivity/Networking/Web/Browsers
-Source:         susefox-20091206.tar.bz2
+Source:         susefox-20091023.tar.bz2
 Source1:        search-addons.tar.bz2
 Source2:        bookmarks.html.suse
 Source3:        firefox-suse-default-prefs.js
@@ -40,8 +41,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define default_home_page http://www.opensuse.org/
 %define progdir %{_prefix}/%_lib/firefox
 %define libgssapi libgssapi_krb5.so.2
+%define gnome_confdir %{_sysconfdir}
 %define suseversion %(echo -e "scale=1\\n%{suse_version}/100" | bc 2>/dev/null)
-%define gconf_confdir %{_sysconfdir}/gconf
 %gconf_schemas_prereq
 
 %description
@@ -75,11 +76,6 @@ install -m 0644 distribution.ini $RPM_BUILD_ROOT%{progdir}/distribution/
 # search plugins
 install -d $RPM_BUILD_ROOT%{progdir}/searchplugins
 (cd $RPM_BUILD_ROOT%{progdir}/searchplugins ; tar xjf %{SOURCE1})
-# SCHEMA file
-mkdir -p $RPM_BUILD_ROOT%{gconf_confdir}/schemas
-install -m 644 %{SOURCE4} \
-               $RPM_BUILD_ROOT%{gconf_confdir}/schemas/
-%find_gconf_schemas
 # browserconfig.properties
 cat << EOF >> suse-browserconfig.properties
 browser.startup.homepage=%{default_home_page}
@@ -87,6 +83,11 @@ browser.startup.homepage_reset=%{default_home_page}
 EOF
 install -m0644 suse-browserconfig.properties $RPM_BUILD_ROOT%{progdir}/browserconfig.properties
 rm suse-browserconfig.properties
+# SCHEMA File
+mkdir -p $RPM_BUILD_ROOT%{gnome_confdir}/gconf/schemas
+install -m 644 %{SOURCE4} \
+               $RPM_BUILD_ROOT%{gnome_confdir}/gconf/schemas/
+%find_gconf_schemas
 # install the system extension
 mkdir susefox\@opensuse.org
 (cd susefox\@opensuse.org; unzip ../susefox.xpi)
diff --git a/firefox.schemas b/firefox.schemas
index 1b3e6bc..5dc78b5 100644
--- a/firefox.schemas
+++ b/firefox.schemas
@@ -137,7 +137,7 @@
         <applyto>/apps/firefox/general/homepage_url</applyto>
         <owner>firefox</owner>
         <type>string</type>
-        <default>www.opensuse.org</default>
+        <default>www.novell.com/linux</default>
         <locale name="C">
         <short>Home Page URL</short>
         <long>Home Page URL</long>
diff --git a/susefox-20091023.tar.bz2 b/susefox-20091023.tar.bz2
new file mode 100644
index 0000000..df808b1
--- /dev/null
+++ b/susefox-20091023.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b287eb215e6ab9e327150b74073293bec85231971111dfde179f5c86b2b30a3b
+size 49426
diff --git a/susefox-20091206.tar.bz2 b/susefox-20091206.tar.bz2
deleted file mode 100644
index bad1c08..0000000
--- a/susefox-20091206.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:94c60475aa5e0a7c00498f00e082117f43a95a99b593c4324f191e14a776a9f0
-size 49594