From 8ed4ee98981df8d5b4a80f3d175339983145ce1b933f6780cb732dbaebde477b Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 25 Jan 2007 23:57:56 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=4

---
 MozillaFirefox.changes |  6 ++++++
 MozillaFirefox.spec    | 28 +++++++++++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 8ac46b6..b327460 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 25 10:16:56 CST 2007 - maw@suse.de
+
+- Fixup the Gnome paths, keeping in closer sync with the
+ buildservice.
+
 -------------------------------------------------------------------
 Thu Jan 18 09:27:54 CST 2007 - maw@suse.de
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 569bd37..573d7b0 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -26,7 +26,7 @@ Obsoletes:      MozillaFirebird <= 1.0.7
 Obsoletes:      mozilla
 %endif
 Version:        2.0
-Release:        42
+Release:        43
 Summary:        Mozilla Firefox Web Browser
 URL:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
@@ -127,6 +127,13 @@ Requires:       mozilla-nss >= %( echo `rpm -q --queryformat '%{VERSION}' mozill
 %else
 %define progdir %{_prefix}/%_lib/firefox
 %endif
+%if %suse_version > 1020
+%define gnome_confdir %{_sysconfdir}
+%define gnome_dir     %{_prefix}
+%else
+%define gnome_confdir %{_sysconfdir}/opt/gnome
+%define gnome_dir     /opt/gnome
+%endif
 %define nld9 %(if grep -q sles9-sld /.buildenv; then echo 1; else echo 0; fi)
 %define my_provides /tmp/my-provides
 %define my_requires /tmp/my-requires
@@ -345,9 +352,9 @@ install -m 644 %{SOURCE1} \
 %endif
 %endif
 # SCHEMA File
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas
+mkdir -p $RPM_BUILD_ROOT/%{gnome_confdir}/gconf/schemas
 install -m 644 %{SOURCE18} \
-               $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas/
+               $RPM_BUILD_ROOT/%{gnome_confdir}/gconf/schemas/
 # Themes
 cp -a $RPM_BUILD_DIR/tango\@novell.com $RPM_BUILD_ROOT%{progdir}/extensions/
 %if %broken
@@ -387,8 +394,8 @@ EOF
 mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
 %if %milestone
 cp -f other-licenses/branding/firefox/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/firefox.png
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/icons/hicolor/48x48/apps/
-install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT/%{_prefix}/share/icons/hicolor/48x48/apps/firefox.png
+mkdir -p $RPM_BUILD_ROOT/%{gnome_dir}/share/icons/hicolor/48x48/apps/
+install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT/%{gnome_dir}/share/icons/hicolor/48x48/apps/firefox.png
 ln -sf firefox.png $RPM_BUILD_ROOT/usr/share/pixmaps/firefox-gnome.png
 %else
 cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/firefox.xpm
@@ -427,8 +434,8 @@ if [ "$1" = "2" ]; then
 fi
 %endif
 if [ ! -f /.buildenv ]; then
-  export GCONF_CONFIG_SOURCE=`%{_prefix}/bin/gconftool-2 --get-default-source`
-  %{_prefix}/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/firefox.schemas > /dev/null 2>&1
+  export GCONF_CONFIG_SOURCE=`%{gnome_dir}/bin/gconftool-2 --get-default-source`
+  %{gnome_dir}/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/firefox.schemas > /dev/null 2>&1
 %if %suse_version <= 1000
   # restart gconfd
   killall -HUP gconfd-2 2>&1 >/dev/null
@@ -518,10 +525,10 @@ exit 0
 %else
 /usr/share/applications/%{name}.desktop
 %endif
-%{_sysconfdir}/gconf/schemas/firefox.schemas
+%{gnome_confdir}/gconf/schemas/firefox.schemas
 /usr/share/pixmaps/firefox*
 %if %milestone
-%{_prefix}/share/icons/hicolor/
+%{gnome_dir}/share/icons/hicolor/
 %endif
 /usr/bin/%{progname}
 %doc %{_mandir}/man1/firefox.1.gz
@@ -532,6 +539,9 @@ exit 0
 %endif
 
 %changelog -n MozillaFirefox
+* Thu Jan 25 2007 - maw@suse.de
+- Fixup the Gnome paths, keeping in closer sync with the
+  buildservice.
 * Thu Jan 18 2007 - maw@suse.de
 - Gnome is now in /usr, so remove references to /opt/gnome
 - Install firefox.png with the executable bit not set.