summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Tiá2017-04-17 13:07:15 -0600
committerJavier Tiá2017-04-17 13:07:15 -0600
commit232d28529bb856d186105046bdef04c9a81316c5 (patch)
treedc0f26fcfbedc2373080fd5310ddf23287bf7cb0
parent80745bd78c15cd235b6b45efb749da5ec138b179 (diff)
downloadaur-232d28529bb856d186105046bdef04c9a81316c5.tar.gz
Bump up dir2ogg-0.12-2
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--os_rename__to__shutil_move.patch20
3 files changed, 28 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4492d9e14480..5d3fad47f4e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Sep 24 15:18:02 UTC 2016
+# Mon Apr 17 19:06:20 UTC 2017
pkgbase = dir2ogg
pkgdesc = dir2ogg converts mp3, m4a, wma, and wav files into ogg-vorbis format
pkgver = 0.12
- pkgrel = 1
+ pkgrel = 2
url = http://jak-linux.org/projects/dir2ogg
arch = any
license = GPL2
diff --git a/PKGBUILD b/PKGBUILD
index 5fafde34e9f2..824f44d095dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=dir2ogg
pkgver=0.12
-pkgrel=1
+pkgrel=2
pkgdesc="dir2ogg converts mp3, m4a, wma, and wav files into ogg-vorbis format"
arch=('any')
url="http://jak-linux.org/projects/dir2ogg"
@@ -11,6 +11,11 @@ depends=('python2' 'mutagen' 'vorbis-tools')
source=("${url}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
sha256sums=('2876db3926415f40d728122f5836532253a25db1bc4877505e77ebcbc0cb5fea')
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p1 < ../../os_rename__to__shutil_move.patch
+}
+
package() {
mkdir -p ${pkgdir}/usr/bin
mkdir -p ${pkgdir}/usr/share/man/man1
diff --git a/os_rename__to__shutil_move.patch b/os_rename__to__shutil_move.patch
new file mode 100644
index 000000000000..213f20e8d0bf
--- /dev/null
+++ b/os_rename__to__shutil_move.patch
@@ -0,0 +1,20 @@
+diff -Naur dir2ogg-0.12-old/dir2ogg dir2ogg-0.12/dir2ogg
+--- dir2ogg-0.12-old/dir2ogg 2017-04-15 14:45:21.189456773 -0600
++++ dir2ogg-0.12/dir2ogg 2017-04-15 14:46:21.439371813 -0600
+@@ -34,6 +34,7 @@
+ import locale
+ import sys
+ import os, os.path
++import shutil
+ import re
+ import warnings
+ from fnmatch import _cache, translate
+@@ -395,7 +396,7 @@
+ if self.decoder == 'mplayer':
+ # Move the file for mplayer (which uses tempwav), so it works
+ # for --preserve-wav.
+- os.rename(tempwav, self.songwav)
++ shutil.move(tempwav, self.songwav)
+ if retcode != 0:
+ return (False, None)
+ else: