commit teamviewer-quicksupport 10.0.46203-2

2 files changed, 16 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a15a1c56fb73..54bd218d8f7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = teamviewer-quicksupport
 	pkgdesc = Teamviewer Quicksupport - All-In-One Software for Remote Support and Online Meetings
 	pkgver = 10.0.46203
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.teamviewer.com/
 	arch = i686
 	arch = x86_64
@@ -11,17 +11,16 @@ pkgbase = teamviewer-quicksupport
 	options = !strip
 	source = teamviewer_qs-10.0.46203.tar.gz::http://download.teamviewer.com/download/version_10x/teamviewer_qs.tar.gz
 	sha256sums = 9d112d3dcb8056115fc2dabeaaab729ec19bdea5352ea7a2ca3858d6e26e1c96
-	depends_i686 = alsa-lib
 	depends_i686 = gcc-libs
+	depends_i686 = alsa-lib
 	depends_i686 = freetype2
 	depends_i686 = libxdamage
-	depends_i686 = libxdamage
 	depends_i686 = libxrandr
 	depends_i686 = libxtst
 	depends_i686 = zlib
+	depends_x86_64 = lib32-gcc-libs
 	depends_x86_64 = lib32-alsa-lib
 	depends_x86_64 = lib32-freetype2
-	depends_x86_64 = lib32-gcc-libs
 	depends_x86_64 = lib32-libxdamage
 	depends_x86_64 = lib32-libxrandr
 	depends_x86_64 = lib32-libxtst
diff --git a/PKGBUILD b/PKGBUILD
index f1228687ab03..b7f262fa9a6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,17 @@
 pkgname=teamviewer-quicksupport
 pkgver=10.0.46203
 _pkgver_major=${pkgver%%.*}
-pkgrel=1
+pkgrel=2
 pkgdesc='Teamviewer Quicksupport - All-In-One Software for Remote Support and Online Meetings'
 arch=('i686' 'x86_64')
 url='http://www.teamviewer.com/'
 depends=('bash')
 options=('!strip')
-depends_i686=('alsa-lib' 'gcc-libs' 'freetype2' 'libxdamage' 'libxdamage' 'libxrandr' 'libxtst' 'zlib')
-depends_x86_64=('lib32-alsa-lib' 'lib32-freetype2' 'lib32-gcc-libs' 'lib32-libxdamage' 'lib32-libxrandr' 'lib32-libxtst' 'lib32-zlib')
+depends_i686=('gcc-libs' 'alsa-lib' 'freetype2' 'libxdamage' 'libxrandr' 'libxtst' 'zlib')
+depends_x86_64=('lib32-gcc-libs' 'lib32-alsa-lib' 'lib32-freetype2' 'lib32-libxdamage' 'lib32-libxrandr' 'lib32-libxtst' 'lib32-zlib')
 conflicts=('teamviewer')
 license=('custom')
-source=("teamviewer_qs-${pkgver}.tar.gz::http://download.teamviewer.com/download/version_10x/teamviewer_qs.tar.gz")
+source=("teamviewer_qs-${pkgver}.tar.gz::http://download.teamviewer.com/download/version_${_pkgver_major}x/teamviewer_qs.tar.gz")
 sha256sums=('9d112d3dcb8056115fc2dabeaaab729ec19bdea5352ea7a2ca3858d6e26e1c96')
 
 prepare() {
@@ -39,9 +39,6 @@ prepare() {
 build() {
 	cd teamviewerqs/
 
-	# set correct path in desktop file
-	sed -i 's|/opt/teamviewer/|/opt/teamviewer10/|g' tv_bin/desktop/teamviewer-teamviewer${_pkgver_major}.desktop
-
 	# duh?!
 	sed -i '/UpdateBinaries/s/^/#/' tv_bin/script/tvw_main
 
@@ -52,19 +49,19 @@ build() {
 package() {
 	cd teamviewerqs/
 
-	install -d -m0755 "${pkgdir}"/opt/teamviewer${_pkgver_major}/
-	cp -a --no-preserve=ownership * "${pkgdir}"/opt/teamviewer${_pkgver_major}/
+	install -d -m0755 "${pkgdir}"/opt/teamviewer/
+	cp -a --no-preserve=ownership * "${pkgdir}"/opt/teamviewer/
 
-	install -d -m0755 ${pkgdir}/usr/{bin,share/applications,share/licenses/${pkgname}}
-	ln -s /opt/teamviewer${_pkgver_major}/tv_bin/script/teamviewer ${pkgdir}/usr/bin/teamviewer
-	ln -s /opt/teamviewer${_pkgver_major}/tv_bin/script/teamviewer ${pkgdir}/usr/bin/quicksupport
-	ln -s /opt/teamviewer${_pkgver_major}/tv_bin/desktop/teamviewer-teamviewer${_pkgver_major}.desktop \
+	install -d -m0755 "${pkgdir}"/usr/{bin,share/applications,share/licenses/${pkgname}}
+	ln -s /opt/teamviewer/tv_bin/script/teamviewer "${pkgdir}"/usr/bin/teamviewer
+	ln -s /opt/teamviewer/tv_bin/script/teamviewer "${pkgdir}"/usr/bin/quicksupport
+	ln -s /opt/teamviewer/tv_bin/desktop/teamviewer-teamviewer${_pkgver_major}.desktop \
 		"${pkgdir}"/usr/share/applications/teamviewer.desktop
-	ln -s /opt/teamviewer${_pkgver_major}/doc/License.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+	ln -s /opt/teamviewer/doc/License.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 
 	install -d -m1777 "${pkgdir}"/var/lib/teamviewer
-	ln -s /var/lib/teamviewer "${pkgdir}"/opt/teamviewer${_pkgver_major}/config
+	ln -s /var/lib/teamviewer "${pkgdir}"/opt/teamviewer/config
 	install -d -m1777 "${pkgdir}"/var/log/teamviewer
-	ln -s /var/log/teamviewer "${pkgdir}"/opt/teamviewer${_pkgver_major}/logfiles
+	ln -s /var/log/teamviewer "${pkgdir}"/opt/teamviewer/logfiles
 }