Browse Source

upgrading package: confd 0.9.0 -> 0.10.0

Ralf S. Engelschall 10 years ago
parent
commit
865ec924f1
1 changed files with 8 additions and 14 deletions
  1. 8 14
      confd/confd.spec

+ 8 - 14
confd/confd.spec

@@ -22,8 +22,8 @@
 ##
 
 #   package version
-%define       V_opkg  0.9.0
-%define       V_dist  0.9.0
+%define       V_opkg  0.10.0
+%define       V_dist  0.10.0
 
 #   package information
 Name:         confd
@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Network
 License:      MIT
 Version:      %{V_opkg}
-Release:      20150515
+Release:      20150812
 
 #   list of sources
 Source0:      https://github.com/kelseyhightower/confd/archive/v%{V_dist}.tar.gz
@@ -46,8 +46,8 @@ Source3:      example.toml
 Source4:      example.conf.tmpl
 
 #   build information
-BuildPreReq:  OpenPKG, openpkg >= 20120101, go
-PreReq:       OpenPKG, openpkg >= 20120101, etcd
+BuildPreReq:  OpenPKG, openpkg >= 20140101, go, gb
+PreReq:       OpenPKG, openpkg >= 20140101, etcd
 
 %description
     confd(8) is a lightweight configuration management tool focusing on:
@@ -69,16 +69,10 @@ PreReq:       OpenPKG, openpkg >= 20120101, etcd
     #   patch path to configuration file
     %{l_shtool} subst \
         -e 's;/etc/confd/confd.toml;%{l_prefix}/etc/confd/confd.toml;' \
-        confd.go
-
-    #   prepare Go build environment
-    mkdir -p Godeps/_workspace/src/github.com/kelseyhightower
-    ln -s ../../../../.. Godeps/_workspace/src/github.com/kelseyhightower/confd
-    export GOBIN=`pwd`/bin
-    export GOPATH=`pwd`/Godeps/_workspace
+        src/github.com/kelseyhightower/confd/config.go
 
     #   build program
-    go build -x
+    ./build
 
 %install
     #   create directory hierarchy
@@ -93,7 +87,7 @@ PreReq:       OpenPKG, openpkg >= 20120101, etcd
 
     #   install program
     %{l_shtool} install -c -s -m 755 \
-        confd-[0-9]* $RPM_BUILD_ROOT%{l_prefix}/sbin/confd
+        bin/confd $RPM_BUILD_ROOT%{l_prefix}/sbin/confd
 
     #   install configuration files
     %{l_shtool} install -c -m 644 %{l_value -s -a} \