Consolidated install commands, fixed provides and conflicts

2 files changed, 5 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cadd1e0ffcf8..af906261a111 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 pkgbase = gnome-keyring-import-export-hg
 	pkgdesc = Simple script for exporting gnome2 (seahorse) keyrings, using the SecretService API
 	pkgver = r19.657ba95e254c
-	pkgrel = 1
+	pkgrel = 2
 	url = https://bitbucket.org/spookylukey/gnome-keyring-import-export
 	arch = any
 	license = unknown
 	makedepends = mercurial
 	depends = python
 	depends = python-secretstorage
-	provides = secret-storage-import-export
-	conflicts = gnome-keyring-import-export
+	provides = gnome-keyring-import-export
 	source = gnome-keyring-import-export-hg::hg+https://bitbucket.org/spookylukey/gnome-keyring-import-export
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index ccaec5b225d6..caef6877e863 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Daniel Peukert <dan.peukert@gmail.com>
 pkgname='gnome-keyring-import-export-hg'
 pkgver='r19.657ba95e254c'
-pkgrel=1
+pkgrel='2'
 pkgdesc='Simple script for exporting gnome2 (seahorse) keyrings, using the SecretService API'
 arch=('any')
 url='https://bitbucket.org/spookylukey/gnome-keyring-import-export'
 license=('unknown')
 depends=('python' 'python-secretstorage')
 makedepends=('mercurial')
-provides=('secret-storage-import-export')
-conflicts=('gnome-keyring-import-export')
+provides=('gnome-keyring-import-export')
 source=("$pkgname::hg+https://bitbucket.org/spookylukey/gnome-keyring-import-export")
 sha256sums=('SKIP')
 
@@ -19,6 +18,5 @@ pkgver() {
 }
 
 package() {
-	install -dm755 "$pkgdir/usr/bin/"
-	install -m755 "$srcdir/$pkgname/secret_storage_import_export.py" "$pkgdir/usr/bin/secret-storage-import-export"
+	install -Dm755 "$srcdir/$pkgname/secret_storage_import_export.py" "$pkgdir/usr/bin/secret-storage-import-export"
 }