Updated to 1.0.2. Added nautilus extension.

2 files changed, 54 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 13fae7e36a9f..53ff768cf299 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,14 @@
 pkgbase = subliminal-git
 	pkgdesc = Python library and CLI tool for searching and downloading subtitles.
-	pkgver = 1.0.1.692.e0788be
+	pkgver = 1.0.2.r733.769b16d
 	pkgrel = 1
-	epoch = 1
+	epoch = 2
 	url = https://github.com/Diaoul/subliminal
 	arch = any
 	license = MIT
-	makedepends = python2-setuptools
+	makedepends = git
 	makedepends = python-setuptools
-	conflicts = subliminal
-	source = subliminal::git+https://github.com/Diaoul/subliminal.git
-	md5sums = SKIP
-
-pkgname = python-subliminal-git
+	makedepends = gettext
 	depends = python-beautifulsoup4>=4.2.0
 	depends = python-guessit>=0.9.1
 	depends = python-requests>=2.0
@@ -24,19 +20,17 @@ pkgname = python-subliminal-git
 	depends = python-babelfish>=0.5.2
 	depends = python-chardet>=2.3.0
 	depends = python-stevedore>=1.0.0
-	provides = subliminal-git
-	replaces = subliminal-git
+	provides = subliminal
+	provides = python-subliminal-git
+	conflicts = subliminal
+	conflicts = python-subliminal-git
+	source = subliminal::git+https://github.com/Diaoul/subliminal.git#branch=develop
+	md5sums = SKIP
+
+pkgname = subliminal-git
 
-pkgname = python2-subliminal-git
-	depends = python2-beautifulsoup4>=4.2.0
-	depends = python2-guessit>=0.9.1
-	depends = python2-requests>=2.0
-	depends = python2-enzyme>=0.4.1
-	depends = python2-dogpile.cache>=0.5.4
-	depends = python2-click>=4.0
-	depends = python2-pysrt>=1.0.1
-	depends = python2-six>=1.9.0
-	depends = python2-babelfish>=0.5.2
-	depends = python2-chardet>=2.3.0
-	depends = python2-stevedore>=1.0.0
+pkgname = nautilus-subliminal-git
+	pkgdesc = An extension for Nautilus to download subtitles.
+	depends = subliminal-git
+	depends = python-nautilus
 
diff --git a/PKGBUILD b/PKGBUILD
index 792567f5dd3a..2f57335281a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,57 @@
 # Maintainer: Nikola Milinković <nikmil@gmail.com>
 # Contributor: Quentin Stievenart <quentin.stievenart@gmail.com>
 
+# Python version
+# Use 'python' for python3 or 'python2' for python2.
+_python=python
+
 _gitroot="https://github.com/Diaoul/subliminal"
 _gitname="subliminal"
-pkgbase=subliminal-git
-pkgname=('python-subliminal-git' 'python2-subliminal-git')
-pkgver=1.0.1.692.e0788be
+pkgname=('subliminal-git' 'nautilus-subliminal-git')
+pkgver=1.0.2.r733.769b16d
 pkgrel=1
-epoch=1
+epoch=2
 pkgdesc="Python library and CLI tool for searching and downloading subtitles."
 arch=(any)
 url="https://github.com/Diaoul/subliminal"
-license=(MIT)
-makedepends=('python2-setuptools' 'python-setuptools')
-conflicts=(subliminal)
-source=("${_gitname}::git+${_gitroot}.git")
+license=('MIT')
+makedepends=('git' "${_python}-setuptools" 'gettext')
+depends=(
+  "${_python}-beautifulsoup4>=4.2.0" "${_python}-guessit>=0.9.1"
+  "${_python}-requests>=2.0" "${_python}-enzyme>=0.4.1"
+  "${_python}-dogpile.cache>=0.5.4" "${_python}-click>=4.0"
+  "${_python}-pysrt>=1.0.1" "${_python}-six>=1.9.0"
+  "${_python}-babelfish>=0.5.2"
+  "${_python}-chardet>=2.3.0" "${_python}-stevedore>=1.0.0"
+)
+conflicts=('subliminal' 'python-subliminal-git')
+provides=('subliminal' 'python-subliminal-git')
+source=("${_gitname}::git+${_gitroot}.git#branch=develop")
 md5sums=('SKIP')
 
 pkgver() {
   cd ${_gitname}
-  echo 1.0.1.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-  #git describe --tags | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
+  printf "1.0.2.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-package_python-subliminal-git() {
-  depends=(
-    'python-beautifulsoup4>=4.2.0' 'python-guessit>=0.9.1'
-    'python-requests>=2.0' 'python-enzyme>=0.4.1'
-    'python-dogpile.cache>=0.5.4' 'python-click>=4.0'
-    'python-pysrt>=1.0.1' 'python-six>=1.9.0'
-    'python-babelfish>=0.5.2'
-    'python-chardet>=2.3.0' 'python-stevedore>=1.0.0'
-  )
-  provides=(subliminal-git)
-  replaces=(subliminal-git)
+package_subliminal-git() {
   cd ${srcdir}/${_gitname}
-  python3 setup.py install --root="${pkgdir}/" --optimize=1
-  mv "${pkgdir}"/usr/bin/subliminal "${pkgdir}"/usr/bin/subliminal3
-  ln -s "${pkgdir}"/usr/bin/subliminal3 "${pkgdir}"/usr/bin/subliminal
+  ${_python} setup.py install --root="${pkgdir}/" --optimize=1
+
+  install -v -m755 -d "${pkgdir}/usr/share/licenses/subliminal-git"
+  install -v -m644 ./LICENSE "${pkgdir}/usr/share/licenses/subliminal-git/"
 }
 
-package_python2-subliminal-git() {
-  depends=(
-    'python2-beautifulsoup4>=4.2.0' 'python2-guessit>=0.9.1'
-    'python2-requests>=2.0' 'python2-enzyme>=0.4.1'
-    'python2-dogpile.cache>=0.5.4' 'python2-click>=4.0'
-    'python2-pysrt>=1.0.1' 'python2-six>=1.9.0'
-    'python2-babelfish>=0.5.2'
-    'python2-chardet>=2.3.0' 'python2-stevedore>=1.0.0'
-  )
-  cd ${srcdir}/${_gitname}
-  python2 setup.py install --root="${pkgdir}/" --optimize=1
-  mv "${pkgdir}"/usr/bin/subliminal "${pkgdir}"/usr/bin/subliminal2
+package_nautilus-subliminal-git() {
+  pkgdesc="An extension for Nautilus to download subtitles."
+  depends=('subliminal-git' "${_python}-nautilus")
+
+  cd ${srcdir}/${_gitname}/examples
+  install -v -m755 -d "${pkgdir}/usr/share/nautilus-python/extensions/subliminal/ui"
+  install -v -m644 ./nautilus.py "${pkgdir}/usr/share/nautilus-python/extensions/subliminal-nautilus.py"
+  install -v -m644 ./ui/{choose,config}.glade "${pkgdir}/usr/share/nautilus-python/extensions/subliminal/ui/"
+  install -v -m755 -d "${pkgdir}/usr/share/locale/fr/LC_MESSAGES"
+  msgfmt ./i18n/fr.po -o "${pkgdir}/usr/share/locale/fr/LC_MESSAGES/subliminal.mo"
+  install -v -m755 -d "${pkgdir}/usr/share/licenses/nautilus-subliminal-git"
+  install -v -m644 ../LICENSE "${pkgdir}/usr/share/licenses/nautilus-subliminal-git/"
 }