--- a/MozillaFirefox-branding-openSUSE.changes Fri Nov 18 21:07:27 2011 +0100
+++ b/MozillaFirefox-branding-openSUSE.changes Wed Dec 21 14:19:06 2011 +0100
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec 21 13:09:49 UTC 2011 - wr@rosenauer.org
+
+- make openSUSE software search version specific (bnc#737709)
+
-------------------------------------------------------------------
Fri Nov 18 14:03:18 UTC 2011 - wr@rosenauer.org
--- a/MozillaFirefox-branding-openSUSE.spec Fri Nov 18 21:07:27 2011 +0100
+++ b/MozillaFirefox-branding-openSUSE.spec Wed Dec 21 14:19:06 2011 +0100
@@ -16,25 +16,23 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-BuildRequires: bc
-BuildRequires: unzip
-BuildRequires: zip
-
Name: MozillaFirefox-branding-openSUSE
Version: 5.0
-Release: 3
-License: BSD3c(or similar) ; GPLv2+
+Release: 0
Summary: openSUSE branding of MozillaFirefox
+License: BSD-3-Clause ; GPL-v2.0+
Group: Productivity/Networking/Web/Browsers
Source: susefox-20111108.tar.bz2
-Source1: search-addons.tar.bz2
+Source1: opensuse-software.xml.in
Source2: bookmarks.html.suse
Source3: firefox-suse-default-prefs.js
Source4: firefox.schemas
Source5: distribution.ini.in
Source6: %{name}-COPYING
Source7: all-openSUSE.js
+BuildRequires: bc
+BuildRequires: unzip
+BuildRequires: zip
PreReq: MozillaFirefox >= 4.99
Supplements: packageand(MozillaFirefox:branding-openSUSE)
Provides: MozillaFirefox-branding = %{version}
@@ -77,7 +75,8 @@
install -m 0644 distribution.ini $RPM_BUILD_ROOT%{progdir}/distribution/
# search plugins
install -d $RPM_BUILD_ROOT%{progdir}/searchplugins
-(cd $RPM_BUILD_ROOT%{progdir}/searchplugins ; tar xjf %{SOURCE1})
+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} \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/opensuse-software.xml.in Wed Dec 21 14:19:06 2011 +0100
@@ -0,0 +1,11 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>openSUSE Software</ShortName>
+<Description>Search for openSUSE packages</Description>
+<InputEncoding>utf-8</InputEncoding>
+<Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAABqElEQVQokX2SP0jDQBTGX/XEC3iBRFoxJxUa/BPSwUEtCHUKWQTFLjoouksmF9Fduju46qaLxcGlZOukdlBoqA4VLE2KBhpohCtYqEPUam296e6793vv3vcu1Gq1jvMbACBgKhGFEkUWE9B7oVvngr3XnbcHAIBqJlBlYV4WEmpEo0TpAEK72Yl/8gmYzkmpZHSLG+ADpX9hc7hrKEZkZmSJG+DvXq5y5VMyGA6q9XWNloam19U0a/ocIutqWsT03NqrsUpPYGXq4OR+x3JNr2GfWXvJ8W0AyJaOugOyMF/ybgBADWt6zOAQL2IKAPlqhr3X0V+gxuxZiQKA5ZqWa/68Krhmu4KAabDxGnZQJzjOjq7afvETeDXbtuoxQyLTl4+HXsPGiOgxI7Cl5N1kn46+k7YBjMhidDsZ3Sq4Zu755HOUv3tbU9Odg8OIxMNaYEupdu34Rdb0KVHUiOb4Rccv9py0gGk8onGIB4AaqxRcs9H0lyf3u7j03XqufPpTUcPanJTqCXQ8UpcNkRsDAKTHDIGjHrNZs+582YcRT4mCEZHFRMeH/QA7zpgoDUnQyAAAAABJRU5ErkJggg==</Image>
+<Url type="text/html" method="GET" template="http://software.opensuse.org/search">
+ <Param name="p" value="1"/>
+ <Param name="baseproject" value="openSUSE:%VERSION%"/>
+ <Param name="q" value="{searchTerms}"/>
+</Url>
+</SearchPlugin>
Binary file search-addons.tar.bz2 has changed