From b3ca9ad732bc06eff89b0148bce722c8d96a19d9 Mon Sep 17 00:00:00 2001 From: philm Date: Wed, 5 Jan 2011 15:20:36 +0000 Subject: [PATCH] remove usb/nfs for real --- tools-pkg-cinstall/PKGBUILD | 2 +- tools-pkg-tribe/PKGBUILD | 32 +++++++++++++++++++++----------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD index 4fe69de86..5d3b089d4 100644 --- a/tools-pkg-cinstall/PKGBUILD +++ b/tools-pkg-cinstall/PKGBUILD @@ -28,7 +28,7 @@ build() { mkdir -p $srcdir/build cd $srcdir/build - cmake ../cinstall-${pkgver} \ + cmake ../cinstall-${pkgname} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make || return 1 diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD index 5588fbdc2..ff90303b9 100644 --- a/tools-pkg-tribe/PKGBUILD +++ b/tools-pkg-tribe/PKGBUILD @@ -8,8 +8,8 @@ # package info # pkgname=tribe -pkgver=0.3.1pre1 -pkgrel=2 +pkgver=0.3.1pre2 +pkgrel=1 pkgdesc="Tribe - Chakra LiveCD Installer" url="http://git.chakra-project.org/chakra/" license="GPL" @@ -20,35 +20,45 @@ provides=('tribe') replaces=('kdemod-tribe-svn' 'kdemod-tribe') conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager') options=('!splithdr' '!splitdbg') -source=("http://chakra-project.org/sources/tribe/tribe-$pkgver.tar.gz" +source=("http://chakra-project.org/sources/tribe/tribe-$pkgver.tar.xz" 'tribe_4.5.patch') -md5sums=('5bac49c0677bfc3b7a2e83b1def5734a' +md5sums=('7473da35f6606428fcf4c93005e09271' '168a949a78621df376e3a4b2c26ecac5') groups=('kde-uninstall') install=tools-tribe.install +# create tarball: source PKGBUILD && mksource + +mksource() { + git clone git://gitorious.org/chakra/tribe.git + pushd ${pkgname} + popd + tar -cvJf ${pkgname}-${pkgver}.tar.xz ${pkgname}/* + md5sum ${pkgname}-${pkgver}.tar.xz +} + # # build function # build() { - cd "${srcdir}/chakra-$pkgname" + cd "${srcdir}/$pkgname" # 4.5 backports patch -Np0 -i ${srcdir}/tribe_4.5.patch || return 1 # remove unsupported pkgs for x64 if [ "${CARCH}" = "x86_64" ]; then - rm -v ${srcdir}/chakra-$pkgname/data/appIcons/wine.png - rm -v ${srcdir}/chakra-$pkgname/data/appIcons/skype.png - sed -i -e '/wine/d' ${srcdir}/chakra-$pkgname/data/configPagePkgData - sed -i -e '/skype/d' ${srcdir}/chakra-$pkgname/data/configPagePkgData + rm -v ${srcdir}/$pkgname/data/appIcons/wine.png + rm -v ${srcdir}/$pkgname/data/appIcons/skype.png + sed -i -e '/wine/d' ${srcdir}/$pkgname/data/configPagePkgData + sed -i -e '/skype/d' ${srcdir}/$pkgname/data/configPagePkgData fi # add pkgver to tribe sed -i -e "s~source build/from git~Build: ${pkgver}-${pkgrel} (Chakra)~g" config-tribe.h.cmake - sed -i -e "s~git-checkout~${pkgver}~g" "${srcdir}/chakra-$pkgname/scripts/postinstall-functions/job-initialize-target" + sed -i -e "s~git-checkout~${pkgver}~g" "${srcdir}/$pkgname/scripts/postinstall-functions/job-initialize-target" cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ @@ -60,7 +70,7 @@ build() package() { - cd "${srcdir}/chakra-$pkgname" + cd "${srcdir}/$pkgname" msg "Make successful, installing..." make DESTDIR=$startdir/pkg install || return 1