From b5da882d8fbe20db4b5aa1ed3b631cb7fbfa2c49 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Mon, 6 Dec 2010 16:54:47 +0000
Subject: [PATCH] Tribe try from dec 5

---
 tools-pkg-tribe-partitionmanager/PKGBUILD | 9 ++++++++-
 tools-pkg-tribe/PKGBUILD                  | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools-pkg-tribe-partitionmanager/PKGBUILD b/tools-pkg-tribe-partitionmanager/PKGBUILD
index ff6e5207a..02cb06e6a 100644
--- a/tools-pkg-tribe-partitionmanager/PKGBUILD
+++ b/tools-pkg-tribe-partitionmanager/PKGBUILD
@@ -12,7 +12,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 #
 pkgname=tribe-partitionmanager
 pkgver=0.3.45
-pkgrel=1
+pkgrel=2
 pkgdesc="Tribe's partitionmanager"
 url="http://git.chakra-project.org/chakra/"
 license="GPL"
@@ -45,4 +45,11 @@ build()
 
 	# remove nasty files
 	find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +
+        # fix file conflicts
+	rm -v $startdir/pkg/usr/share/icons/hicolor/128x128/apps/partitionmanager.png
+	rm -v $startdir/pkg/usr/share/icons/hicolor/16x16/apps/partitionmanager.png
+	rm -v $startdir/pkg/usr/share/icons/hicolor/22x22/apps/partitionmanager.png
+	rm -v $startdir/pkg/usr/share/icons/hicolor/32x32/apps/partitionmanager.png
+	rm -v $startdir/pkg/usr/share/icons/hicolor/48x48/apps/partitionmanager.png
+	rm -v $startdir/pkg/usr/share/icons/hicolor/64x64/apps/partitionmanager.png
 }
\ No newline at end of file
diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD
index 47c18ce87..96051b7d3 100644
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@@ -13,7 +13,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 #
 pkgname=tribe
 pkgver=0.3.45
-pkgrel=1
+pkgrel=2
 pkgdesc="Tribe - Chakra LiveCD Installer"
 url="http://git.chakra-project.org/chakra/"
 license="GPL"