Package renamed to filebot-git.

2 files changed, 21 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ffb58895cdd3..d074d4383c19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = filebot
+pkgbase = filebot-git
 	pkgdesc = The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums.
 	pkgver = 4.8.4
-	pkgrel = 4
+	pkgrel = 1
 	url = https://github.com/filebot/filebot
 	install = filebot.install
 	arch = i686
@@ -20,6 +20,9 @@ pkgbase = filebot
 	optdepends = libmediainfo: Episode naming / Sublight usage
 	optdepends = java-p7zip-binding: Extract archives
 	optdepends = gvfs: gvfs backends
+	provides = filebot
+	conflicts = filebot47
+	conflicts = filebot
 	source = filebot::git+https://github.com/filebot/filebot.git
 	source = filebot-arch.sh
 	source = filebot.svg
@@ -29,5 +32,5 @@ pkgbase = filebot
 	md5sums = 04f46be047049448dba3f0de29fe192d
 	md5sums = f37edd0bba7570904d28ab1681c7a7f3
 
-pkgname = filebot
+pkgname = filebot-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 24b43f94b335..96b79f5d7387 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,18 +6,21 @@
 # Contributor: Kaurin <milos dot kaurin at gmail>
 # Contributor: Nathan Owe <ndowens04 at gmail>
 
-pkgname=filebot
+pkgname=filebot-git
+_pkgname=filebot
 pkgver=4.8.4
-pkgrel=4
+pkgrel=1
 _jnaver=4.5.2
 _fixedcommit=b9572f4501ba9d5af9d445a792fa902274f37679
 pkgdesc="The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums."
 arch=('i686' 'x86_64' 'aarch64' 'armv7l' 'armv7h')
 url="https://github.com/filebot/filebot"
 license=('GPL')
-install=$pkgname.install
+install=$_pkgname.install
 depends=('java-openjfx' 'jre8-openjdk' 'fontconfig' 'chromaprint')
 makedepends=('ant' 'ivy')
+provides=('filebot')
+conflicts=('filebot47' 'filebot')
 
 [[ $CARCH == "i686" ]]   && _intarch=i686
 [[ $CARCH == "x86_64" ]] && _intarch=amd64
@@ -27,9 +30,9 @@ makedepends=('ant' 'ivy')
 
 _jre=$(archlinux-java get)
 
-source=("${pkgname}::git+https://github.com/filebot/filebot.git"
+source=("${_pkgname}::git+https://github.com/filebot/filebot.git"
         #https://github.com/java-native-access/jna/archive/$_jnaver.tar.gz
-        $pkgname-arch.sh $pkgname.svg $pkgname.desktop)
+        $_pkgname-arch.sh $_pkgname.svg $_pkgname.desktop)
 
 md5sums=('SKIP'
          '7c1128f94fcd9f4e29225a12eac83704'
@@ -44,7 +47,7 @@ optdepends=('libzen: Support for additional subtitle search engines (Sublight)'
 #noextract=($(for i in ${source[@]}; do basename $i; done))
 
 prepare() {
-  cd "$srcdir/$pkgname/"
+  cd "$srcdir/$_pkgname/"
   git checkout $_fixedcommit
 
   patch -p1 -i jdk8.patch
@@ -66,7 +69,7 @@ EOT
 }
 
 build() {
-  cd $pkgname
+  cd $_pkgname
 #  print('Set system '+$_jre+' to java-9-openjdk. Should be reverted after build')
   sudo archlinux-java set java-8-openjdk
   ant resolve
@@ -76,12 +79,12 @@ build() {
 }
 
 package() {
-  install -Dm644 $pkgname/lib/native/linux-$_intarch/libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so"
-  cp -dpr --no-preserve=ownership $pkgname/dist/lib/* "$pkgdir/usr/share/java/$pkgname/"
+  install -Dm644 $_pkgname/lib/native/linux-$_intarch/libjnidispatch.so "$pkgdir/usr/share/java/$_pkgname/libjnidispatch.so"
+  cp -dpr --no-preserve=ownership $_pkgname/dist/lib/* "$pkgdir/usr/share/java/$_pkgname/"
 
-  install -Dm755 $pkgname-arch.sh "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 $pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg"
-  install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm755 $_pkgname-arch.sh "$pkgdir/usr/bin/$_pkgname"
+  install -Dm644 $_pkgname.svg "$pkgdir/usr/share/pixmaps/$_pkgname.svg"
+  install -Dm644 $_pkgname.desktop "$pkgdir/usr/share/applications/$_pkgname.desktop"
   
   sudo archlinux-java set $_jre
 }