upgrading package: spire 0.8.2.20191010 -> 0.11.1.20201001

spire/spire.spec

@@ -22,8 +22,8 @@
 ##
 
 #   package version
-%define       V_opkg  0.8.2
-%define       V_dist  20191010
+%define       V_opkg  0.11.1
+%define       V_dist  20201001
 
 #   package information
 Name:         spire
@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Cryptography
 License:      Apache
 Version:      %{V_opkg}.%{V_dist}
-Release:      20191010
+Release:      20201002
 
 #   package options
 %option       with_agent   yes
@@ -81,14 +81,15 @@ PreReq:       OpenPKG, openpkg >= 20160101, openssl
     #   adjust paths
     %{l_shtool} subst \
         -e 's;/tmp/agent\.sock;%{l_prefix}/var/spire/run/spire-agent.sock;g' \
-        src/github.com/spiffe/spire/cmd/spire-agent/cli/api/fetch_cli.go \
-        src/github.com/spiffe/spire/cmd/spire-agent/cli/api/watch_cli.go \
-        src/github.com/spiffe/spire/functional/tools/workload/main.go
+        src/github.com/spiffe/spire/cmd/spire-agent/cli/api/watch.go \
+        src/github.com/spiffe/spire/cmd/spire-agent/cli/common/defaults.go \
+        src/github.com/spiffe/spire/api/workload/v2/workload.go
 
     #   build program
     export GOPATH=`pwd`
-    go build -v -o spire-agent  src/github.com/spiffe/spire/cmd/spire-agent/main.go
-    go build -v -o spire-server src/github.com/spiffe/spire/cmd/spire-server/main.go
+    cd src/github.com/spiffe/spire
+    go build -v -o spire-agent  cmd/spire-agent/main.go
+    go build -v -o spire-server cmd/spire-server/main.go
 
 %install
     #   create installation hierarchy
@@ -104,9 +105,11 @@ PreReq:       OpenPKG, openpkg >= 20160101, openssl
 
     #   install program
     %{l_shtool} install -c -s -m 755 \
-        spire-agent $RPM_BUILD_ROOT%{l_prefix}/sbin/
+        src/github.com/spiffe/spire/spire-agent \
+        $RPM_BUILD_ROOT%{l_prefix}/sbin/
     %{l_shtool} install -c -s -m 755 \
-        spire-server $RPM_BUILD_ROOT%{l_prefix}/sbin/
+        src/github.com/spiffe/spire/spire-server \
+        $RPM_BUILD_ROOT%{l_prefix}/sbin/
 
     #   install utility
     %{l_shtool} install -c -m 755 %{l_value -s -a} \