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

[Bartłomiej Piotrowski]

    Date: Friday, July 5, 2013 @ 21:21:14
  Author: bpiotrowski
Revision: 93575

upgpkg: openbox 3.5.0-8

- remove gdm-control and gnome-panel-control as they don't work with Gnome 3
- remove pointless .install file

Modified:
  openbox/trunk/PKGBUILD
Deleted:
  openbox/trunk/openbox.install

-----------------+
 PKGBUILD        |   52 +++++++++++++++++++++++++++-------------------------
 openbox.install |    4 ----
 2 files changed, 27 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-05 18:43:17 UTC (rev 93574)
+++ PKGBUILD	2013-07-05 19:21:14 UTC (rev 93575)
@@ -6,52 +6,54 @@
 
 pkgname=openbox
 pkgver=3.5.0
-pkgrel=7
-pkgdesc="A highly configurable and lightweight X11 window manager"
+pkgrel=8
+pkgdesc='Highly configurable and lightweight X11 window manager'
 arch=('i686' 'x86_64')
-url="http://openbox.org"
+url='http://openbox.org'
 license=('GPL')
 depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
-     'libxcursor' 'pango' 'imlib2')
-optdepends=('pyxdg: for the xdg-autostart script')
+         'libxcursor' 'pango' 'imlib2')
+optdepends=('python2: for the xdg-autostart script')
 groups=('lxde')
-install=$pkgname.install
 options=('!libtool')
 backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml')
 source=(http://www.icculus.org/openbox/releases/$pkgname-$pkgver.tar.gz
-		openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch
-		openbox-3.5.0-title-matching.patch
-		openbox-3.5.0-which-2.20.patch)
+        openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch
+        openbox-3.5.0-title-matching.patch
+        openbox-3.5.0-which-2.20.patch)
 md5sums=('00441b53cf14c03566c8e82643544ff9'
          'f2e5198a9dfc803c59fd42448a85f2da'
          '0a11d7149da210a31ef88f8a9c717711'
          '7ca3b5244bb092d46f5bcf1e2bdf4a18')
 
-build() {
-  cd $srcdir/$pkgname-$pkgver
+prepare() {
+  cd $pkgname-$pkgver
 
-  patch -Np1 -i $srcdir/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch # FS#29812
-  patch -Np1 -i $srcdir/openbox-3.5.0-title-matching.patch  # OB#5277
-  patch -Np1 -i $srcdir/openbox-3.5.0-which-2.20.patch # FS#11455
+  patch -Np1 -i "$srcdir"/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch # FS#29812
+  patch -Np1 -i "$srcdir"/openbox-3.5.0-title-matching.patch  # OB#5277
+  patch -Np1 -i "$srcdir"/openbox-3.5.0-which-2.20.patch # FS#11455
 
   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-      data/autostart/openbox-xdg-autostart
-  
+    data/autostart/openbox-xdg-autostart
+}
+
+build() {
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr \
-              --with-x \
-              --enable-startup-notification \
-              --sysconfdir=/etc \
-              --libexecdir=/usr/lib/openbox
-  
+    --with-x \
+    --enable-startup-notification \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/openbox
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir/ install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  rm "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control}
 
   sed -i 's:startkde:/usr/bin/\0:' \
-         $pkgdir/usr/share/xsessions/openbox-kde.desktop
+    "$pkgdir"/usr/share/xsessions/openbox-kde.desktop
   sed -i 's:=gnome-session:=/usr/bin/gnome-session:' \
-      $pkgdir/usr/share/xsessions/openbox-gnome.desktop
+    "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop
 }

Deleted: openbox.install
===================================================================
--- openbox.install	2013-07-05 18:43:17 UTC (rev 93574)
+++ openbox.install	2013-07-05 19:21:14 UTC (rev 93575)
@@ -1,4 +0,0 @@
-post_install() {
-    echo "Place menu.xml, rc.xml and autostart in ~/.config/openbox"
-    echo "They can be found in /etc/xdg/openbox"
-}