[arch-commits] CVS update of extra/gnome/gnome-blog (3 files)

Jan de Groot jgc at archlinux.org
Sun Apr 22 13:31:23 EDT 2007


    Date: Sunday, April 22, 2007 @ 13:31:23
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-blog

Modified: PKGBUILD (1.4 -> 1.5) gnome-blog.install (1.2 -> 1.3)
 Removed: no_gtkspell.patch (1.1)

upgpkg: gnome-blog 0.9.1-1
Move to /usr, remove obsolete patch


--------------------+
 PKGBUILD           |   28 ++++++++++++++++------------
 gnome-blog.install |   45 ++++++++++++---------------------------------
 no_gtkspell.patch  |   43 -------------------------------------------
 3 files changed, 28 insertions(+), 88 deletions(-)


Index: extra/gnome/gnome-blog/PKGBUILD
diff -u extra/gnome/gnome-blog/PKGBUILD:1.4 extra/gnome/gnome-blog/PKGBUILD:1.5
--- extra/gnome/gnome-blog/PKGBUILD:1.4	Thu May 25 18:27:27 2006
+++ extra/gnome/gnome-blog/PKGBUILD	Sun Apr 22 13:31:23 2007
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD,v 1.4 2006/05/25 22:27:27 andyrtr Exp $ 
+# $Id: PKGBUILD,v 1.5 2007/04/22 17:31:23 jgc Exp $ 
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Kritoke <kritoke at nospam.gmail.com>
 
 pkgname=gnome-blog
-pkgver=0.9
+pkgver=0.9.1
 pkgrel=1
 pkgdesc="A gnome application that allows you to post entries to many different blog formats."
 arch=(i686 x86_64)
-depends=('gnome-python-extras')
+license=('GPL')
+depends=('gnome-python')
+makedepends=('pkgconfig' 'perlxml')
 install=gnome-blog.install
 url="http://www.gnome.org/~seth/gnome-blog/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.bz2 no_gtkspell.patch)
-md5sums=('257450f1d8587d7a9f0c40732aad51ce' '96835ab735c5e3736524d28ea62293d4')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.9/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('5eb8a04aadf33554a2087589a0025ecc')
 
 build() {
-  [ "$GNOMEDIR" = "" ] && source /etc/profile.d/gnome.sh
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np0 -i $startdir/src/no_gtkspell.patch || return 1
-  ./configure --prefix=/opt/gnome
-  
+  cd ${startdir}/src/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/gnome-blog \
+              --localstatedir=/var
   make || return 1
-  make DESTDIR=$startdir/pkg install
-}
+  make DESTDIR=${startdir}/pkg install
 
+  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+}
Index: extra/gnome/gnome-blog/gnome-blog.install
diff -u extra/gnome/gnome-blog/gnome-blog.install:1.2 extra/gnome/gnome-blog/gnome-blog.install:1.3
--- extra/gnome/gnome-blog/gnome-blog.install:1.2	Fri Jun 10 16:02:38 2005
+++ extra/gnome/gnome-blog/gnome-blog.install	Sun Apr 22 13:31:23 2007
@@ -1,21 +1,8 @@
 pkgname=gnome-blog
 
 post_install() {
-  schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`)
-
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  for schema in "${schemas[@]}" ; do
-    opt/gnome/bin/gconftool-2 --makefile-install-rule "$schema" >/dev/null 2>&1
-  done
-
-  for scroll in "${scrolls[@]}" ; do
-    scrollkeeper-install -q -p var/lib/scrollkeeper "$scroll"
-  done
-
-  kill -s HUP `pidof /opt/gnome/bin/gconfd-2` > /dev/null 2>&1
-  update-desktop-database -q
-  update-mime-database opt/gnome/share/mime > /dev/null 2>&1
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
 }
 
 pre_upgrade() {
@@ -27,24 +14,16 @@
 }
 
 pre_remove() {
-  schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`)
-
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  for schema in "${schemas[@]}" ; do
-    opt/gnome/bin/gconftool-2 --makefile-uninstall-rule "$schema" >/dev/null 2>&1
-  done
-
-  for scroll in "${scrolls[@]}" ; do
-    scrollkeeper-uninstall -q -p var/lib/scrollkeeper "$scroll"
-  done
-
-  kill -s HUP `pidof /opt/gnome/bin/gconfd-2` >/dev/null 2>&1
-}
-
-post_remove() {
-  update-desktop-database -q
-  update-mime-database opt/gnome/share/mime > /dev/null 2>&1
+  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
+  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+    schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
+  else
+    schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
+  fi
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 op=$1
Index: extra/gnome/gnome-blog/no_gtkspell.patch
diff -u extra/gnome/gnome-blog/no_gtkspell.patch:1.1 extra/gnome/gnome-blog/no_gtkspell.patch:removed
--- extra/gnome/gnome-blog/no_gtkspell.patch:1.1	Fri Jun 10 16:03:18 2005
+++ extra/gnome/gnome-blog/no_gtkspell.patch	Sun Apr 22 13:31:23 2007
@@ -1,43 +0,0 @@
---- blog_poster.py.orig	2005-06-10 19:58:42.000000000 +0000
-+++ blog_poster.py	2005-06-10 19:59:06.000000000 +0000
-@@ -9,13 +9,6 @@
- from gnomeblog import blog
- from gnomeblog import blogger_prefs
- 
--#check if pygtkspell is installed
--try:
--    import gtkspell
--    use_gtkspell = 1
--except:
--    use_gtkspell = 0
--
- gconf_prefix = None
- 
- class BlogPoster(gtk.Frame):
-@@ -36,10 +29,6 @@
-         
-         self.blogEntry   = rich_entry.RichEntry()
- 
--	#if we are using gtkspell, attach it to the blogEntry
--	if use_gtkspell:
--		gtkspell.Spell(self.blogEntry)
--
-         scroller         = gtk.ScrolledWindow()
-         self.postButton  = gtk.Button(_("_Post Entry"))
-         
-@@ -117,15 +106,10 @@
- 
-         #we must turn off the spell checker so as not to confuse
-         #the markup to html converter
--        if use_gtkspell:
--            spell = gtkspell.get_from_text_view(self.blogEntry)
--            spell.detach()
-         
-         html_text = self.blogEntry.getHTML()
- 
- 	#turn spelling back on
--        if use_gtkspell:
--            gtkspell.Spell(self.blogEntry)
- 
-         print "Text is: {\n %s \n }\n" % (html_text)
-         title = self.titleEntry.get_text().decode('utf-8')




More information about the arch-commits mailing list