From 2181fb1741aa0a1ed4fa007154a2f7317cf179e6 Mon Sep 17 00:00:00 2001 From: Drake Date: Sat, 11 Dec 2010 04:01:45 +0000 Subject: [PATCH] move tribe-partitionmanager into partitionmanager itself, via patch - easier to follow upstream, less duplication; --- tools-pkg-tribe-partitionmanager/PKGBUILD | 55 ----------------------- tools-pkg-tribe/PKGBUILD | 4 +- 2 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 tools-pkg-tribe-partitionmanager/PKGBUILD diff --git a/tools-pkg-tribe-partitionmanager/PKGBUILD b/tools-pkg-tribe-partitionmanager/PKGBUILD deleted file mode 100644 index c5bcef599..000000000 --- a/tools-pkg-tribe-partitionmanager/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -# -# package info -# -pkgname=tribe-partitionmanager -pkgver=0.3.45.2 -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') -source=("http://chakra-project.org/sources/tribe/tribe-$pkgver.tar.gz") -md5sums=('8fb3bb1a6f769cfd400ba48833361d22') - -# -# build function -# -build() -{ - cd "${srcdir}/chakra-tribe/lib/" - - cmake . -DCMAKE_INSTALL_PREFIX=${_installprefix} \ - -DCMAKE_BUILD_TYPE=${_build_type} \ - -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 697ff5298..be4d4f48a 100644 --- a/tools-pkg-tribe/PKGBUILD +++ b/tools-pkg-tribe/PKGBUILD @@ -18,7 +18,7 @@ pkgdesc="Tribe - Chakra LiveCD Installer" url="http://git.chakra-project.org/chakra/" license="GPL" arch=('i686' 'x86_64') -depends=('kdelibs' 'kdeedu-marble>=4.5.80' 'squashfs-tools' "tribe-partitionmanager>=$pkgver") +depends=('kdelibs' 'kdeedu-marble>=4.5.80' 'squashfs-tools' "partitionmanager") makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.5.80' 'kdebase-workspace') provides=('tribe') replaces=('kdemod-tribe-svn' 'kdemod-tribe') @@ -65,4 +65,4 @@ build() # remove release notes rm -v $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html -} \ No newline at end of file +}