[arch-commits] Commit in sawfish/repos (4 files)

[Juergen Hoetzel]

    Date: Saturday, January 24, 2009 @ 18:28:37
  Author: juergen
Revision: 25273

Merged revisions 25272 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/sawfish/trunk

........
  r25272 | juergen | 2009-01-25 00:28:11 +0100 (So, 25 Jan 2009) | 1 line
  
  upgpkg: sawfish 1.3.5.1-1
........

Added:
  sawfish/repos/extra-x86_64/sawfish.install
    (from rev 25272, sawfish/trunk/sawfish.install)
Modified:
  sawfish/repos/extra-x86_64/	(properties)
  sawfish/repos/extra-x86_64/PKGBUILD
Deleted:
  sawfish/repos/extra-x86_64/no-info.patch

-----------------+
 PKGBUILD        |   18 +++++++++---------
 no-info.patch   |   22 ----------------------
 sawfish.install |   17 +++++++++++++++++
 3 files changed, 26 insertions(+), 31 deletions(-)


Property changes on: sawfish/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /sawfish/trunk:1-21083
   + /sawfish/trunk:1-25272

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-01-24 23:28:11 UTC (rev 25272)
+++ extra-x86_64/PKGBUILD	2009-01-24 23:28:37 UTC (rev 25273)
@@ -2,26 +2,26 @@
 # Maintainer: Juergen Hoetzel <juergen at archlinux.org>
 
 pkgname=sawfish
-pkgver=1.3.4
+pkgver=1.3.5.1
 pkgrel=1
 pkgdesc="An alternate window manager for GNOME"
-url="http://sawmill.sourceforge.net/"
+url="http://sawfish.wikia.com/"
 arch=(i686 x86_64)
-license=('GPL')
+license=('GPL')fdd
 depends=('librep' 'esd' 'gtk2' 'rep-gtk' 'libsm' 'gmp')
-source=(http://downloads.sourceforge.net/sourceforge/sawmill/sawfish-$pkgver.tar.gz
-        no-info.patch)
-md5sums=('efd6ed725373cf0874b496982333c781' '48be9727db805d8c9f3e9410b7ba638e')
+source=(http://downloads.sourceforge.net/sourceforge/sawmill/sawfish-$pkgver.tar.bz2 sawfish.install)
+md5sums=('a3e275ce6ec9cc67fe03593191e47550' '2203a70baad2a2b482636ab41557c848')
+install=sawfish.install
 
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i $startdir/src/no-info.patch || return 1
-  ./autogen.sh
   ./configure --prefix=/usr --enable-capplet
   make || return 1
   make DESTDIR=$startdir/pkg install
-
+  # info stuff
+  rm $startdir/pkg/usr/share/info/dir
+  gzip -9nf $startdir/pkg/usr/share/info/*
   mkdir -p $startdir/pkg/etc/X11/sessions/
   cp $startdir/src/$pkgname-$pkgver/sawfish.desktop \
       $startdir/pkg/etc/X11/sessions/

Deleted: extra-x86_64/no-info.patch
===================================================================
--- extra-x86_64/no-info.patch	2009-01-24 23:28:11 UTC (rev 25272)
+++ extra-x86_64/no-info.patch	2009-01-24 23:28:37 UTC (rev 25273)
@@ -1,22 +0,0 @@
---- sawfish-1.3.1/Makefile.in.orig	2007-10-08 11:35:16.000000000 -0500
-+++ sawfish-1.3.1/Makefile.in	2007-10-08 11:35:48.000000000 -0500
-@@ -29,7 +29,7 @@
- 
- OLD_BINARIES = sawmill sawmill-client sawmill-capplet sawmill-ui sawmill-themer
- 
--all : build.h DOC NEWS FAQ
-+all : build.h DOC 
- 	for dir in $(SUBDIRS); do \
- 	  [ -d $$dir ] && ( cd $$dir && $(MAKE) $@ ) || exit 1; \
-  	done
---- sawfish-1.3.1/configure.in.orig	2007-10-08 11:39:32.000000000 -0500
-+++ sawfish-1.3.1/configure.in	2007-10-08 11:39:40.000000000 -0500
-@@ -33,7 +33,7 @@
-  man/Makefile po/Makefile Makedefs Makefile sawfish.spec\
-  lisp/sawfish/gtk/widgets/font.jl"
- 
--SUBDIRS="src lisp scripts themes sounds man po"
-+SUBDIRS="src lisp scripts themes sounds po"
- AC_SUBST(SUBDIRS)
- 
- add_subdir () {

Copied: sawfish/repos/extra-x86_64/sawfish.install (from rev 25272, sawfish/trunk/sawfish.install)
===================================================================
--- extra-x86_64/sawfish.install	                        (rev 0)
+++ extra-x86_64/sawfish.install	2009-01-24 23:28:37 UTC (rev 25273)
@@ -0,0 +1,17 @@
+info_dir=/usr/share/info
+
+post_install() {
+    install-info ${info_dir}/sawfish.info.gz ${info_dir}/dir 
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+    install-info --delete ${info_dir}/sawfish.info.gz ${info_dir}/dir 
+}
+
+op=$1
+shift
+$op $*