Bump to 1.0.16

4 files changed, 10 insertions, 92 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e6d815081db4..911f29c57041 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,30 @@
 # Generated by mksrcinfo v8
-# Thu Feb  7 11:43:45 UTC 2019
+# Thu Feb 28 08:09:44 UTC 2019
 pkgbase = ovirt-guest-agent
 	pkgdesc = The oVirt Guest Agent
-	pkgver = 1.0.15
-	pkgrel = 2
+	pkgver = 1.0.16
+	pkgrel = 1
 	url = https://ovirt.org/develop/developer-guide/vdsm/guest-agent
 	install = ovirt-guest-agent.install
 	arch = x86_64
 	license = ASL 2.0
-	makedepends = pam
-	makedepends = libtool
-	makedepends = python2
 	makedepends = python2-pycodestyle
-	makedepends = patch
 	makedepends = autoconf
 	depends = qemu-guest-agent
-	depends = python2
 	depends = python2-dbus
 	depends = python2-gobject2
 	depends = dbus-glib
 	depends = python2-ethtool
 	depends = usermode
 	backup = etc/ovirt-guest-agent.conf
-	source = https://github.com/oVirt/ovirt-guest-agent/archive/1.0.15.tar.gz
-	source = python2-arch.patch
-	source = ovirt-guest-agent-1.0.13_arch_pycodestyle.patch
+	source = https://github.com/oVirt/ovirt-guest-agent/archive/1.0.16.tar.gz
 	source = 39-ovirt-memory-hotplug.rules
 	source = console.apps_diskmapper
 	source = pam.d_diskmapper
 	source = ovirt-guest-agent.tmpfiles
 	source = ovirt-guest-agent.sysusers
 	source = ovirt-guest-agent.service
-	sha256sums = 8c6aecd168f538c7840eba4c6747f079e3422fab3f1ebc21f7c17986a53f74d8
-	sha256sums = 95c162b584dd137296bcec70d14079d4b93d10d8542a87bd8f1cd6ad01e4b140
-	sha256sums = ebe724b39b78a3bc21a998884b188e0efdaa2fc3ea3416fb4e4e273629394e24
+	sha256sums = 299ff836c7dd3515d16e41c0af0d26c5791dedbe3279a7046ac43822a9ffaa36
 	sha256sums = 78994d3cfe8f293aab84692c9d181b2c20caeb47e9854bb9377f2199b45984fb
 	sha256sums = 3575b027e6364d5b0d664cff9f9bc6c27a6a57691f7f188c3cf281663ccc3c0d
 	sha256sums = f9afb37eb23e77cf59d34f8783d3cacc509ed9400936c3dc95d6db629b3b58a1
diff --git a/PKGBUILD b/PKGBUILD
index eb7161d4bf14..de25bfe1d6b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,28 +3,24 @@
 
 pkgbase='ovirt-guest-agent'
 pkgname=("${pkgbase}")
-pkgver="1.0.15"
-pkgrel='2'
+pkgver="1.0.16"
+pkgrel='1'
 pkgdesc='The oVirt Guest Agent'
 arch=('x86_64')
 url="https://ovirt.org/develop/developer-guide/vdsm/guest-agent"
-makedepends=('pam' 'libtool' 'python2' 'python2-pycodestyle' 'patch' 'autoconf')
-depends=('qemu-guest-agent' 'python2' 'python2-dbus' 'python2-gobject2' 'dbus-glib' 'python2-ethtool' 'usermode')
+makedepends=('python2-pycodestyle' 'autoconf')
+depends=('qemu-guest-agent' 'python2-dbus' 'python2-gobject2' 'dbus-glib' 'python2-ethtool' 'usermode')
 pkgdesc='The oVirt Guest Agent'
 license=('ASL 2.0')
 install="${pkgbase}.install"
 source=("https://github.com/oVirt/${pkgbase}/archive/${pkgver}.tar.gz"
-	"python2-arch.patch"
-	"${pkgbase}-1.0.13_arch_pycodestyle.patch"
 	"39-ovirt-memory-hotplug.rules"
 	"console.apps_diskmapper"
 	"pam.d_diskmapper"
 	"${pkgbase}.tmpfiles"
 	"${pkgbase}.sysusers"
 	"${pkgbase}.service")
-sha256sums=('8c6aecd168f538c7840eba4c6747f079e3422fab3f1ebc21f7c17986a53f74d8'
-            '95c162b584dd137296bcec70d14079d4b93d10d8542a87bd8f1cd6ad01e4b140'
-            'ebe724b39b78a3bc21a998884b188e0efdaa2fc3ea3416fb4e4e273629394e24'
+sha256sums=('299ff836c7dd3515d16e41c0af0d26c5791dedbe3279a7046ac43822a9ffaa36'
             '78994d3cfe8f293aab84692c9d181b2c20caeb47e9854bb9377f2199b45984fb'
             '3575b027e6364d5b0d664cff9f9bc6c27a6a57691f7f188c3cf281663ccc3c0d'
             'f9afb37eb23e77cf59d34f8783d3cacc509ed9400936c3dc95d6db629b3b58a1'
@@ -35,9 +31,6 @@ backup=("etc/${pkgbase}.conf")
 
 prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  
-  patch -p1 -i "${srcdir}/${pkgbase}-1.0.13_arch_pycodestyle.patch"
-  patch -p1 -i "${srcdir}/python2-arch.patch"
 
   autoreconf -fvi
   PYTHON=/usr/bin/python2 ./configure \
diff --git a/ovirt-guest-agent-1.0.13_arch_pycodestyle.patch b/ovirt-guest-agent-1.0.13_arch_pycodestyle.patch
deleted file mode 100644
index c3b9cef1cbd9..000000000000
--- a/ovirt-guest-agent-1.0.13_arch_pycodestyle.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naupr ovirt-guest-agent-1.0.13_orig/configure.ac ovirt-guest-agent-1.0.13/configure.ac
---- ovirt-guest-agent-1.0.13_orig/configure.ac	2016-12-06 18:05:53.000000000 +0700
-+++ ovirt-guest-agent-1.0.13/configure.ac	2017-04-18 21:50:34.574548863 +0700
-@@ -101,7 +101,7 @@ dnl ------------------------------------
- HAVE_PEP8="yes"
- AC_PATH_PROG([PEP8], [pep8])
- if test "x$PEP8" = "x"; then
--  AC_PATH_PROG([PEP8], [pycodestyle])
-+  AC_PATH_PROG([PEP8], [pycodestyle2])
-   if test "x$PEP8" = "x"; then
-       AC_MSG_WARN([Neither python-pep8 nor python-pycodestyle could be found])
-       HAVE_PEP8="no"
diff --git a/python2-arch.patch b/python2-arch.patch
deleted file mode 100644
index f13f9f3bd3aa..000000000000
--- a/python2-arch.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naupr ovirt-guest-agent-1.0.11/ovirt-guest-agent/LockActiveSession.py ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/LockActiveSession.py
---- ovirt-guest-agent-1.0.11/ovirt-guest-agent/LockActiveSession.py	2014-11-21 15:37:32.000000000 +0600
-+++ ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/LockActiveSession.py	2015-08-08 09:54:24.331528178 +0600
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
-diff -Naupr ovirt-guest-agent-1.0.11/ovirt-guest-agent/LogoutActiveUser.py ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/LogoutActiveUser.py
---- ovirt-guest-agent-1.0.11/ovirt-guest-agent/LogoutActiveUser.py	2015-06-05 15:11:43.000000000 +0600
-+++ ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/LogoutActiveUser.py	2015-08-08 09:54:32.041549387 +0600
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
- # -*- coding: utf-8 -*-
- # vim:fenc=utf-8
- #
-diff -Naupr ovirt-guest-agent-1.0.11/ovirt-guest-agent/ovirt-guest-agent.py ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/ovirt-guest-agent.py
---- ovirt-guest-agent-1.0.11/ovirt-guest-agent/ovirt-guest-agent.py	2014-08-27 15:38:02.000000000 +0700
-+++ ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/ovirt-guest-agent.py	2015-08-08 09:56:02.135130545 +0600
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
-diff -Naupr ovirt-guest-agent-1.0.11/ovirt-guest-agent/timezone.py ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/timezone.py
---- ovirt-guest-agent-1.0.11/ovirt-guest-agent/timezone.py	2015-04-22 14:03:00.000000000 +0600
-+++ ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/timezone.py	2015-08-08 09:56:52.395268799 +0600
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
- # -*- coding: utf-8 -*-
- # vim:fenc=utf-8
- # Copyright 2014 Vinzenz Feenstra, Red Hat, Inc. and/or its affiliates.
-diff -Naupr ovirt-guest-agent-1.0.11/scripts/diskmapper/diskmapper.libudev ovirt-guest-agent-1.0.11-orig/scripts/diskmapper/diskmapper.libudev
---- ovirt-guest-agent-1.0.11/scripts/diskmapper/diskmapper.libudev	2015-02-02 18:38:02.000000000 +0600
-+++ ovirt-guest-agent-1.0.11-orig/scripts/diskmapper/diskmapper.libudev	2015-08-08 09:55:44.225081279 +0600
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- #
- # Copyright 2014 Red Hat, Inc. and/or its affiliates.
- #
-diff -Naupr ovirt-guest-agent-1.0.11/scripts/ovirt-osinfo ovirt-guest-agent-1.0.11-orig/scripts/ovirt-osinfo
---- ovirt-guest-agent-1.0.11/scripts/ovirt-osinfo	2015-04-22 14:03:00.000000000 +0600
-+++ ovirt-guest-agent-1.0.11-orig/scripts/ovirt-osinfo	2015-08-08 09:56:31.775212078 +0600
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- 
- import platform
- info = platform.linux_distribution()