diff options
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 20 | ||||
-rw-r--r-- | os_rename__to__shutil_move.patch | 20 |
3 files changed, 14 insertions, 42 deletions
@@ -1,17 +1,15 @@ -# Generated by mksrcinfo v8 -# 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 = 2 + pkgdesc = Converts mp3, m4a, wma, and wav files into ogg-vorbis format + pkgver = 0.13 + pkgrel = 1 url = http://jak-linux.org/projects/dir2ogg arch = any license = GPL2 - depends = python2 - depends = mutagen + depends = python + depends = python-mutagen depends = vorbis-tools - source = http://jak-linux.org/projects/dir2ogg/0.12/dir2ogg-0.12.tar.gz - sha256sums = 2876db3926415f40d728122f5836532253a25db1bc4877505e77ebcbc0cb5fea + source = http://jak-linux.org/projects/dir2ogg/0.13/dir2ogg-0.13.tar.gz + sha256sums = 4181f3f968ab4d13dbf6369d483e0e937c611442d69cec787e8840cedc1d6ef8 pkgname = dir2ogg @@ -1,28 +1,22 @@ -# Contributor: Javier Tiá <javier.tia at gmail dot com> +# Maintainer: Javier Tiá <javier.tia at gmail dot com> pkgname=dir2ogg -pkgver=0.12 -pkgrel=2 -pkgdesc="dir2ogg converts mp3, m4a, wma, and wav files into ogg-vorbis format" +pkgver=0.13 +pkgrel=1 +pkgdesc="Converts mp3, m4a, wma, and wav files into ogg-vorbis format" arch=('any') url="http://jak-linux.org/projects/dir2ogg" license=('GPL2') -depends=('python2' 'mutagen' 'vorbis-tools') +depends=('python' 'python-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 -} +sha256sums=('4181f3f968ab4d13dbf6369d483e0e937c611442d69cec787e8840cedc1d6ef8') package() { mkdir -p ${pkgdir}/usr/bin mkdir -p ${pkgdir}/usr/share/man/man1 - sed -i 's|^#!/usr/bin/python$|#!/usr/bin/python2|' ${pkgname}-${pkgver}/dir2ogg cp ${pkgname}-${pkgver}/dir2ogg ${pkgdir}/usr/bin cp ${pkgname}-${pkgver}/dir2ogg.1 ${pkgdir}/usr/share/man/man1 } -# vim:set ft=sh ts=2 sw=2 et: +# vim:set ts=2 sw=2 et: diff --git a/os_rename__to__shutil_move.patch b/os_rename__to__shutil_move.patch deleted file mode 100644 index 213f20e8d0bf..000000000000 --- a/os_rename__to__shutil_move.patch +++ /dev/null @@ -1,20 +0,0 @@ -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: |