Accepting request 352802 from home:MargueriteSu:branches:devel:languages:go

OBS-URL: https://build.opensuse.org/request/show/352802
OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/golang-packaging?expand=0&rev=18

golang-packaging-13.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4dc543a3c6444b16c5d2193a366b8bffd90340d74dc4de0f2452ade5eba10ba
-size 19055

golang-packaging-14.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8b9fc021542aa34d3f4bc40a5725c7fdba2f53d39fff4b438289061014e618a
+size 19868

golang-packaging.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Jan  5 12:09:20 UTC 2016 - i@marguerite.su
+
+- update version 14
+  * if importpath has "test/example", it should survive (github#5)
+  * merge macros.go from openSUSE's go here
+  * add golang-macros.rb, replacement for the complicated
+    macros in shell in macros.go
+  * golang-macros.rb:
+    + support build with fake build id
+    + support build with custom tags (github#7)
+    + support pass any -<arg>="a b c" or -<arg>=<value>
+      to go install, shared build is possible now
+      (not fully support, other macros need to be adapted)
+    + --filelist, to generate filelist used in %files
+      section with excluding support
+    + use IO.popen to break the build at the exact place
+      it fails (github#6)
+
 -------------------------------------------------------------------
 Mon Jan  4 01:52:15 UTC 2016 - i@marguerite.su
 
@@ -7,7 +26,7 @@ Mon Jan  4 01:52:15 UTC 2016 - i@marguerite.su
   * filter "test/example" from Provides
   * split common stuff to a module golang/rpmsysinfo.rb
   * rewrite golang.req, now read from stdin RPM feeds,
-    and check __.PKGDEF from .a files for "import"s.
+    and check __.PKGDEF from .a files for "import"s. (github#3, github#4)
 
 -------------------------------------------------------------------
 Sun Jan  3 03:50:28 UTC 2016 - i@marguerite.su

golang-packaging.spec

@@ -17,17 +17,17 @@
 
 
 Name:           golang-packaging
-Version:        13
+Version:        14
 Release:        0
 Summary:        A toolchain to help packaging golang
 License:        GPL-3.0
 Group:          Development/Languages/Golang
 Url:            https://github.com/marguerite/%{name}
 Source:         https://github.com/marguerite/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
-BuildRequires:  go
 BuildRequires:  rpm
+BuildRequires:  ruby
+Requires:       go
 Requires:       ruby
-Requires:       golang(API) = %{go_api_ver}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -36,6 +36,8 @@ A toolchain to help packaging golang, written in ruby.
 
 %prep
 %setup -q
+GOARCH=`ruby ./golang-macros.rb --arch`
+sed -i "s/GOARCH/$GOARCH/" macros.go
 
 %build
 
@@ -49,19 +51,19 @@ install -m0644 golang.attr %{buildroot}%{_prefix}/lib/rpm/fileattrs/
 install -m0755 golang.prov %{buildroot}%{_prefix}/lib/rpm/
 install -m0755 golang.req %{buildroot}%{_prefix}/lib/rpm/
 cp -r golang %{buildroot}%{_prefix}/lib/rpm/
-install -m0755 golang-strip-builddep %{buildroot}%{_prefix}/lib/rpm/
-install -m0644 macros.golang-packaging %{buildroot}%{_sysconfdir}/rpm/
+install -m0755 golang-macros.rb %{buildroot}%{_prefix}/lib/rpm/
+install -m0644 macros.go %{buildroot}%{_sysconfdir}/rpm/
 
 %files
 %defattr(-,root,root)
 %doc COPYING README.md TODO ChangeLog
-%config %{_sysconfdir}/rpm/macros.golang-packaging
+%config %{_sysconfdir}/rpm/macros.go
 %if %{?suse_version} >= 1320
 %{_prefix}/lib/rpm/fileattrs/golang.attr
 %endif
 %{_prefix}/lib/rpm/golang
 %{_prefix}/lib/rpm/golang.prov
 %{_prefix}/lib/rpm/golang.req
-%{_prefix}/lib/rpm/golang-strip-builddep
+%{_prefix}/lib/rpm/golang-macros.rb
 
 %changelog