Fixed a problem caused by renaming the package python-pep8 to python-pycodestyle.

3 files changed, 47 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e981c8a8c5cd..60c0b4703618 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
 # Generated by mksrcinfo v8
-# Fri Jun 24 16:47:15 UTC 2016
+# Sat Jul 23 15:42:09 UTC 2016
 pkgbase = ovirt-guest-agent
 	pkgdesc = The oVirt Guest Agent
 	pkgver = 1.0.12.1
-	pkgrel = 1
-	url = http://wiki.ovirt.org/develop/developer-guide/vdsm/guest-agent
+	pkgrel = 2
+	url = http://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-pep8
-	makedepends = pep8
+	makedepends = python2-pycodestyle
+	makedepends = patch
+	makedepends = autoconf
 	depends = systemd
 	depends = python2
 	depends = python2-dbus
@@ -21,14 +22,16 @@ pkgbase = ovirt-guest-agent
 	depends = python2-ethtool
 	depends = usermode
 	backup = etc/ovirt-guest-agent.conf
+	source = https://evilissimo.fedorapeople.org/releases/ovirt-guest-agent/1.0.12/ovirt-guest-agent-1.0.12.1.tar.bz2
 	source = python2-arch.patch
+	source = ovirt-guest-agent-1.0.12.1_python_pycodestyle.patch
 	source = sysusers.conf
 	source = ovirt-guest-agent.service
-	source = https://evilissimo.fedorapeople.org/releases/ovirt-guest-agent/1.0.12/ovirt-guest-agent-1.0.12.1.tar.bz2
+	sha256sums = 5d5eb817947604fecf1922109fb96b44cb1bbc616b6ca6feb468fb4a3604a433
 	sha256sums = 95c162b584dd137296bcec70d14079d4b93d10d8542a87bd8f1cd6ad01e4b140
+	sha256sums = 23ca1080d0ea1c4214afa60849087c91e8eaecf03afcb69ef9ee19220644163a
 	sha256sums = fab3d62ecd8f6546d5b193f4ca22919de20451678b4cce2c53aa0977fed4f483
 	sha256sums = 545235630d6da51b547c1e8c177ddbf9f57aa81017b8683274a449d46e765cc4
-	sha256sums = 5d5eb817947604fecf1922109fb96b44cb1bbc616b6ca6feb468fb4a3604a433
 
 pkgname = ovirt-guest-agent
 
diff --git a/PKGBUILD b/PKGBUILD
index 00cc6cdc929f..1d87012541c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,27 +5,32 @@ pkgname='ovirt-guest-agent'
 _mainver='1.0.12'
 _subrel='1'
 pkgver="${_mainver}.${_subrel}"
-pkgrel='1'
+pkgrel='2'
 pkgdesc='The oVirt Guest Agent'
 arch=('x86_64')
-url="http://wiki.ovirt.org/develop/developer-guide/vdsm/guest-agent"
+url="http://ovirt.org/develop/developer-guide/vdsm/guest-agent"
 depends=('systemd' 'python2' 'python2-dbus' 'python2-gobject2' 'dbus-glib' 'python2-ethtool' 'usermode')
-makedepends=('pam' 'libtool' 'python2' 'python2-pep8' 'pep8')
+makedepends=('pam' 'libtool' 'python2' 'python2-pycodestyle' 'patch' 'autoconf')
 license=('ASL 2.0')
 install="${pkgname}.install"
-source=("python2-arch.patch"
+source=("https://evilissimo.fedorapeople.org/releases/${pkgname}/${_mainver}/${pkgname}-${pkgver}.tar.bz2"
+	"python2-arch.patch"
+	"ovirt-guest-agent-1.0.12.1_python_pycodestyle.patch"
 	"sysusers.conf"
-	"${pkgname}.service"
-	"https://evilissimo.fedorapeople.org/releases/${pkgname}/${_mainver}/${pkgname}-${pkgver}.tar.bz2")
-sha256sums=('95c162b584dd137296bcec70d14079d4b93d10d8542a87bd8f1cd6ad01e4b140'
+	"${pkgname}.service")
+sha256sums=('5d5eb817947604fecf1922109fb96b44cb1bbc616b6ca6feb468fb4a3604a433'
+            '95c162b584dd137296bcec70d14079d4b93d10d8542a87bd8f1cd6ad01e4b140'
+            '23ca1080d0ea1c4214afa60849087c91e8eaecf03afcb69ef9ee19220644163a'
             'fab3d62ecd8f6546d5b193f4ca22919de20451678b4cce2c53aa0977fed4f483'
-            '545235630d6da51b547c1e8c177ddbf9f57aa81017b8683274a449d46e765cc4'
-            '5d5eb817947604fecf1922109fb96b44cb1bbc616b6ca6feb468fb4a3604a433')
+            '545235630d6da51b547c1e8c177ddbf9f57aa81017b8683274a449d46e765cc4')
 backup=("etc/${pkgname}.conf")
 
 prepare() {
-  pushd "${pkgname}-${pkgver}"
-  patch -p1 -i ../python2-arch.patch
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/python2-arch.patch"
+  patch -p1 -i "${srcdir}/ovirt-guest-agent-1.0.12.1_python_pycodestyle.patch"
+
+  autoreconf -i
 
   PYTHON=/usr/bin/python2 ./configure \
     --prefix=/usr \
@@ -43,21 +48,18 @@ prepare() {
     --without-gdm \
     --without-kdm \
     --enable-securedir=/usr/lib/security
-  popd
 }
 
 build() {
-  pushd "${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make
-  popd
 }
 
 package() {
-  pushd "${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   libtool --finish ${pkgdir}/usr/lib/security
-  popd
-  install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
-  install -Dm644 "sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+  install -Dm644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+  install -Dm644 "${srcdir}/sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
   install -dm775 -o 175 -g 175 "${pkgdir}/var/log/${pkgname}"
 }
diff --git a/ovirt-guest-agent-1.0.12.1_python_pycodestyle.patch b/ovirt-guest-agent-1.0.12.1_python_pycodestyle.patch
new file mode 100644
index 000000000000..5a23a6f43111
--- /dev/null
+++ b/ovirt-guest-agent-1.0.12.1_python_pycodestyle.patch
@@ -0,0 +1,17 @@
+diff -Naupr ovirt-guest-agent-1.0.12.1_orig/configure.ac ovirt-guest-agent-1.0.12.1/configure.ac
+--- ovirt-guest-agent-1.0.12.1_orig/configure.ac	2016-06-15 13:07:57.000000000 +0600
++++ ovirt-guest-agent-1.0.12.1/configure.ac	2016-07-23 21:39:58.512299556 +0600
+@@ -101,8 +101,11 @@ dnl ------------------------------------
+ HAVE_PEP8="yes"
+ AC_PATH_PROG([PEP8], [pep8])
+ if test "x$PEP8" = "x"; then
+-  AC_MSG_WARN([python-pep8 not found])
+-  HAVE_PEP8="no"
++  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"
++  fi
+ fi
+ AM_CONDITIONAL(HAVE_PEP8, [ test -n "$HAVE_PEP8" -a "x$HAVE_PEP8" != xno ])
+