Hello community, here is the log from the commit of package golang-packaging for openSUSE:Factory checked in at 2015-07-25 07:44:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-07-16 17:18:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.golang-packaging.new/golang-packaging.changes 2015-07-25 07:44:33.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Jul 24 01:44:47 UTC 2015 - [email protected] + +- update version 6 + * fix golang.req to not treat a sentence as importpath + * fix golang.attr to correctly detect /usr/bin/* + +------------------------------------------------------------------- +Wed Jul 22 14:56:07 UTC 2015 - [email protected] + +- update version 5 + * if a sub-directory doesn't contain any *.go file, do not + treat it as a Provides candidate. + * add /usr/bin to golang.attr for go executes to be handled + by golang-packaging + +------------------------------------------------------------------- Old: ---- golang-packaging-4.tar.gz New: ---- golang-packaging-6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golang-packaging.spec ++++++ --- /var/tmp/diff_new_pack.bFjflc/_old 2015-07-25 07:44:34.000000000 +0200 +++ /var/tmp/diff_new_pack.bFjflc/_new 2015-07-25 07:44:34.000000000 +0200 @@ -16,8 +16,12 @@ # +%if %{?sles_version} +%define _rpmconfigdir %{_libexecdir}/rpm +%endif + Name: golang-packaging -Version: 4 +Version: 6 Release: 0 Summary: A toolchain to help packaging golang License: GPL-3.0 @@ -25,8 +29,8 @@ Url: https://github.com/marguerite/%{name} Source: https://github.com/marguerite/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: rpm -Requires: golang(API) Requires: ruby +Requires: golang(API) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ golang-packaging-4.tar.gz -> golang-packaging-6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-4/ChangeLog new/golang-packaging-6/ChangeLog --- old/golang-packaging-4/ChangeLog 2015-07-12 12:28:42.000000000 +0200 +++ new/golang-packaging-6/ChangeLog 2015-07-24 03:40:05.000000000 +0200 @@ -1,10 +1,25 @@ +== Version 5 == + + * if a sub-directory doesn't contain any *.go file, do not + treat it as a Provides candidate. + * add /usr/bin to golang.attr for go executes to be handled + by golang-packaging + +== Version 4 == + + * fix encoding error in golang-strip-builddep + * add macros.go-extra, extra golang macros for packaging + == Version 3 == -* skip *example*.go/*test*.go for Requires finding -* support alias format (import xx "xxx") for importpath -* add golang-strip-builddep, a tool to strip unneeded importpath from source codes + + * skip *example*.go/*test*.go for Requires finding + * support alias format (import xx "xxx") for importpath + * add golang-strip-builddep, a tool to strip unneeded importpath from source codes == Version 2 == -* fix pkgname detection + + * fix pkgname detection == Version 1 == -* implement Requires/Provides + + * implement Requires/Provides diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-4/golang.attr new/golang-packaging-6/golang.attr --- old/golang-packaging-4/golang.attr 2015-07-12 12:28:42.000000000 +0200 +++ new/golang-packaging-6/golang.attr 2015-07-24 03:40:05.000000000 +0200 @@ -1,3 +1,4 @@ +ndir}/*|/usr/lib(64)?/go/contrib/pkg/linux_(386|amd64)/.*\\.a)$ %__golang_requires %{_rpmconfigdir}/golang.req %__golang_provides %{_rpmconfigdir}/golang.prov -%__golang_path ^/usr/lib(64)?/go/contrib/pkg/linux_(386|amd64)/.*\\.a$ +%__golang_path ^(/usr/lib(64)?/go/contrib/pkg/linux_(386|amd64)/.*\\.a|%{_bindir}/.*)$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-4/golang.prov new/golang-packaging-6/golang.prov --- old/golang-packaging-4/golang.prov 2015-07-12 12:28:42.000000000 +0200 +++ new/golang-packaging-6/golang.prov 2015-07-24 03:40:05.000000000 +0200 @@ -13,11 +13,11 @@ build_found = 0 - if l.index("Source:") then + if l.index(/Source(0)?:/) then unless l.index("%{name}") then - pkgname = l.gsub(/Source:/,'').lstrip!.chomp!.gsub(/^.*\//,'').gsub(/-%.*$/,'') + pkgname = l.gsub(/Source(0)?:/,'').lstrip!.chomp!.gsub(/^.*\//,'').gsub(/-%.*$/,'') build_found = 1 @@ -66,7 +66,7 @@ end build = Dir.glob("/home/abuild/rpmbuild/BUILD/*#{pkgname}*")[0] - #build = Dir.glob(`pwd`.gsub(/\n/,'') + "/*#{pkgname}*")[0] + #build = Dir.glob(`pwd`.gsub(/\n/,'') + "/*#{pkgname}*/")[0] return importpath,build,version @@ -82,7 +82,7 @@ if File.directory?("#{dir}/#{d}") then - result << "#{dir}/#{d}" + result << "#{dir}/#{d}" if ! Dir["#{dir}/#{d}/*.go"].empty? all_dir("#{dir}/#{d}",result) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-4/golang.req new/golang-packaging-6/golang.req --- old/golang-packaging-4/golang.req 2015-07-12 12:28:42.000000000 +0200 +++ new/golang-packaging-6/golang.req 2015-07-24 03:40:05.000000000 +0200 @@ -15,11 +15,11 @@ build_found = 0 - if l.index("Source:") then + if l.index(/Source(0)?:/) then unless l.index("%{name}") then - pkgname = l.gsub(/Source:/,'').lstrip!.chomp!.gsub(/^.*\//,'').gsub(/-%.*$/,'') + pkgname = l.gsub(/Source(0)?:/,'').lstrip!.chomp!.gsub(/^.*\//,'').gsub(/-%.*$/,'') build_found = 1 @@ -38,7 +38,7 @@ end build = Dir.glob("/home/abuild/rpmbuild/BUILD/*#{pkgname}*")[0] - #build = Dir.glob(path + "/*#{pkgname}*")[0] + #build = Dir.glob(path + "/*#{pkgname}*/")[0] return build @@ -112,7 +112,9 @@ imports.each do |i| - list << i if ( i.index(/(\.com|\.net|\.org)/) && ! i.index(own) ) + # .com|.net|.org matches all URL, own strips its own url, [\s] (whitespace) + # guarantees it doens't match a sentence like comments + list << i if ( i.index(/(\.com|\.net|\.org)/) && ! i.index(own) && ! i.index(/[\s]/) ) end
