git » geany.git » commit 225dd39

Updated to 0.21

author Alexander Rødseth
2011-10-09 10:56:17 UTC
committer Alexander Rødseth
2011-10-09 10:56:17 UTC
parent d8c7c0a286605be6ca511ebd9983675da4c188b8

Updated to 0.21

PKGBUILD +22 -16
geany.install +7 -4

diff --git a/PKGBUILD b/PKGBUILD
index 30fa68e..4ee216e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,42 @@
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Ionut Biru  <ibiru@archlinux.ro>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
-
 pkgname=geany
-pkgver=0.20
+pkgver=0.21
 pkgrel=1
-pkgdesc="A fast and lightweight IDE"
-arch=('i686' 'x86_64')
-url="http://www.geany.org"
+pkgdesc="Fast and lightweight IDE"
+arch=('x86_64' 'i686')
+url="http://www.geany.org/"
 license=('GPL')
-depends=('gtk2>=2.8.0')
+depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils' 'python2')
 makedepends=('perlxml' 'intltool')
 optdepends=("vte: for terminal support")
 install=geany.install
-source=(http://download.geany.org/$pkgname-$pkgver.tar.gz)
+source=("http://download.geany.org/${pkgname}-${pkgver}.tar.gz")
 options=('!libtool')
-md5sums=('7e7d6e4a40e04ecacb9bc317f97becfb')
+md5sums=('d2734776badc3f5f9a778814ed56fb8a')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  # python2 fix
-  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' data/templates/files/main.py
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
+  msg2 "Configuring..."
   ./configure --prefix=/usr
+  msg2 "Compiling..."
   make
-
-  # FS#10318
+  msg2 "Python2 fix..."
+	sed -i '0,/on/s//on2/' data/templates/files/main.py
+  msg2 "Fixing FS#10318..."
   sed -i 's|MimeType=text/plain;|MimeType=|' geany.desktop
-  # Add colors for PKGBUILD file
+  msg2 "Enabling colors for PKGBUILD files..."
   sed -i 's|Sh=|Sh=PKGBUILD;|' data/filetype_extensions.conf
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR=${pkgdir} install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/geany.install b/geany.install
index 7e83162..4cd573a 100644
--- a/geany.install
+++ b/geany.install
@@ -1,13 +1,16 @@
 pkgname=geany
 
-post_install() {
+post_upgrade() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 
-post_upgrade() {
-  post_install
+post_install() {
+  post_upgrade
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_upgrade
 }
+
+# vim:set ts=2 sw=2 et: