1
0
OBS User unknown 2007-01-19 00:14:21 +00:00 committed by Git OBS Bridge
parent b6b0be662e
commit 33022e1ba4
2 changed files with 17 additions and 8 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 18 09:27:54 CST 2007 - maw@suse.de
- Gnome is now in /usr, so remove references to /opt/gnome
- Install firefox.png with the executable bit not set.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 10 12:57:39 CET 2007 - meissner@suse.de Wed Jan 10 12:57:39 CET 2007 - meissner@suse.de

View File

@ -345,9 +345,9 @@ install -m 644 %{SOURCE1} \
%endif %endif
%endif %endif
# SCHEMA File # SCHEMA File
mkdir -p $RPM_BUILD_ROOT/etc/opt/gnome/gconf/schemas mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas
install -m 644 %{SOURCE18} \ install -m 644 %{SOURCE18} \
$RPM_BUILD_ROOT/etc/opt/gnome/gconf/schemas/ $RPM_BUILD_ROOT/%{_sysconfdir}/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 +387,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/opt/gnome/share/icons/hicolor/48x48/apps/ mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/icons/hicolor/48x48/apps/
install %{SOURCE11} $RPM_BUILD_ROOT/opt/gnome/share/icons/hicolor/48x48/apps/firefox.png install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT/%{_prefix}/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 +427,8 @@ if [ "$1" = "2" ]; then
fi fi
%endif %endif
if [ ! -f /.buildenv ]; then if [ ! -f /.buildenv ]; then
export GCONF_CONFIG_SOURCE=`/opt/gnome/bin/gconftool-2 --get-default-source` export GCONF_CONFIG_SOURCE=`%{_prefix}/bin/gconftool-2 --get-default-source`
/opt/gnome/bin/gconftool-2 --makefile-install-rule /etc/opt/gnome/gconf/schemas/firefox.schemas > /dev/null 2>&1 %{_prefix}/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 +518,10 @@ exit 0
%else %else
/usr/share/applications/%{name}.desktop /usr/share/applications/%{name}.desktop
%endif %endif
/etc/opt/gnome/gconf/schemas/firefox.schemas %{_sysconfdir}/gconf/schemas/firefox.schemas
/usr/share/pixmaps/firefox* /usr/share/pixmaps/firefox*
%if %milestone %if %milestone
/opt/gnome/share/icons/hicolor/ %{_prefix}/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 +532,9 @@ exit 0
%endif %endif
%changelog -n MozillaFirefox %changelog -n MozillaFirefox
* 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.
* Wed Jan 10 2007 - meissner@suse.de * Wed Jan 10 2007 - meissner@suse.de
- readd MozillaFirebird provides (was incorrect in removing it). - readd MozillaFirebird provides (was incorrect in removing it).
* Mon Jan 08 2007 - meissner@suse.de * Mon Jan 08 2007 - meissner@suse.de