Hello community, here is the log from the commit of package golang-packaging for openSUSE:Factory checked in at 2016-06-12 18:54:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/golang-packaging (Old) and /work/SRC/openSUSE:Factory/.golang-packaging.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "golang-packaging" Changes: -------- --- /work/SRC/openSUSE:Factory/golang-packaging/golang-packaging.changes 2016-04-22 16:25:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.golang-packaging.new/golang-packaging.changes 2016-06-12 18:54:46.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Jun 08 10:36:29 UTC 2016 - [email protected] + +- Update to version 14.9.1: + * simplify rpmsysinfo.rb: don't guess variables' + values can be passed in by RPM environment + variables. use RbConfig to get libdir. + * support s390x architecture + +------------------------------------------------------------------- Old: ---- golang-packaging-14.9.0.tar.xz New: ---- golang-packaging-14.9.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golang-packaging.spec ++++++ --- /var/tmp/diff_new_pack.lT8oM9/_old 2016-06-12 18:54:48.000000000 +0200 +++ /var/tmp/diff_new_pack.lT8oM9/_new 2016-06-12 18:54:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: golang-packaging -Version: 14.9.0 +Version: 14.9.1 Release: 0 Summary: A toolchain to help packaging golang License: GPL-3.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.lT8oM9/_old 2016-06-12 18:54:48.000000000 +0200 +++ /var/tmp/diff_new_pack.lT8oM9/_new 2016-06-12 18:54:48.000000000 +0200 @@ -1,17 +1,17 @@ <services> - <service name="tar_scm" mode="localonly"> + <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/openSUSE/golang-packaging</param> <param name="scm">git</param> <param name="filename">golang-packaging</param> <param name="exclude">.git</param> - <param name="versionformat">14.9.0</param> - <param name="revision">v14.9.0</param> + <param name="versionformat">14.9.1</param> + <param name="revision">v14.9.1</param> <param name="changesgenerate">enable</param> </service> - <service name="recompress" mode="localonly"> + <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> - <service name="set_version" mode="localonly"> + <service name="set_version" mode="disabled"> </service> </services> ++++++ golang-packaging-14.9.0.tar.xz -> golang-packaging-14.9.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-14.9.0/ChangeLog new/golang-packaging-14.9.1/ChangeLog --- old/golang-packaging-14.9.0/ChangeLog 2016-04-17 16:35:38.000000000 +0200 +++ new/golang-packaging-14.9.1/ChangeLog 2016-06-08 12:36:28.000000000 +0200 @@ -1,3 +1,50 @@ +== update version 14.9.1 == + + * simplify rpmsysinfo.rb: don't guess variables' + values can be passed in by RPM environment + variables. use RbConfig to get libdir. + * support s390x architecture + +== update version 14.9.0 == + + * Remove runtime dependency for Go API + +== update version 14.8.1 == + + * bugfix release + * fix a typo in cli.rb + * increase timeout to 300s, or go install can't + finish itself sometimes + +== update version 14.8 == + + * rpmsysinfo.rb: fix encoding problem in open() + * cli.rb: ruby 1.8.7 doesn't support passing environment + variables in open(), some commands/tests need time to + finish, an immediate io.close() will get us wrong + exitstatus (broken pipe, code 13). so use 'timeout' + module with a 30s and process.wait for them to quit + successfully + * golang.req: the oniguruma in ruby 1.8.7 doesn't support + named group in regexp. so ditch the named group used in + go_get_version() + +== update version 14.7 == + + * do not hardcode go version + +== update version 14.6 == + + * fix rbarch for Power Archtectures + +== update version 14.5 == + + * fix a typo that prevent golang.req from working (github#10) + +== update version 14.4 == + + * fix github#5 on golang.req + == update version 14.3 == * fix: command not found error for go test on SLE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-14.9.0/golang/rpmsysinfo.rb new/golang-packaging-14.9.1/golang/rpmsysinfo.rb --- old/golang-packaging-14.9.0/golang/rpmsysinfo.rb 2016-04-17 16:35:38.000000000 +0200 +++ new/golang-packaging-14.9.1/golang/rpmsysinfo.rb 2016-06-08 12:36:28.000000000 +0200 @@ -1,16 +1,6 @@ module RpmSysinfo - if File.directory?("/usr/src/packages") & File.writable?("/usr/src/packages") - @@topdir = "/usr/src/packages" - else - @@topdir = ENV["HOME"] + "/rpmbuild" - end - - @@buildroot = Dir.glob(@@topdir + "/BUILDROOT/*")[0] - - # sometimes buildroot locates in tmppath/name-version-build - - @@buildroot = Dir.glob("/var/tmp/*-build")[0] if @@buildroot == nil + require 'rbconfig' # x86_64-(gnu|linux|blabla...) @@rbarch = RUBY_PLATFORM.gsub(/-.*$/,"") @@ -18,57 +8,42 @@ @@ix86 = ["i386","i486","i586","i686","pentium3","pentium4","athlon","geode"] @@arm = ["armv3l","armv4b","armv4l","armv4tl","armv5b","armv5l","armv5teb","armv5tel","armv5tejl","armv6l","armv6hl","armv7l","armv7hl","armv7hnl"] if @@ix86.include?(@@rbarch) - @@libdir = "/usr/lib" @@go_arch = "386" end if @@rbarch == "x86_64" - @@libdir = "/usr/lib64" @@go_arch = "amd64" end if @@arm.include?(@@rbarch) - @@libdir = "/usr/lib" @@go_arch = "arm" end if @@rbarch == "aarch64" - @@libdir = "/usr/lib64" @@go_arch = "arm64" end if @@rbarch == "powerpc64" - @@libdir = "/usr/lib64" @@go_arch = "ppc64" end if @@rbarch == "powerpc64le" - @@libdir = "/usr/lib64" @@go_arch = "ppc64le" end - - def self.set_topdir(top) - - @@topdir = top - - end - - def self.get_topdir - - return @@topdir - + if @@rbarch == "s390x" + @@go_arch = "s390x" end def self.get_builddir - return @@topdir + "/BUILD" + return ENV["RPM_BUILD_DIR"] end def self.get_buildroot - return @@buildroot + return ENV["RPM_BUILD_ROOT"] end def self.get_libdir - return @@libdir + return RbConfig::CONFIG['libdir'] end @@ -80,15 +55,13 @@ def self.get_go_contribdir - go_contribdir = @@libdir + "/go/contrib/pkg/linux_" + @@go_arch - return go_contribdir + return self.get_libdir + "/go/contrib/pkg/linux_" + @@go_arch end def self.get_go_tooldir - go_tooldir = "/usr/share/go/pkg/tool/linux_" + @@go_arch - return go_tooldir + return "/usr/share/go/pkg/tool/linux_" + @@go_arch end @@ -100,56 +73,11 @@ def self.get_go_importpath - importpath = "" - - specfile = Dir.glob(@@topdir + "/SOURCES/*.spec")[0] - - File.open(specfile,'r:UTF-8') do |f| - - f.each_line do |l| - - found = 0 - - # see if there's any packager definition for importpath - if l.index(/%(define|global)[\s]+(import_path|importpath)/i) then - - importpath = l.gsub(/%(define|global)[\s]+(import_path|importpath)/i,'').lstrip!.chomp!.gsub(/"/,'').gsub(/"/,'') - - found = 1 - - end - - # use the one in "%goprep code.google.com/p/log4go" - if (found == 0 && l.index("%goprep")) then - - importpath = l.gsub(/%goprep/,'').lstrip!.chomp! - - found = 1 - - end - - # sometimes packager didn't package using the macros we give, extract from URL tag - if (found == 0 && l.index("Url:")) then - - # eg: "URL: https://code.google.com/p/log4go/"; - # "URL: http://download.fcitx-im.org/fcitx/fcitx"; - - # gsub - # 1. remove "Url:" then leading whitespace and ending "\n" - # 2. remove "http://"; or "https://"; - importpath = l.gsub(/Url:/,'').lstrip!.chomp!.gsub(/^(http|https)\:\/\//,'') - - end - - end - - end + # this funtion is used in golang.prov/req only + # called after %go_prep + # so the simplest method is to read /tmp/importpath.txt + return open("/tmp/importpath.txt","r:UTF-8").gets.strip! - # code.google.com/p/log4go/, remove the ending "/" - importpath = importpath.gsub(/\/$/,'') if importpath.index(/\/$/) - - return importpath - end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-14.9.0/golang-macros.rb new/golang-packaging-14.9.1/golang-macros.rb --- old/golang-packaging-14.9.0/golang-macros.rb 2016-04-17 16:35:38.000000000 +0200 +++ new/golang-packaging-14.9.1/golang-macros.rb 2016-06-08 12:36:28.000000000 +0200 @@ -170,9 +170,6 @@ end end - # remove previous created tmp file - File.delete("/tmp/importpath.txt") - puts "Source package created!" elsif ARGV[0] == "--fix" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-14.9.0/macros.go new/golang-packaging-14.9.1/macros.go --- old/golang-packaging-14.9.0/macros.go 2016-04-17 16:35:38.000000000 +0200 +++ new/golang-packaging-14.9.1/macros.go 2016-06-08 12:36:28.000000000 +0200 @@ -19,7 +19,7 @@ %go_tooldir %{_datadir}/go/pkg/tool/linux_%{go_arch} %go_exclusivearch \ -ExclusiveArch: aarch64 %ix86 x86_64 %arm ppc64 ppc64le +ExclusiveArch: aarch64 %ix86 x86_64 %arm ppc64 ppc64le s390x %go_provides \ %if 0%{?suse_version} <= 1110 \
