[arch-commits] Commit in pekwm/trunk (PKGBUILD pekwm_kdm.desktop)

[Alexander Rødseth]

    Date: Friday, December 6, 2013 @ 14:59:21
  Author: arodseth
Revision: 102207

Removed .desktop file, now both are generated at prepare-time

Modified:
  pekwm/trunk/PKGBUILD
Deleted:
  pekwm/trunk/pekwm_kdm.desktop

-------------------+
 PKGBUILD          |   21 ++++++++-------------
 pekwm_kdm.desktop |    5 -----
 2 files changed, 8 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-06 13:48:57 UTC (rev 102206)
+++ PKGBUILD	2013-12-06 13:59:21 UTC (rev 102207)
@@ -5,13 +5,13 @@
 
 pkgname=pekwm
 pkgver=0.1.17
-pkgrel=1
+pkgrel=2
 pkgdesc='Small, fast, functional, and flexible window manager'
 arch=('x86_64' 'i686')
 license=('GPL')
 url='https://www.pekwm.org/projects/pekwm'
 depends=('gcc-libs' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'libxpm' 'libxrandr')
-makedepends=('gendesk')
+makedepends=('gendesk>=0.6')
 optdepends=('lxappearance: feature-rich GTK+ theme switcher'
             'nitrogen: background browser and setter'
             'tint2: basic, good-looking task manager')
@@ -27,19 +27,16 @@
         etc/pekwm/mouse_system
         etc/pekwm/start
         etc/pekwm/vars)
-source=("http://www.pekwm.org/projects/pekwm/files/$pkgname-$pkgver.tar.bz2"
-        "${pkgname}_kdm.desktop")
-sha256sums=('8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00'
-            '4c1817d328dad84407c9ba7219015eb3be0345be9e98fc03fa693b6b443a8dc6')
+source=("http://www.pekwm.org/projects/pekwm/files/$pkgname-$pkgver.tar.bz2")
+sha256sums=('8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00')
 
 prepare() {
-  cd "$srcdir"
-
-  gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc"
+  gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name PekWM
+  gendesk -f -wm --pkgname "${pkgname}_kdm" --exec "$pkgname" --name PekWM
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   ./configure --prefix=/usr --sysconfdir=/etc
   make
@@ -46,9 +43,7 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
   install -Dm644 "$srcdir/$pkgname.desktop" \
     "$pkgdir/usr/share/xsessions/$pkgname.desktop"
   install -Dm644 "$srcdir/${pkgname}_kdm.desktop" \

Deleted: pekwm_kdm.desktop
===================================================================
--- pekwm_kdm.desktop	2013-12-06 13:48:57 UTC (rev 102206)
+++ pekwm_kdm.desktop	2013-12-06 13:59:21 UTC (rev 102207)
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=XSession
-Exec=pekwm
-TryExec=pekwm
-Name=PekWM