fix some problem

2 files changed, 6 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b118be0ef915..54b19299aa23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,13 +7,12 @@ pkgbase = jabref-mirror
 	license = MIT
 	depends = java-runtime>=8
 	optdepends = gsettings-desktop-schemas: For web search support
+	conflicts = jabref
 	noextract = JabRef-3.8.2.jar
 	source = http://jabref.oss-cn-shanghai.aliyuncs.com/JabRef-3.8.2.jar
-	source = https://raw.githubusercontent.com/JabRef/jabref/master/LICENSE.md
 	source = jabref.sh
 	source = jabref.desktop
 	sha256sums = f7226e9eb64f96ef2d179c4b1f9e9bcd7a630d247f2feb0ecaa243408379720a
-	sha256sums = 19f74c294c572a431e0fadc00671aa5ca77149f8d0572fc01d5944eba06b0c6c
 	sha256sums = d5d31399586f0d76f0e408620a2d868e5c830708d350385a2281bc2138ecd607
 	sha256sums = f958793f6e408bab7db84973169b30ed61077112d3f552dbcc9f068847317602
 
diff --git a/PKGBUILD b/PKGBUILD
index 0424fed44e25..22f377fe57e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,8 @@
 
 # This is a jabref mirror 
 
-pkgname=jabref-mirror
+_pkgname=jabref
+pkgname=${_pkgname}-mirror
 pkgver=3.8.2
 pkgrel=2
 pkgdesc="GUI frontend for BibTeX, written in Java, Using aliyun OSS to accelerate the source downloading process"
@@ -14,16 +15,15 @@ arch=('any')
 url="http://www.jabref.org/"
 license=('MIT')
 depends=('java-runtime>=8')
+conflicts=('jabref')
 optdepends=(
    'gsettings-desktop-schemas: For web search support'
 )
 source=(http://jabref.oss-cn-shanghai.aliyuncs.com/JabRef-${pkgver}.jar
-        https://raw.githubusercontent.com/JabRef/jabref/master/LICENSE.md
         jabref.sh
         jabref.desktop)
 noextract=(JabRef-${pkgver}.jar)
 sha256sums=('f7226e9eb64f96ef2d179c4b1f9e9bcd7a630d247f2feb0ecaa243408379720a'
-            '19f74c294c572a431e0fadc00671aa5ca77149f8d0572fc01d5944eba06b0c6c'
             'd5d31399586f0d76f0e408620a2d868e5c830708d350385a2281bc2138ecd607'
             'f958793f6e408bab7db84973169b30ed61077112d3f552dbcc9f068847317602')
 
@@ -36,10 +36,10 @@ package() {
   cd ${srcdir}
   install -Dm755 JabRef-${pkgver}.jar ${pkgdir}/usr/share/java/${pkgname}/JabRef-${pkgver}.jar
 
-  install -Dm755 ${pkgname}.sh ${pkgdir}/usr/bin/${pkgname}
+  install -Dm755 ${_pkgname}.sh ${pkgdir}/usr/bin/${pkgname}
   sed -i "s/VERSION/${pkgver}/" ${pkgdir}/usr/bin/${pkgname}
 
-  install -Dm644 ${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install -Dm644 ${_pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
   install -Dm644 images/icons/JabRef-icon-48.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png
   install -Dm644 LICENSE.md ${pkgdir}/usr/share/licenses/jabref/LICENSE.md
 }