diff -r b0976f9b62ff -r 78c0172dda6c MozillaFirefox-branding-openSUSE.spec --- a/MozillaFirefox-branding-openSUSE.spec Tue Jun 28 20:25:53 2011 +0200 +++ b/MozillaFirefox-branding-openSUSE.spec Thu Oct 20 22:26:06 2011 +0200 @@ -19,14 +19,14 @@ # norootforbuild BuildRequires: MozillaFirefox bc unzip zip - +BuildRequires: bc unzip zip Name: MozillaFirefox-branding-openSUSE License: BSD3c(or similar) ; GPLv2+ Version: 5.0 Release: 3 Summary: openSUSE branding of MozillaFirefox Group: Productivity/Networking/Web/Browsers -Source: susefox-20110521.tar.bz2 +Source: susefox-20111020.tar.bz2 Source1: search-addons.tar.bz2 Source2: bookmarks.html.suse Source3: firefox-suse-default-prefs.js @@ -39,10 +39,10 @@ Conflicts: otherproviders(MozillaFirefox-branding) Supplements: packageand(MozillaFirefox:branding-openSUSE) 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 suseversion %(echo -e "scale=1\\n%{suse_version}/100" | bc 2>/dev/null) +# HINT: default homepage is a property now included in susefox #%define gconf_confdir %{_sysconfdir}/gconf #%gconf_schemas_prereq @@ -83,13 +83,6 @@ #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} -browser.startup.homepage_reset=%{default_home_page} -EOF -install -m0644 suse-browserconfig.properties $RPM_BUILD_ROOT%{progdir}/browserconfig.properties -rm suse-browserconfig.properties # install the system extension mkdir susefox\@opensuse.org (cd susefox\@opensuse.org; unzip ../susefox.xpi) @@ -107,7 +100,6 @@ #%posttrans -f %{name}.schemas_posttrans #%files -f %{name}.schemas_list - %files %defattr(-,root,root) %doc COPYING.susefox @@ -117,7 +109,6 @@ %{progdir}/defaults/pref/firefox-openSUSE.js %dir %{progdir}/defaults/profile/ %{progdir}/defaults/profile/bookmarks.html -%{progdir}/browserconfig.properties %{progdir}/searchplugins/* %{progdir}/distribution %{_datadir}/mozilla