From 195036b7101db05002d85f478ba4151d0576e0c1 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 26 Oct 2012 18:13:17 +0200 Subject: [PATCH] creating basic cdist archlinux package works Signed-off-by: Nico Schottelius --- .gitignore | 4 ++++ PKGBUILD.in | 14 +++++++------- build | 13 +++++++++++-- setup.py | 2 +- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 5d39eae1..6e2d4437 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,7 @@ cdist/version.py # Packaging: Archlinux /PKGBUILD +/cdist-*.pkg.tar.xz +/cdist-*.tar.gz +/pkg +/src diff --git a/PKGBUILD.in b/PKGBUILD.in index 8e55946f..a4e744ae 100755 --- a/PKGBUILD.in +++ b/PKGBUILD.in @@ -1,8 +1,6 @@ #!/bin/sh version=$(git describe) -version=2.1.0pre1 - outfile=${0%.in} cat << eof > "${outfile}" @@ -13,14 +11,16 @@ pkgdesc='A Usable Configuration Management System"' arch=('any') url='http://www.nico.schottelius.org/software/cdist/' license=('GPL3') -depends=('python3>=3.2.0') +depends=('python>=3.2.0') source=("http://pypi.python.org/packages/source/c/cdist/cdist-\${pkgver}.tar.gz") package() { - python3 setup.py build install --root="${pkgdir}" + cd cdist-\${pkgver} + python3 setup.py build install --root="\${pkgdir}" + mv "\${pkgdir}"/usr/bin/cdist.py "\${pkgdir}"/usr/bin/cdist - #install -Dm644 offlineimap.1 "${pkgdir}"/usr/share/man/man1/offlineimap.1 - #install -Dm644 offlineimap.conf "${pkgdir}"/usr/share/offlineimap/offlineimap.conf - #install -Dm644 offlineimap.conf.minimal "${pkgdir}"/usr/share/offlineimap/offlineimap.conf.minimal + #install -Dm644 offlineimap.1 "\${pkgdir}"/usr/share/man/man1/offlineimap.1 } eof + +makepkg -g >> "${outfile}" diff --git a/build b/build index 18dcfdab..bb31ccc0 100755 --- a/build +++ b/build @@ -92,7 +92,12 @@ case "$1" in ./docs/dev/releasehelper ;; - pypi) + dist-archlinux) + ./PKGBUILD.in + makepkg + ;; + + dist-pypi) $0 man $0 version $0 sdist @@ -154,8 +159,12 @@ case "$1" in find * -name __pycache__ | xargs rm -rf ;; clean-dist) - rm -f cdist/version.py MANIFEST + rm -f cdist/version.py MANIFEST PKGBUILD rm -rf cache/ dist/ + + # Archlinux + rm -f cdist-*.pkg.tar.xz cdist-*.tar.gz + rm -rf pkg/ src/ ;; very-clean) diff --git a/setup.py b/setup.py index 2de4a3c0..900dac0f 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( packages = ["cdist", "cdist.core", "cdist.exec", "cdist.util" ], scripts = ["cdist.py"], version = cdist.version.VERSION, - description = "Usable configuration management system", + description = "A Usable Configuration Management System", author = "Nico Schottelius", author_email = "nico-cdist-pypi@schottelius.org", url = "http://www.nico.schottelius.org/software/cdist/",