bump to 1.0.11

1 files changed, 24 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ee12e1a46e6a..7215fb6298d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,32 @@
-# Maintainer: Konstantin Shalygin (k0ste@opentech.ru)
+# Maintainer: Konstantin Shalygin (k0ste@cn.ru)
 
 pkgname='ovirt-guest-agent'
-pkgver='1.0.10'
-pkgrel='3'
+pkgver='1.0.11'
+pkgrel='1'
 pkgdesc='The oVirt Guest Agent'
 arch=('any')
 url='http://wiki.ovirt.org/Category:Ovirt_guest_agent'
 depends=('systemd' 'python2' 'python2-dbus' 'python2-gobject2' 'dbus-glib' 'python2-ethtool' 'usermode')
 makedepends=('pam' 'libtool' 'python2' 'python2-pep8' 'pep8')
 license=('ASL 2.0')
-install='ovirt-guest-agent.install'
-source=('ovirt-guest-agent.install'
-	'ovirt-guest-agent.service'
-	"https://evilissimo.fedorapeople.org/releases/${pkgname}/${pkgver}/${pkgname}-${pkgver}.${pkgrel}.tar.bz2")
-sha256sums=('10c5dc2fa265e6944d9316003fb04163ff005debddd3e86ad4ce3e4ec00ee893'
-	    '545235630d6da51b547c1e8c177ddbf9f57aa81017b8683274a449d46e765cc4'
-	    "d11e1a6a9a36a2e318cfc7f063f22a30b29594284f31e5a5903bbd3984c1070b")
-backup=('etc/ovirt-guest-agent.conf')
+install=("${pkgname}.install")
+source=("python2-arch.patch"
+	"sysusers.conf"
+	"${pkgname}.service"
+	"https://evilissimo.fedorapeople.org/releases/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+sha256sums=("95c162b584dd137296bcec70d14079d4b93d10d8542a87bd8f1cd6ad01e4b140"
+	    "fab3d62ecd8f6546d5b193f4ca22919de20451678b4cce2c53aa0977fed4f483"
+	    "545235630d6da51b547c1e8c177ddbf9f57aa81017b8683274a449d46e765cc4"
+	    "ccb3fec17caa92e62ff119b8700b5f86de0b9b625e1d3f3977b9480bc5d9a2d5")
+backup=("etc/${pkgname}.conf")
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i ../python2-arch.patch
+}
 
 build() {
-  cd "$pkgname-$pkgver.$pkgrel"
+  cd "${pkgname}-${pkgver}"
   PYTHON=/usr/bin/python2 ./configure \
     --prefix=/usr \
     --bindir=/usr/bin \
@@ -40,13 +47,10 @@ build() {
 }
 
 package() {
-  pushd "$pkgname-$pkgver.$pkgrel"
-  make DESTDIR="$pkgdir" install
+  pushd "${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   popd
-  install -dm775 -o 175 -g 175 "$pkgdir/var/log/ovirt-guest-agent"
-  rm "$pkgdir/usr/lib/systemd/system/ovirt-guest-agent.service"
-  install -Dm644 "ovirt-guest-agent.service" "$pkgdir/usr/lib/systemd/system/ovirt-guest-agent.service"
-  sed -i 's|bin/python|bin/python2|g' "$pkgdir/usr/share/ovirt-guest-agent/ovirt-guest-agent.py"
-  sed -i 's|env python|env python2|g' "$pkgdir/usr/share/ovirt-guest-agent/diskmapper"
-  sed -i 's|bin/python|bin/python2|g' "$pkgdir/usr/share/ovirt-guest-agent/LockActiveSession.py"
+  install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+  install -Dm644 "sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+  install -dm775 -o 175 -g 175 "${pkgdir}/var/log/${pkgname}"
 }