do not hardcode go version

marguerite · Feb 24, 2016 · 005c223 · 005c223
1 parent 9300109
commit 005c223
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/golang.req b/golang.req
@@ -6,6 +6,16 @@ buildroot = RpmSysinfo.get_buildroot
 contribdir = RpmSysinfo.get_go_contribdir
 importpath = RpmSysinfo.get_go_importpath
 
+def go_get_version()
+  IO.popen("go version") do |process|
+    process.each_line do |l|
+      version_re = /^go version go(?<version>\S+)\s+(?<goos>[^\/]+)\/(?<goarch>.*)$/
+      md = version_re.match(l.chomp)
+      return md[:version] if md
+    end
+  end
+end
+
 # read stdin for filelist rpm feeds us for a (sub) package
 filelist = []
 ARGF.each do |l|
@@ -22,7 +32,7 @@ requires = []
 
 unless filelist.empty? then
 
-	requires << "golang(API) = 1.5"
+	requires << "golang(API) = " + go_get_version()
 
 	filelist.each do |f|
 		# unarchive .a

diff --git a/golang/rpmsysinfo.rb b/golang/rpmsysinfo.rb
@@ -150,7 +150,7 @@ def self.get_go_importpath
 
                 return importpath
 
-        end
+	end
 
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,7 +150,7 @@ def self.get_go_importpath @@
                     return importpath
-            end
+    	end
     end