commit MozillaFirefox-branding-SLED for openSUSE:Factory
Hello community, here is the log from the commit of package MozillaFirefox-branding-SLED for openSUSE:Factory checked in at Wed May 5 23:11:46 CEST 2010. -------- --- MozillaFirefox-branding-SLED/MozillaFirefox-branding-SLED.changes 2009-08-27 15:35:25.000000000 +0200 +++ MozillaFirefox-branding-SLED/MozillaFirefox-branding-SLED.changes 2010-05-05 08:58:51.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 22 19:42:54 UTC 2010 - bgmerrell@novell.com + +- Set the default home page according to bnc#461752 +- Fix issue where the wrong distribution info was being shown in + Firefox (bnc#569580). This can be seen in "About Mozilla + Firefox" in the Help menu. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.tWjRl0/_old 2010-05-05 23:10:22.000000000 +0200 +++ /var/tmp/diff_new_pack.tWjRl0/_new 2010-05-05 23:10:22.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package MozillaFirefox-branding-SLED (Version 3.5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -20,9 +20,9 @@ BuildRequires: MozillaFirefox Name: MozillaFirefox-branding-SLED -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Version: 3.5 -Release: 2 +Release: 3 Summary: SLED branding of MozillaFirefox Group: Productivity/Networking/Web/Browsers Source1: search-addons.tar.bz2 @@ -36,14 +36,17 @@ Conflicts: otherproviders(MozillaFirefox-branding) Supplements: packageand(MozillaFirefox:branding-SLED) BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define default_home_page http://www.novell.com/linux/ +# set the default home page according to bnc#461752 +%if %suse_version == 1010 +%define sle_version 10 +%define default_home_page http://www.novell.com/linux/%{sle_version}.html +%endif +%if %suse_version == 1110 +%define sle_version 11 +%define default_home_page http://www.novell.com/linux/%{sle_version} +%endif %define progdir %{_prefix}/%_lib/firefox %define libgssapi libgssapi_krb5.so.2 -%if 0%{?sle_version:1} -%define suseversion %sle_version -%else -%define suseversion non-SLE -%endif %if %suse_version > 1020 %define gnome_confdir %{_sysconfdir} %gconf_schemas_prereq @@ -56,7 +59,6 @@ %description This package provides SLE Look and Feel for MozillaFirefox. - %prep cp -a %{SOURCE6} COPYING @@ -75,7 +77,7 @@ rm suse-default-prefs # distribution.ini install -d $RPM_BUILD_ROOT%{progdir}/distribution -sed -e 's,%VERSION%,%{suseversion},g' \ +sed -e 's,%VERSION%,%{sle_version},g' \ %{SOURCE5} > distribution.ini install -m 0644 distribution.ini $RPM_BUILD_ROOT%{progdir}/distribution/ # search plugins ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de