Merge branch 'dev'

.travis/make_debian_env

@@ -23,7 +23,9 @@ ORIGDIR="$(realpath "$ORIGDIR")"
 REVISION="1${DISTRO}1"
 
 DATE_R="$(date -R)"
-ARCHS="386_cgo amd64_cgo arm arm64" #arm arm64
+# The non-cgo builds here are used by the RPM builds, which also reply on the
+# .orig.tar.gz file built here.
+ARCHS="386_cgo amd64_cgo 386 amd64 arm arm64"
 
 mkdir -p "$ARCHIVEDIR"
 for ARCH in $ARCHS; do

.travis/make_rpm_spec

@@ -24,6 +24,7 @@ Release: 1%{?dist}
 Summary: Automatic certificate acquisition tool
 License: MIT
 URL: https://github.com/hlandau/acme
+Group: Applications/System
 Requires: libcap
 Conflicts: %{aname}$NOTNOCGO_SUFFIX
 %ifarch i386 i686
@@ -35,7 +36,7 @@ Conflicts: %{aname}$NOTNOCGO_SUFFIX
 %define goarch ERROR
 %endif
 %endif
-
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 Source: %{aname}_%{version}.orig.tar.gz
 
 %define debug_package %{nil}