1 files changed, 18 insertions, 49 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 75b84b393eb4..3db146bf8068 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,65 +1,34 @@
-# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Maintainer:
+# Contributor: Kyle Keen <keenerd@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=spectrwm
-pkgver=3.5.2
-_ghver=3_5_1
-pkgrel=6
-pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way."
+pkgver=3.6.0
+_pkgver="${pkgname^^}_${pkgver//./_}"
+pkgrel=1
+pkgdesc='A small, dynamic tiling and reparenting window manager for X11'
 arch=('x86_64')
-url="http://www.spectrwm.org"
-_watch="https://github.com/conformal/spectrwm/releases"
+url='https://github.com/conformal/spectrwm'
 license=('ISC')
-depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor' 'terminus-font')
-replaces=('scrotwm')
+depends=('bash' 'fontconfig' 'glibc' 'libbsd' 'libx11' 'libxcb' 'libxcursor' 'libxft' 'xcb-util' 'xcb-util-keysyms' 'xcb-util-wm')
 makedepends=('libxt')
-optdepends=('scrot: screenshots'
-            'xlockmore: great screenlocker')
+replaces=('scrotwm')
 backup=(etc/spectrwm.conf)
-install=spectrwm.install
-
-#source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \
-source=("https://github.com/conformal/spectrwm/archive/refs/tags/SPECTRWM_${_ghver}.tar.gz" \
-	LICENSE \
-        baraction.sh)
-md5sums=('611604a6c4a9c7848d64ea98a0d1db16'
-         'a67cfe51079481e5b0eab1ad371379e3'
-         '950d663692e1da56e0ac864c6c3ed80e')
-sha256sums=('7fe4260208a52d9fb844291d0afe6af18887c5452df0b921ed780af7b9223f0f'
-            '1bf0c43ca1063b16f6ab784d251319081579a786f99bb86d9f6828b14abb2263'
-            '2cc2ca7105ddb3575bbdf4184d974afab8b475aab0af113242188288d7ba4504')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/${_pkgver}.tar.gz")
+sha256sums=('49854c5215475d2450d2558da12a3afe9019861170ba9d556c8b403d4d66f0d1')
 
 prepare() {
-  cd "$srcdir/$pkgname-SPECTRWM_$_ghver"
-
-  sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c
-  sed -i 's/verbose_layout = false;/verbose_layout = true;/' spectrwm.c
-  sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf
+  cd "${pkgname}-${_pkgver}"
+  sed -i 's|/usr/local/lib/|/usr/lib/|' spectrwm.c
 }
 
 build() {
-  #cd "$srcdir/$pkgname-$pkgver/linux"
-  cd "$srcdir/$pkgname-SPECTRWM_$_ghver/linux"
-  
-  make PREFIX="/usr"
+  cd "${pkgname}-${_pkgver}/linux"
+  make PREFIX='/usr'
 }
 
 package() {
-  #cd "$srcdir/$pkgname-$pkgver"
-  cd "$srcdir/$pkgname-SPECTRWM_$_ghver"
-  cd linux
-  make PREFIX="/usr" DESTDIR="$pkgdir" install
-  install -Dm644 spectrwm.desktop "$pkgdir/usr/share/xsessions/spectrwm.desktop"
-  cd ..
-  install -Dm644 spectrwm.conf "$pkgdir/etc/spectrwm.conf"
-  install -Dm755 screenshot.sh "$pkgdir/usr/share/spectrwm/screenshot.sh"
-  mkdir -p "$pkgdir/etc/spectrwm"
-  cp spectrwm_*.conf "$pkgdir/etc/spectrwm/"
-  cd "$srcdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh"
-
-  # fix this for real in the makefile
-  rm "$pkgdir/usr/bin/scrotwm"
-  ln -s "/usr/bin/spectrwm" "$pkgdir/usr/bin/scrotwm"
+  cd "${pkgname}-${_pkgver}/linux"
+  make PREFIX='/usr' SYSCONFDIR='/etc' DESTDIR="${pkgdir}" install
+  install -Dm644 ../LICENSE.md -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }