rpm/MozillaFirefox
SHA256
1
0
Fork 0
forked from pool/MozillaFirefox
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
OBS User unknown 2007-01-25 23:57:56 +00:00 committed by Git OBS Bridge
parent 33022e1ba4
commit 8ed4ee9898
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MozillaFirefox.changes
View File

@ -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 Thu Jan 18 09:27:54 CST 2007 - maw@suse.de

28
MozillaFirefox.spec
View File

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