summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Alff2018-08-11 09:27:31 -0400
committerTed Alff2018-08-11 09:27:31 -0400
commit751bf3c3b8fecb0449045e3f48febadd3becd04b (patch)
tree118d438952facce5e466e7ba5fc627b439b64d92
parente232c8533459b2bd0a4560a160bc49eb5d140d75 (diff)
downloadaur-751bf3c3b8fecb0449045e3f48febadd3becd04b.tar.gz
Version bump 0.4.1
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD17
-rw-r--r--missing_default_face.patch28
-rw-r--r--office-phone.patch35
4 files changed, 7 insertions, 85 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a5dc5dc7a3b..1b11a727c17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Wed Apr 25 00:29:46 UTC 2018
+# Sat Aug 11 13:27:08 UTC 2018
pkgbase = mugshot
pkgdesc = Program to update personal user details
- pkgver = 0.4.0
+ pkgver = 0.4.1
pkgrel = 1
url = https://launchpad.net/mugshot
arch = any
@@ -19,12 +19,8 @@ pkgbase = mugshot
optdepends = pidgin: update buddy icon
optdepends = libreoffice: update user details
options = !emptydirs
- source = https://launchpad.net/mugshot/0.4/0.4.0/+download/mugshot-0.4.0.tar.gz
- source = office-phone.patch
- source = missing_default_face.patch
- sha256sums = 8fe72caca621a8130002bdc298df8e2193bfce356d7db93c5cf83db3787c2045
- sha256sums = 0cf536fa2ff25327f100d3fd13009cf56aab72cfd56dceda87579974722a212d
- sha256sums = 787848e6ba8eae35d9d6f15918b16ce6227de632106480c36725e348e715326a
+ source = https://launchpad.net/mugshot/0.4/0.4.1/+download/mugshot-0.4.1.tar.gz
+ sha256sums = d2b52b0b1737bd65d6f6478c4f907b0f641899b5f3b130a155e95d170742f286
pkgname = mugshot
diff --git a/PKGBUILD b/PKGBUILD
index e69eab7fc5e..9511ae79694 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Somasis <somasis@cryptolab.net>
pkgname=mugshot
-pkgver=0.4.0
+pkgver=0.4.1
pkgrel=1
pkgdesc="Program to update personal user details"
arch=('any')
@@ -14,19 +14,8 @@ optdepends=('cheese: webcam support'
'pidgin: update buddy icon'
'libreoffice: update user details')
options=(!emptydirs)
-source=("https://launchpad.net/mugshot/${pkgver%.*}/$pkgver/+download/mugshot-${pkgver}.tar.gz"
- "office-phone.patch"
- "missing_default_face.patch")
-sha256sums=('8fe72caca621a8130002bdc298df8e2193bfce356d7db93c5cf83db3787c2045'
- '0cf536fa2ff25327f100d3fd13009cf56aab72cfd56dceda87579974722a212d'
- '787848e6ba8eae35d9d6f15918b16ce6227de632106480c36725e348e715326a')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- #patch -p1 -i "${srcdir}"/office-phone.patch
- cd "${srcdir}"
- #patch -Np1 -i "${srcdir}"/missing_default_face.patch
-}
+source=("https://launchpad.net/mugshot/${pkgver%.*}/$pkgver/+download/mugshot-${pkgver}.tar.gz")
+sha256sums=('d2b52b0b1737bd65d6f6478c4f907b0f641899b5f3b130a155e95d170742f286')
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/missing_default_face.patch b/missing_default_face.patch
deleted file mode 100644
index 4502e84f0c4..00000000000
--- a/missing_default_face.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur ./mugshot-0.3.2.old/mugshot/MugshotWindow.py ./mugshot-0.3.2/mugshot/MugshotWindow.py
---- ./mugshot-0.3.2.old/mugshot/MugshotWindow.py 2016-11-06 09:13:47.604768017 -0500
-+++ ./mugshot-0.3.2/mugshot/MugshotWindow.py 2016-11-06 09:14:11.431116827 -0500
-@@ -257,10 +257,11 @@
- logger.debug('Found profile image: %s' % str(image))
-
- if os.path.isfile(face):
-- if os.path.samefile(image, face):
-- self.updated_image = face
-- else:
-- self.updated_image = None
-+ if os.path.exists(image):
-+ if os.path.samefile(image, face):
-+ self.updated_image = face
-+ else:
-+ self.updated_image = None
- self.set_user_image(face)
- elif os.path.isfile(image):
- self.updated_image = image
-@@ -612,7 +613,7 @@
- success = False
-
- logger.debug('Updating Office Phone...')
--
-+
- command = "%s -w \"%s\" %s" % (chfn, office_phone, username)
- # Office phone is potentially handled by the -o flag in newer versions of chfn
- command2 = "%s -o \"%s\" %s" % (chfn, office_phone, username)
diff --git a/office-phone.patch b/office-phone.patch
deleted file mode 100644
index dbca2c59df2..00000000000
--- a/office-phone.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8f639e7a29b3bfebbbbd8f520c05637377560bb3 Mon Sep 17 00:00:00 2001
-From: Mike Keen <mkeen.atl@gmail.com>
-Date: Thu, 5 Nov 2015 11:47:30 -0500
-Subject: [PATCH] Support the -o flag if the -w flag fails
-
----
-mugshot/MugshotWindow.py | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/mugshot/MugshotWindow.py b/mugshot/MugshotWindow.py
-index 35323be..b557edf 100644
---- a/mugshot/MugshotWindow.py
-+++ b/mugshot/MugshotWindow.py
-@@ -632,11 +632,18 @@ class MugshotWindow(Window):
- success = False
-
- logger.debug('Updating Office Phone...')
-+
- command = "%s -w \"%s\" %s" % (chfn, office_phone, username)
-+ # Office phone is potentially handled by the -o flag in newer versions of chfn
-+ command2 = "%s -o \"%s\" %s" % (chfn, office_phone, username)
- if self.process_terminal_password(command, password):
- self.office_phone = office_phone
- else:
-- success = False
-+ # Retry with command2
-+ if self.process_terminal_password(command2, password):
-+ self.office_phone = office_phone
-+ else:
-+ success = False
-
- return (success, response)
-
---
-2.6.2