version 0.30-1

2 files changed, 8 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7bd20deb86ad..97c96c0d4870 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = uwm
 	pkgdesc = Micro (u) Window Manager
 	pkgver = 0.30
-	pkgrel = 3
+	pkgrel = 1
 	url = http://uwm.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -14,11 +14,8 @@ pkgbase = uwm
 	depends = libpng
 	depends = libjpeg
 	depends = xcb-util-wm
-	backup = usr/share/X11/uwm/system.uwmrc
 	source = uwm::git://git.code.sf.net/p/uwm/code#tag=0.30
-	source = uwm.desktop
 	md5sums = SKIP
-	md5sums = a16c73faeab8c1fc3c74f3320776789a
 
 pkgname = uwm
 
diff --git a/PKGBUILD b/PKGBUILD
index ba3d9a9f43f4..33f6d46a2ba6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,21 @@
 
 pkgname=uwm
 pkgver=0.30
-pkgrel=3
+pkgrel=1
 pkgdesc="Micro (u) Window Manager"
 arch=('i686' 'x86_64')
 url="http://uwm.sourceforge.net/"
 license=('AGPL3')
-backup=(usr/share/X11/uwm/system.uwmrc)
 depends=('xcb-util-renderutil' 'xcb-util-image' 'xcb-util-keysyms' 'bash' 'libpng' 'libjpeg' 'xcb-util-wm')
 makedepends=('git')
-source=("$pkgname::git://git.code.sf.net/p/uwm/code#tag=0.30"
-        "uwm.desktop")
-md5sums=('SKIP'
-         'a16c73faeab8c1fc3c74f3320776789a')
+source=("$pkgname::git://git.code.sf.net/p/uwm/code#tag=0.30")
+md5sums=('SKIP')
 
 prepare() {
   cd $pkgname
-  sed 's,/usr/local/etc/system.uwmrc,/usr/share/X11/uwm/system.uwmrc,' -i uwm.h
-  sed 's,/usr/local/etc/system.uwmrc,/usr/share/X11/uwm/system.uwmrc,' -i uwmrc.5
-  sed 's,/etc/system.uwmrc /usr/local/etc/system.uwmrc,/usr/share/X11/uwm/system.uwmrc,' -i uwm.1
+  sed 's,/usr/local/etc/system.uwmrc,/etc/X11/system.uwmrc,' -i uwm.h
+  sed 's,/usr/local/etc/system.uwmrc,/etc/X11/system.uwmrc,' -i uwmrc.5
+  sed 's,/etc/system.uwmrc /usr/local/etc/system.uwmrc,/etc/X11/system.uwmrc,' -i uwm.1
 }
 
 build() {
@@ -34,10 +31,8 @@ package() {
   install -Dm0755 contrib/uwm-helper "$pkgdir/usr/bin/uwm-helper"
   install -Dm0644 uwm.1 "$pkgdir/usr/share/man/man1/uwm.1"
   install -Dm0644 uwmrc.5 "$pkgdir/usr/share/man/man5/uwmrc.5"
-  install -Dm0644 contrib/uwmrc.example "$pkgdir/usr/share/X11/uwm/system.uwmrc"
+  install -Dm0644 contrib/uwmrc.example "$pkgdir/etc/X11/system.uwmrc"
   install -Dm0644 contrib/uwm16x16.xpm "$pkgdir/usr/share/pixmaps/uwm16x16.xpm"
-  cd "$srcdir"
-  install -Dm0644 uwm.desktop "$pkgdir/usr/share/xsessions/uwm.desktop"
 }