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

Eric Bélanger eric at archlinux.org
Fri Jul 16 00:33:18 EDT 2010


    Date: Friday, July 16, 2010 @ 00:33:18
  Author: eric
Revision: 85585

upgpkg: sawfish 1.6.3.1-1
Upstream update, Improved .install file, Removed old patches

Modified:
  sawfish/trunk/PKGBUILD
  sawfish/trunk/sawfish.install
Deleted:
  sawfish/trunk/sawfish.desktop
  sawfish/trunk/sawfish.patch

-----------------+
 PKGBUILD        |   24 ++++++++++++------------
 sawfish.desktop |    8 --------
 sawfish.install |   13 ++++++-------
 sawfish.patch   |   24 ------------------------
 4 files changed, 18 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-15 23:12:21 UTC (rev 85584)
+++ PKGBUILD	2010-07-16 04:33:18 UTC (rev 85585)
@@ -2,26 +2,26 @@
 # Maintainer: Juergen Hoetzel <juergen at archlinux.org>
 
 pkgname=sawfish
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.6.3.1
+pkgrel=1
 pkgdesc="An extensible window manager using a Lisp-based scripting language"
+arch=('i686' 'x86_64')
 url="http://sawfish.wikia.com/"
-arch=('i686' 'x86_64')
 license=('GPL')
 depends=('rep-gtk' 'libsm')
 install=sawfish.install
 source=(http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('dc9c9391aa46d8de193054ba86d37ea3')
+md5sums=('3b046e577d4f1a3636328724c5ddf7ad')
+sha1sums=('e29817db4989d4d22d6d569a69a215442b7eceaa')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --libexecdir=/usr/lib
+  make
+}
 
-  ./configure --prefix=/usr \
-              --libexecdir=/usr/lib
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-
-  mkdir -p ${pkgdir}/etc/X11/sessions/
-  cp ${srcdir}/${pkgname}-${pkgver}/sawfish.desktop \
-     ${pkgdir}/etc/X11/sessions/
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 sawfish-session.desktop "${pkgdir}/etc/X11/sessions/sawfish.desktop"
 }

Deleted: sawfish.desktop
===================================================================
--- sawfish.desktop	2010-07-15 23:12:21 UTC (rev 85584)
+++ sawfish.desktop	2010-07-16 04:33:18 UTC (rev 85585)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=sawfish
-Comment=The sawfish window manager
-Exec=sawfish
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application

Modified: sawfish.install
===================================================================
--- sawfish.install	2010-07-15 23:12:21 UTC (rev 85584)
+++ sawfish.install	2010-07-16 04:33:18 UTC (rev 85585)
@@ -1,7 +1,9 @@
-info_dir=/usr/share/info
+infodir=/usr/share/info
+file=sawfish.info
 
 post_install() {
-    install-info ${info_dir}/sawfish.info.gz ${info_dir}/dir 
+  [ -x usr/bin/install-info ] || return 0
+  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
 }
 
 post_upgrade() {
@@ -9,9 +11,6 @@
 }
 
 pre_remove() {
-    install-info --delete ${info_dir}/sawfish.info.gz ${info_dir}/dir 
+  [ -x usr/bin/install-info ] || return 0
+  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
 }
-
-op=$1
-shift
-$op $*

Deleted: sawfish.patch
===================================================================
--- sawfish.patch	2010-07-15 23:12:21 UTC (rev 85584)
+++ sawfish.patch	2010-07-16 04:33:18 UTC (rev 85585)
@@ -1,24 +0,0 @@
---- sawfish-1.2-gtk2/man/Makefile.in.old	2002-11-12 22:34:45.000000000 -0500
-+++ sawfish-1.2-gtk2/man/Makefile.in	2002-11-12 22:34:40.000000000 -0500
-@@ -35,7 +35,7 @@
- TEXI2DVI = texi2dvi
- DVIPS = dvips
- 
--all : sawfish.info ../NEWS
-+all :
- 
- ../NEWS : news.texi
- 	$(MAKEINFO) $(MAKEINFOFLAGS) --no-headers $< -o ../NEWS
-@@ -54,11 +54,7 @@
- 
- man : sawfish.info sawfish.guide sawfish.doc sawfish.dvi sawfish.ps
- 
--install : sawfish.info installdirs
--	for f in sawfish.info*; do \
-- 	  $(INSTALL_DATA) $$f $(DESTDIR)$(infodir); \
--	done
--	-install-info --info-dir=$(DESTDIR)$(infodir) sawfish.info
-+install :
- 
- installdirs : mkinstalldirs
- 	$(SHELL) $< $(DESTDIR)$(infodir)



More information about the arch-commits mailing list