Fixed broken packaging

2 files changed, 11 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 433384e23572..9442b07c6528 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = newsie
 	pkgdesc = A command line utility for accessing Arch newsfeed posts.
-	pkgver = 1.1
+	pkgver = 1.1.1
 	pkgrel = 1
-	url = https://github.com/cbbond/newsie-go
+	url = https://github.com/cbbond/newsie
 	arch = x86_64
 	license = MIT
 	makedepends = go
-	source = newsie-1.1.tar.gz::https://github.com/cbbond/newsie-golang/archive/v1.1.tar.gz
-	md5sums = e3a1b94cb342bdf76b2aba542ef147e6
+	source = newsie-1.1.1.tar.gz::https://github.com/cbbond/newsie/archive/v1.1.1.tar.gz
+	md5sums = 0bcf1aff75f8dbdb09191b9f5c5e6b8c
 
 pkgname = newsie
 
diff --git a/PKGBUILD b/PKGBUILD
index eb1ee1fe0304..36eaa4b7aa9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,31 @@
 # Maintainer: Cody Bond <cbbond@outlook.com>
 
 pkgname=newsie
-pkgver=1.1
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="A command line utility for accessing Arch newsfeed posts."
 arch=("x86_64")
-url="https://github.com/cbbond/$pkgname-go"
+url="https://github.com/cbbond/$pkgname"
 license=('MIT')
 makedepends=('go')
-source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/cbbond/$pkgname-golang/archive/v$pkgver.tar.gz")
-md5sums=('e3a1b94cb342bdf76b2aba542ef147e6')
+source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/cbbond/$pkgname/archive/v$pkgver.tar.gz")
+md5sums=('0bcf1aff75f8dbdb09191b9f5c5e6b8c')
 
 build() {
     export GOPATH="$srcdir"/gopath
-    export GO111MODULE=on
     
     export CGO_CPPFLAGS="${CPPFLAGS}"
     export CGO_CFLAGS="${CFLAGS}"
     export CGO_CXXFLAGS="${CXXFLAGS}"
     export CGO_LDFLAGS="${LDFLAGS}"
     
-    cd "$pkgname-golang-$pkgver"
-    go get
-    go build newsie.go
+    cd "$srcdir/$pkgname-$pkgver"
+    make
     go clean -modcache
 }
 
 package() {
-    cd "$srcdir/$pkgname-golang-$pkgver"
+    cd "$srcdir/$pkgname-$pkgver"
 
     install -Dm 0755 $pkgname -t $pkgdir/usr/bin/
     install -Dm 0644 $pkgname.hook -T $pkgdir/usr/share/libalpm/hooks/00-$pkgname.hook