From 503517c61c64bb18dc64574b5b02fb973a110891 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 1 Jan 2015 20:57:13 -0500 Subject: makepkg no longer supports split packages with different pkgver --- test/librestage-test.sh | 14 -------------- test/librestage.d/PKGBUILD-split | 42 ---------------------------------------- 2 files changed, 56 deletions(-) delete mode 100644 test/librestage.d/PKGBUILD-split diff --git a/test/librestage-test.sh b/test/librestage-test.sh index edcfc36..affad6a 100644 --- a/test/librestage-test.sh +++ b/test/librestage-test.sh @@ -48,20 +48,6 @@ it_fails_with_invalid_args() { not empty "$tmpdir/stderr" } -# This was an actual bug I hit with md/emacs-mdmua a long time ago; solution was -# to use $(get_full_version) -it_stages_split_packages_with_different_versions() { - cp librestage.d/PKGBUILD-split "$tmpdir/PKGBUILD" - cd "$tmpdir" - - makepkg - librestage '~lukeshu' - - # peak at the PKGBUILD to get this info - [[ -f $tmpdir/workdir/staging/~lukeshu/md-0.81-4-any.pkg.tar.gz ]] - [[ -f $tmpdir/workdir/staging/~lukeshu/emacs-mdmua-0.72-4-any.pkg.tar.gz ]] -} - it_guesses_the_repo() { mkdir -p -- "$tmpdir/reponame/libretools-hello" cp librestage.d/PKGBUILD-hello "$tmpdir/reponame/libretools-hello/PKGBUILD" diff --git a/test/librestage.d/PKGBUILD-split b/test/librestage.d/PKGBUILD-split deleted file mode 100644 index a8ec1ef..0000000 --- a/test/librestage.d/PKGBUILD-split +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: Luke Shumaker - -pkgname=("md" "emacs-mdmua") -pkgver=0.81 -pkgrel=4 -arch=('any') -url="https://github.com/nicferrier/$_pkgname" -license=('GPL3') - -#makedepends=(python-distribute) - -#__gitbranch=1d69744 # This is the commit that is 0.81 -__gitbranch=455b6b4 # this is currently HEAD (has bugfixes) -#source=("nicferrier-md-${__gitbranch}.tar.gz::https://github.com/nicferrier/$pkgname/tarball/${__gitbranch}") - -#build() { -# cd "${srcdir}/nicferrier-md-${__gitbranch}" -# -# # fix typo -# sed -i 's/pyprofyfs/pyproxyfs/' setup.py -#} - -package_md() { - pkgdesc="A maildir client and library." - depends=('python' 'python-pyproxyfs') - -# cd "${srcdir}/nicferrier-md-${__gitbranch}" -# python setup.py install --root="$pkgdir/" --optimize=1 -} - -package_emacs-mdmua() { - pkgdesc="An Emacs mail user agent (MUA) build around md." - pkgver='0.72' - depends=("md=0.81" 'emacs>=24') - -# cd "${srcdir}/nicferrier-md-${__gitbranch}" -# cd useragents/emacs -# install -d ${pkgdir}/usr/share/emacs/site-lisp -# install -m 644 *.el ${pkgdir}/usr/share/emacs/site-lisp -} - -#md5sums=('452727348df2f51d7eddade709aceb1c') -- cgit v1.2.2