diff options
| -rw-r--r-- | libraries/libvirt/README | 2 | ||||
| -rw-r--r-- | libraries/libvirt/doinst.sh | 1 | ||||
| -rw-r--r-- | libraries/libvirt/libvirt.SlackBuild | 27 | ||||
| -rw-r--r-- | libraries/libvirt/libvirt.info | 10 | ||||
| -rw-r--r-- | libraries/libvirt/slack-desc | 11 |
5 files changed, 35 insertions, 16 deletions
diff --git a/libraries/libvirt/README b/libraries/libvirt/README index 463a15dcff5ff..efc0370908f30 100644 --- a/libraries/libvirt/README +++ b/libraries/libvirt/README @@ -1,2 +1,4 @@ +libvirt - The virtualization API + libvirt is a toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). diff --git a/libraries/libvirt/doinst.sh b/libraries/libvirt/doinst.sh index a3a7f951dea47..a906638af4dd9 100644 --- a/libraries/libvirt/doinst.sh +++ b/libraries/libvirt/doinst.sh @@ -1,3 +1,4 @@ +#!/bin/sh config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild index c710cb842d40c..c19d363ab95f7 100644 --- a/libraries/libvirt/libvirt.SlackBuild +++ b/libraries/libvirt/libvirt.SlackBuild @@ -4,7 +4,7 @@ # Written by Michal Bialozor <bialyy@o2.pl> PRGNAM=libvirt -VERSION=0.6.2 +VERSION=0.7.6 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -16,26 +16,30 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP || exit 1 +cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 -cd $PRGNAM-$VERSION || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --bindir=/usr/sbin \ --sbindir=/usr/sbin \ --sysconfdir=/etc \ @@ -45,17 +49,15 @@ CFLAGS="$SLKCFLAGS" \ --enable-static=no \ --enable-shared=yes \ --without-xen \ - --build=$ARCH-slackware-linux \ - || exit 1 + --build=$ARCH-slackware-linux make \ HTML_DIR=/usr/doc/$PRGNAM-$VERSION \ - EXAMPLE_DIR=/usr/doc/$PRGNAM-$VERSION/examples \ - || exit 1 + EXAMPLE_DIR=/usr/doc/$PRGNAM-$VERSION/examples make \ HTML_DIR=/usr/doc/$PRGNAM-$VERSION \ EXAMPLE_DIR=/usr/doc/$PRGNAM-$VERSION/examples \ - install-strip DESTDIR=$PKG || exit 1 + install-strip DESTDIR=$PKG # Don't clobber existing config files on upgrade mv $PKG/etc/libvirt/libvirtd.conf $PKG/etc/libvirt/libvirtd.conf.new @@ -65,6 +67,11 @@ mv $PKG/etc/libvirt/qemu/networks/default.xml \ mv $PKG/etc/logrotate.d/libvirtd $PKG/etc/logrotate.d/libvirtd.new mv $PKG/etc/sasl2/libvirt.conf $PKG/etc/sasl2/libvirt.conf.new +( cd $PKG/usr/man + find . -type f -exec gzip -9 {} \; + for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +) + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ ABOUT-NLS AUTHORS ChangeLog COPYING* INSTALL README NEWS TODO \ @@ -77,4 +84,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info index d0ce2f0ee71ad..1eb1e9189b207 100644 --- a/libraries/libvirt/libvirt.info +++ b/libraries/libvirt/libvirt.info @@ -1,8 +1,10 @@ PRGNAM="libvirt" -VERSION="0.6.2" +VERSION="0.7.6" HOMEPAGE="http://libvirt.org" -DOWNLOAD="http://libvirt.org/sources/libvirt-0.6.2.tar.gz" -MD5SUM="3035b484861516a1cd425acef1e760e3" +DOWNLOAD="http://libvirt.org/sources/libvirt-0.7.6.tar.gz" +MD5SUM="eaf0cf593d82d2dec6dca96abe56744e" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Michal Bialozor" EMAIL="bialyy@o2.pl" -APPROVED="rworkman" +APPROVED="dsomero" diff --git a/libraries/libvirt/slack-desc b/libraries/libvirt/slack-desc index 33a5a23765de7..48ea1bf7e9e03 100644 --- a/libraries/libvirt/slack-desc +++ b/libraries/libvirt/slack-desc @@ -1,12 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + |-----handy-ruler------------------------------------------------------| libvirt: libvirt (The virtualization API) libvirt: libvirt: libvirt is a toolkit to interact with the virtualization libvirt: capabilities of recent versions of Linux (and other OSes). libvirt: +libvirt: Homepage: http://libvirt.org libvirt: -libvirt: libvirt: libvirt: -libvirt: It can be obtained from http://libvirt.org +libvirt: libvirt: |