- bumped version to 6.0
- support firefox-esr RPM packages
- removed MozillaFirefox build dependency and PreReq
* everything controlled by Supplements and Requirements from
base package
--- a/MozillaFirefox-branding-openSUSE.changes Sun Mar 04 19:54:33 2012 +0100
+++ b/MozillaFirefox-branding-openSUSE.changes Fri Mar 16 13:20:31 2012 +0100
@@ -1,7 +1,11 @@
-------------------------------------------------------------------
-Sun Mar 4 18:53:02 UTC 2012 - wr@rosenauer.org
+Thu Mar 15 08:18:11 UTC 2012 - wr@rosenauer.org
+- bumped version to 6.0
- support firefox-esr RPM packages
+- removed MozillaFirefox build dependency and PreReq
+ * everything controlled by Supplements and Requirements from
+ base package
-------------------------------------------------------------------
Wed Dec 21 13:09:49 UTC 2011 - wr@rosenauer.org
--- a/MozillaFirefox-branding-openSUSE.spec Sun Mar 04 19:54:33 2012 +0100
+++ b/MozillaFirefox-branding-openSUSE.spec Fri Mar 16 13:20:31 2012 +0100
@@ -21,11 +21,12 @@
BuildRequires: bc
BuildRequires: unzip
BuildRequires: zip
-Version: 5.0
-Release: 3
-License: BSD3c(or similar) ; GPL-v2.0+
+Version: 6.0
+Release: 0
Summary: openSUSE branding of MozillaFirefox
+License: BSD-3-Clause ; GPL-2.0+
Group: Productivity/Networking/Web/Browsers
+Url: http://www.opensuse.org/
Source: susefox-20111108.tar.bz2
Source1: opensuse-software.xml.in
Source2: bookmarks.html.suse
@@ -34,7 +35,6 @@
Source5: distribution.ini.in
Source6: %{name}-COPYING
Source7: all-openSUSE.js
-PreReq: MozillaFirefox >= 4.99
Supplements: packageand(MozillaFirefox:branding-openSUSE)
Supplements: packageand(firefox-esr:branding-openSUSE)
Provides: MozillaFirefox-branding = %{version}
@@ -46,11 +46,9 @@
%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
%description
-This package provides openSUSE Look and Feel for MozillaFirefox.
+This package provides openSUSE Look and Feel for Firefox.
%prep
cp -a %{SOURCE6} COPYING
@@ -81,11 +79,6 @@
install -d $RPM_BUILD_ROOT%{progdir}/searchplugins
sed -e 's,%VERSION%,%{suseversion},g' \
%{SOURCE1} > $RPM_BUILD_ROOT%{progdir}/searchplugins/opensuse-software.xml
-# SCHEMA file
-#mkdir -p $RPM_BUILD_ROOT%{gconf_confdir}/schemas
-#install -m 644 %{SOURCE4} \
-# $RPM_BUILD_ROOT%{gconf_confdir}/schemas/
-#%%find_gconf_schemas
# install the system extension
mkdir susefox\@opensuse.org
(cd susefox\@opensuse.org; unzip ../susefox.xpi)
@@ -96,24 +89,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
-#%pre -f %{name}.schemas_pre
-
-#%preun -f %{name}.schemas_preun
-
-#%posttrans -f %{name}.schemas_posttrans
-
-#%files -f %{name}.schemas_list
-
%files
%defattr(-,root,root)
%doc COPYING.susefox
%doc ../COPYING
+%dir %{progdir}
+%dir %{progdir}/defaults/
%dir %{progdir}/defaults/pref
%{progdir}/defaults/pref/all-openSUSE.js
%{progdir}/defaults/pref/firefox-openSUSE.js
%dir %{progdir}/defaults/profile/
%{progdir}/defaults/profile/bookmarks.html
-%{progdir}/searchplugins/*
+%{progdir}/searchplugins/
%{progdir}/distribution
%{_datadir}/mozilla