diff --git a/tools-pkg-tribe-partitionmanager/PKGBUILD b/tools-pkg-tribe-partitionmanager/PKGBUILD deleted file mode 100644 index 267b6867c..000000000 --- a/tools-pkg-tribe-partitionmanager/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# -# package info -# -pkgname=tribe-partitionmanager -pkgver=0.2.95 -pkgrel=1 -pkgdesc="Tribe's partitionmanager" -url="http://git.chakra-project.org/chakra/" -license="GPL" -arch=('i686' 'x86_64') -depends=('kdebase-workspace' 'parted>=2.3' 'e2fsprogs' 'libatasmart') -replaces=('kdemod-tribe-partitionmanager') -makedepends=('cmake' 'automoc4' 'pkgconfig') -conflicts=('kdemod-tribe-partitionmanager' 'chakra-libpartitionmanager') -groups=('kde-uninstall') -options=('!splithdr' '!splitdbg') -source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}.tar.gz") -md5sums=('90fd55ca84002515a47449e723937995') - -# -# build function -# -build() -{ - cd "${srcdir}/chakra-tribe/lib/" - - cmake . -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' || return 1 - - msg "Starting make..." - make || return 1 - - msg "Make successful, installing..." - make DESTDIR=$startdir/pkg install || return 1 - - # 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 6ec2cd055..46d5cc329 100644 --- a/tools-pkg-tribe/PKGBUILD +++ b/tools-pkg-tribe/PKGBUILD @@ -8,13 +8,13 @@ # package info # pkgname=tribe -pkgver=0.2.95 -pkgrel=3 +pkgver=0.2.95.1 +pkgrel=1 pkgdesc="Tribe - Chakra LiveCD Installer" url="http://git.chakra-project.org/chakra/" license="GPL" arch=('i686' 'x86_64') -depends=('kdelibs' 'kdeedu-marble>=4.5.4' 'squashfs-tools' "tribe-partitionmanager=${pkgver}" 'imagemagick' 'partitionmanager') +depends=('kdelibs' 'kdeedu-marble>=4.5.4' 'squashfs-tools' 'partitionmanager') makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.5.4' 'kdebase-workspace') provides=('tribe') replaces=('kdemod-tribe-svn' 'kdemod-tribe') @@ -22,7 +22,7 @@ conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' ' options=('!splithdr' '!splitdbg') source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}.tar.gz" 'http://chakra-project.org/sources/tribe/mirrorlist') -md5sums=('90fd55ca84002515a47449e723937995' +md5sums=('17a5667be4eb29fecaa871757ef088cb' 'dfb3c82b5b1fbc2fccba8725c74dab7a') groups=('kde-uninstall') @@ -37,7 +37,7 @@ build() # fixes #cd "${srcdir}/chakra-$pkgname" - #patch -Np1 -i ${srcdir}/fix.patch || return 1 + #patch -Np1 -i ${srcdir}/fix-partition-page.patch || return 1 #patch -Np1 -i ${srcdir}/drake#2.patch || return 1 cd "${srcdir}/chakra-$pkgname"