hacky workaround for building with golang 1.13HEADmaster

4 files changed, 20 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 68e5667..5735420 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rhimportd (0.12.2-2) unstable; urgency=medium
+
+  * build against golang 1.13
+  * fixed archiv base path
+
+ -- Christian Pointner <equinox@helsinki.at>  Mon, 04 Jan 2021 19:36:21 +0100
+
 rhimportd (0.12.2-1) unstable; urgency=medium
 
   * new upstream release.
diff --git a/debian/control b/debian/control
index b5833c1..72af87c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: rhimportd
 Section: net
 Priority: optional
 Maintainer: Christian Pointner <equinox@helsinki.at>
-Build-Depends: debhelper (>=9), dh-systemd, golang-go (>=2:1.5), git, ca-certificates, pkg-config, libcurl4-openssl-dev
+Build-Depends: debhelper (>=9), dh-systemd, go (>=1.13), git, ca-certificates, pkg-config, libcurl4-openssl-dev
 Standards-Version: 3.9.5
 
 Package: rhimportd
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..92f42b2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+workaround-go-cachepath.patch
diff --git a/debian/patches/workaround-go-cachepath.patch b/debian/patches/workaround-go-cachepath.patch
new file mode 100644
index 0000000..eed4b32
--- /dev/null
+++ b/debian/patches/workaround-go-cachepath.patch
@@ -0,0 +1,11 @@
+--- rhimportd-0.12.2.orig/Makefile
++++ rhimportd-0.12.2/Makefile
+@@ -23,7 +23,7 @@
+ ##
+ 
+ curdir:= $(shell pwd)
+-GOCMD := GOPATH=$(curdir) go
++GOCMD := env "GOPATH=$(curdir)" "GOCACHE=/tmp/.gocache" go
+ 
+ EXECUTEABLE := rhimportd
+