Delete git suffix from binary and package path

2 files changed, 21 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 18cce980f0ae..ca4b058bbb50 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,9 @@
-# Maintainer: Samuel Kogler <firstname.lastname at gmail.com>
+# Maintainer: KillerBean <killerbean at gmail.com>
 
 _gui=true
-_pkgname=simc
-pkgver=r41567.1a5296ef4b
+_gitname=simc
+pkgver=r46084.3baee4b094
 pkgrel=1
-pkgbase=simulationcraft-git
 pkgname=simulationcraft-git
 pkgdesc="A tool to explore combat mechanics in the popular MMO RPG World of Warcraft (tm). Multi-player event-driven simulator written in C++ that models raid damage."
 url="https://github.com/simulationcraft/simc"
@@ -12,19 +11,21 @@ arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('qt5-webkit' 'openssl' 'qt5-webkit' 'qt5-webengine')
 makedepends=('cmake' 'git')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
 source=('git+https://github.com/simulationcraft/simc.git'
         '0001-set-welcome-path.patch'
         'SimulationCraft.desktop')
 sha256sums=('SKIP'
             '618e5d13965b9093213ef2240e23a828870b07faac0908cb1978438501f9e43d'
-            'fa947aea5f33ca5c4724655cf10ef6a46ae6065ba910a9f509ff96f30497ee31')
+            '12cddfa8077e3f7c5c7d8bc445f27691072911d36e296ffe21281c6f4a0c1dd9')
 pkgver() {
-    cd "${srcdir}/${_pkgname}/"
+    cd "${srcdir}/${_gitname}/"
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-    cd "${srcdir}/${_pkgname}/"
+    cd "${srcdir}/${_gitname}/"
     patch -p1 < "${srcdir}/0001-set-welcome-path.patch"
 
     mkdir -p build
@@ -33,7 +34,7 @@ prepare() {
 }
 
 build() {
-    cd "${srcdir}/${_pkgname}/build/"
+    cd "${srcdir}/${_gitname}/build/"
 
     if [ ${_gui} = true ] ; then
         make PREFIX=/usr CFLAGS+="${CFLAGS}" CXXFLAGS+="${CXXFLAGS}" LDFLAGS+="${LDFLAGS}"
@@ -43,21 +44,21 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/${_pkgname}/"
+    cd "${srcdir}/${_gitname}/"
 
     for profile in $( find profiles -type f); do
-        install -Dm644 "${profile}" "${pkgdir}/usr/share/${pkgname}/${profile}"
+        install -Dm644 "${profile}" "${pkgdir}/usr/share/${pkgname%-*}/${profile}"
     done
 
-    install -Dm755 build/simc "${pkgdir}/usr/bin/simc-git"
+    install -Dm755 build/simc "${pkgdir}/usr/bin/simc"
 
-    install -Dm644 "Welcome.html" "${pkgdir}/usr/share/${pkgname}/Welcome.html"
-    install -Dm644 "Welcome.png" "${pkgdir}/usr/share/${pkgname}/Welcome.png"
+    install -Dm644 "Welcome.html" "${pkgdir}/usr/share/${pkgname%-*}/Welcome.html"
+    install -Dm644 "Welcome.png" "${pkgdir}/usr/share/${pkgname%-*}/Welcome.png"
 
-    install -Dm644 qt/icon/SimulationCraft.xpm "${pkgdir}/usr/share/pixmaps/SimulationCraftGit.xpm"
-    install -Dm644 "${srcdir}/SimulationCraft.desktop" "${pkgdir}/usr/share/applications/SimulationCraftGit.desktop"
+    install -Dm644 qt/icon/SimulationCraft.xpm "${pkgname%-*}/usr/share/pixmaps/SimulationCraft.xpm"
+    install -Dm644 "${srcdir}/SimulationCraft.desktop" "${pkgname%-*}/usr/share/applications/SimulationCraft.desktop"
     for _locale in locale/* ; do
-        install -Dm644 "${_locale}" "${pkgdir}/usr/share/${pkgname}/${_locale}"
+        install -Dm644 "${_locale}" "${pkgdir}/usr/share/${pkgname%-*}/${_locale}"
     done
-    install -Dm755 build/qt/SimulationCraft "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm755 build/qt/SimulationCraft "${pkgdir}/usr/bin/${pkgname%-*}"
 }
diff --git a/SimulationCraft.desktop b/SimulationCraft.desktop
index bec6b467a7dd..997c3a7abb4a 100644
--- a/SimulationCraft.desktop
+++ b/SimulationCraft.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=SimulationCraftGit
+Name=SimulationCraft
 Comment=A tool to explore combat mechanics in the popular MMO RPG World of Warcraft (tm). Multi-player event-driven simulator written in C++ that models raid damage.
-Exec=simulationcraft-git
-Icon=SimulationCraftGit
+Exec=simulationcraft
+Icon=SimulationCraft
 Terminal=false
 Type=Application
 StartupNotify=true