fix PKGBUILD

3 files changed, 26 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45df49037d8e..7a426ad8459d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = gnome-connection-manager-bin
 	pkgdesc = Simple tabbed ssh and telnet connection manager for GTK+ environments.
 	pkgver = 1.2.1
-	pkgrel = 4
+	pkgrel = 5
 	url = http://kuthulu.com/gcm
-	install = gnome-connection-manager.install
 	arch = any
 	groups = 
 	license = GPLv3
 	depends = expect
-	depends = gobject-introspection
 	depends = python
 	depends = python-gobject
 	options = !strip
 	options = !emptydirs
 	source = https://github.com/kuthulux/gnome-connection-manager/releases/download/v1.2.1/gnome-connection-manager_1.2.1_all.deb
+	source = https://raw.githubusercontent.com/kuthulux/gnome-connection-manager/d2f66e3d668245f549ff6a69f662b1ebd669dc51/style.css
 	sha512sums = 0487cafda21d2a277ae2bf234a4d758c710e35b75eae2fffdef1d01ae19046bef0de13f4cde05c23f7d03d847a5548fb4ad5e0ae554a13f32a057d93feac8610
+	sha512sums = SKIP
 
 pkgname = gnome-connection-manager-bin
diff --git a/PKGBUILD b/PKGBUILD
index 156dedf6c48a..ae0e0caea595 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,36 @@
 # Maintainer: Stezko <stezko@gmail.com>
 pkgname=gnome-connection-manager-bin
-_pkgname=gnome-connection-manager
 pkgver=1.2.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Simple tabbed ssh and telnet connection manager for GTK+ environments."
 arch=('any')
 url="http://kuthulu.com/gcm"
 license=('GPLv3')
 groups=('')
-depends=('expect' 'gobject-introspection' 'python' 'python-gobject')
+depends=('expect' 'python' 'python-gobject')
 options=('!strip' '!emptydirs')
-install=${pkgname%-bin}.install
-source=(https://github.com/kuthulux/gnome-connection-manager/releases/download/v${pkgver}/gnome-connection-manager_${pkgver}_all.deb)
-sha512sums=('0487cafda21d2a277ae2bf234a4d758c710e35b75eae2fffdef1d01ae19046bef0de13f4cde05c23f7d03d847a5548fb4ad5e0ae554a13f32a057d93feac8610')
+source=(
+		"https://github.com/kuthulux/gnome-connection-manager/releases/download/v${pkgver}/gnome-connection-manager_${pkgver}_all.deb"
+		"https://raw.githubusercontent.com/kuthulux/gnome-connection-manager/d2f66e3d668245f549ff6a69f662b1ebd669dc51/style.css"
+		)
+sha512sums=(
+			'0487cafda21d2a277ae2bf234a4d758c710e35b75eae2fffdef1d01ae19046bef0de13f4cde05c23f7d03d847a5548fb4ad5e0ae554a13f32a057d93feac8610'
+			'SKIP')
 
 package(){
-	tar xzf data.tar.gz -C "${pkgdir}"
+	bsdtar xzf data.tar.gz -C "${pkgdir}"
 
-	install -D -m644 ${pkgdir}/usr/share/doc/${_pkgname}/copyright "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-	#fix css error
-	touch ${pkgdir}/usr/share/gnome-connection-manager/style.css
+	install -d "${pkgdir}/usr/share/pixmaps"
+	ln -s "/usr/share/${pkgname%-bin}/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
+
+	sed -i "s|Icon=/usr/share/${pkgname%-bin}/icon.png|Icon=${pkgname%-bin}|g" \
+    "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
+
+	install -D -m644 ${pkgdir}/usr/share/doc/${pkgname%-bin}/copyright "${pkgdir}/usr/share/licenses/${pkgname%-bin}/LICENSE"
+
+	# fix folder permissions
+	find "${pkgdir}" -type d -print0 |xargs -0 chmod 755
+
+	# fix css error
+	install -D -m755 ${srcdir}/style.css "${pkgdir}/usr/share/${pkgname%-bin}/style.css"
 }
diff --git a/gnome-connection-manager.install b/gnome-connection-manager.install
deleted file mode 100644
index a96a151abdd8..000000000000
--- a/gnome-connection-manager.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-
-
-	sudo xdg-desktop-menu install /usr/share/applications/gnome-connection-manager.desktop
-
-}
-
-post_upgrade() {
-	post_install
-}