From b36cf3a75f1454f1100cbef0bc88c655f362e3b2 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Thu, 6 Feb 2014 19:49:46 -0200
Subject: iceweasel-{adblock-plus,firebug,raismth,spell-ru}: remove replace and
 conflicts to avoid problems to icecat dependencies

---
 libre/iceweasel-adblock-plus/PKGBUILD | 4 +---
 libre/iceweasel-firebug/PKGBUILD      | 4 +---
 libre/iceweasel-raismth/PKGBUILD      | 4 +---
 libre/iceweasel-spell-ru/PKGBUILD     | 6 ++----
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD
index 5bd8c1b56..0a248955b 100644
--- a/libre/iceweasel-adblock-plus/PKGBUILD
+++ b/libre/iceweasel-adblock-plus/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=iceweasel-adblock-plus
 pkgver=2.4.1
 _addons_file=230225
-pkgrel=1
+pkgrel=1.1
 pkgdesc="plugin for iceweasel which block ads and banners"
 arch=('any')
 url="http://adblockplus.org/"
@@ -13,8 +13,6 @@ license=('GPL')
 depends=("iceweasel-libre")
 makedepends=('unzip')
 provides=(firefox-adblock-plus=$pkgver)
-conflicts=firefox-adblock-plus
-replaces=firefox-adblock-plus
 noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi")
 source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi)
 md5sums=('3fe51813290a0d7103b620e2813a8c0e')
diff --git a/libre/iceweasel-firebug/PKGBUILD b/libre/iceweasel-firebug/PKGBUILD
index ecbf92319..3920bd4f6 100644
--- a/libre/iceweasel-firebug/PKGBUILD
+++ b/libre/iceweasel-firebug/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=iceweasel-firebug
 pkgver=1.12.6
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Iceweasel plugin with tools for web development."
 arch=(any)
 url="http://getfirebug.com/"
@@ -11,8 +11,6 @@ license=('custom:BSD')
 groups=('iceweasel-addons')
 depends=('iceweasel-libre')
 provides=('firebug' firefox-firebug=$pkgver)
-conflicts=(firefox-firebug)
-replaces=(firefox-firebug)
 source=("${url}releases/firebug/${pkgver%.*}/firebug-$pkgver.xpi")
 md5sums=('e929032f03f3af210355905cd4ddf6d3')
 
diff --git a/libre/iceweasel-raismth/PKGBUILD b/libre/iceweasel-raismth/PKGBUILD
index d6137e289..ee3b9119e 100644
--- a/libre/iceweasel-raismth/PKGBUILD
+++ b/libre/iceweasel-raismth/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=iceweasel-raismth
 pkgver=4.0.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Iceweasel plugin for watching Rai.tv live channels, vod and replay contents w/o *light (Silverlight/Moonlight)"
 arch=('any')
 url="http://acab.servebeer.com/"
@@ -13,8 +13,6 @@ depends=('iceweasel-libre')
 optdepends=('mplayer: default video player'
             'faad: default audio player')
 provides=('raismth' firefox-raismth=$pkgver)
-conflicts=firefox-raismth
-replaces=firefox-raismth
 source=("${url}raismth-$pkgver.xpi")
 md5sums=('f772ef1a74b0aba3a739849fee3238ea')
 
diff --git a/libre/iceweasel-spell-ru/PKGBUILD b/libre/iceweasel-spell-ru/PKGBUILD
index 2a5a84518..b9bb8b6f9 100644
--- a/libre/iceweasel-spell-ru/PKGBUILD
+++ b/libre/iceweasel-spell-ru/PKGBUILD
@@ -4,22 +4,20 @@
 
 pkgname=iceweasel-spell-ru
 pkgver=0.4.4
-pkgrel=13
+pkgrel=13.1
 pkgdesc="Russian spellchecker dictionary for Iceweasel"
 arch=(any)
 url="https://addons.mozilla.org/firefox/dictionaries/"
 license=("GPL")
 depends=("iceweasel-libre")
 provides=(firefox-spell-ru=$pkgver)
-conflicts=firefox-spell-ru
-replaces=firefox-spell-ru
 noextract=(russian_spellchecking_dictionary_with_io_support-$pkgver-fx+tb+sm.xpi)
 source=(https://addons.mozilla.org/firefox/downloads/file/98798/russian_spellchecking_dictionary-$pkgver-fx+tb+sm.xpi)
 md5sums=('269a8bdd38a5641b5f6cfb12715f1029')
 
 package() {
 #  _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-`
-#  depends=("iceweasel>=${_ffver}" "iceweasel<=${_ffver/0/99}")
+#  depends=("iceweasel-libre>=${_ffver}" "iceweasel-libre<=${_ffver/0/99}")
 
   cd $srcdir
   rm $srcdir/*.xpi
-- 
cgit v1.2.3