[arch-commits] Commit in bluefish/trunk (ChangeLog PKGBUILD bluefish.install)

[Eric Bélanger]

    Date: Tuesday, February 16, 2010 @ 09:01:30
  Author: eric
Revision: 69051

upgpkg: bluefish 2.0.0-1
Upstream update, Updated/Cleaned up depends, Added perlxml makedepends, Added support for charmap plugin, Removed libtool files, Updated source url to use sourceforge mirror, Improved description, Fixed .install scriptlet to update icon cache and xml catalog, Cleaned up configure option

Modified:
  bluefish/trunk/ChangeLog
  bluefish/trunk/PKGBUILD
  bluefish/trunk/bluefish.install

------------------+
 ChangeLog        |   13 +++++++++++++
 PKGBUILD         |   27 +++++++++++----------------
 bluefish.install |   20 ++++++++++++++++++--
 3 files changed, 42 insertions(+), 18 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-02-16 13:54:24 UTC (rev 69050)
+++ ChangeLog	2010-02-16 14:01:30 UTC (rev 69051)
@@ -1,3 +1,16 @@
+2010-02-16  Eric Belanger  <eric at archlinux.org>
+
+	* bluefish 2.0.0-1
+	* Upstream update
+	* Updated/Cleaned up depends
+	* Added perlxml makedepends
+	* Added support for charmap plugin
+	* Removed libtool files
+	* Updated source url to use sourceforge mirror
+	* Improved description
+	* Fixed .install scriptlet to update icon cache and xml catalog
+	* Cleaned up configure option
+
 2009-07-29  Eric Belanger  <eric at archlinux.org>
 
 	* bluefish 1.0.7-4

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-16 13:54:24 UTC (rev 69050)
+++ PKGBUILD	2010-02-16 14:01:30 UTC (rev 69051)
@@ -3,30 +3,25 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=bluefish
-pkgver=1.0.7
-pkgrel=4
-pkgdesc="Programmer's HTML editor written using GTK"
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="A powerful HTML editor for experienced web designers and programmers"
 arch=('i686' 'x86_64')
 url="http://bluefish.openoffice.nl/"
 license=('GPL')
-depends=('pcre>=6.6-2' 'aspell>=0.60.4-2' 'gnome-vfs' 'desktop-file-utils' 'shared-mime-info')
-makedepends=('pkgconfig')
+depends=('pcre' 'gtk2' 'enchant' 'desktop-file-utils' 'shared-mime-info')
+makedepends=('perlxml' 'gucharmap')
+optdepends=('gucharmap: for using the charmap plugin')
+options=('!libtool')
 install=bluefish.install
-source=(http://www.bennewitz.com/bluefish/stable/source/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2c3b3c9c8f8e32b9473dfd879f216dea')
-sha1sums=('c61d6271c49e9fa8c728724e6aadde33a227bdea')
+source=(http://downloads.sourceforge.net/project/bluefish/bluefish/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('ac9b1e8ef6d5691718a0daa6c78d5618')
+sha1sums=('b92d79291f262d1bb01337f055ad16093cf4905b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --with-freedesktop_org-menu=/usr/share/applications \
-    --with-freedesktop_org-mime=/usr/share/mime \
-    --without-gnome2_4-mime \
-    --without-gnome2_4-appreg \
-    --with-icon-path=/usr/share/pixmaps \
-    --disable-update-databases \
-    --without-libgnomeui || return 1
+    --enable-spell-check --disable-update-databases --disable-xml-catalog-update || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
-  install -m644 data/bluefish.desktop "${pkgdir}/usr/share/applications/bluefish.desktop" || return 1
 }

Modified: bluefish.install
===================================================================
--- bluefish.install	2010-02-16 13:54:24 UTC (rev 69050)
+++ bluefish.install	2010-02-16 14:01:30 UTC (rev 69051)
@@ -1,12 +1,28 @@
 post_install() {
+  if [ ! -d etc/xml ]; then
+    mkdir -p etc/xml
+  fi
+  if [ ! -e etc/xml/catalog ]; then
+    xmlcatalog --noout --create etc/xml/catalog
+  fi
+  xmlcatalog --noout --add 'delegateURI' \
+    'http://bluefish.openoffice.nl/ns/bflang/2.0/' /usr/share/xml/bluefish \
+    etc/xml/catalog
+
   update-desktop-database -q
   update-mime-database usr/share/mime > /dev/null
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor	
 }
 
+pre_upgrade() {
+  post_remove
+}
+
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  post_install
+  xmlcatalog --noout --del \
+    /usr/share/xml/bluefish etc/xml/catalog
 }