From 50ad7a8478742bc2d92777e05fcb8010411d13dbf25d4d43faf221a78d73e039 Mon Sep 17 00:00:00 2001 From: Flavio Castelli Date: Mon, 27 Feb 2017 11:25:45 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/golang-packaging?expand=0&rev=41 --- _service | 4 ++-- golang-packaging-14.9.2.tar.xz | 3 --- golang-packaging-15.0.0.tar.xz | 3 +++ golang-packaging.changes | 28 +++++++++++++++++++++++++--- golang-packaging.spec | 33 +++++++++++++++------------------ 5 files changed, 45 insertions(+), 26 deletions(-) delete mode 100644 golang-packaging-14.9.2.tar.xz create mode 100644 golang-packaging-15.0.0.tar.xz diff --git a/_service b/_service index ef3e5b4..e78768b 100644 --- a/_service +++ b/_service @@ -4,8 +4,8 @@ git golang-packaging .git - 14.9.2 - v14.9.2 + 15.0.0 + v15.0.0 enable diff --git a/golang-packaging-14.9.2.tar.xz b/golang-packaging-14.9.2.tar.xz deleted file mode 100644 index 496795f..0000000 --- a/golang-packaging-14.9.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8cea2cfd5e162cc0d58afe12365fd9ec7049bb15aa233cb719bb163151b3733f -size 18908 diff --git a/golang-packaging-15.0.0.tar.xz b/golang-packaging-15.0.0.tar.xz new file mode 100644 index 0000000..655c333 --- /dev/null +++ b/golang-packaging-15.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eef90a7b714b319ee932e0b858cef90113d5619cc99a13787354a7c564caa697 +size 15920 diff --git a/golang-packaging.changes b/golang-packaging.changes index 588215a..8780886 100644 --- a/golang-packaging.changes +++ b/golang-packaging.changes @@ -1,8 +1,30 @@ +------------------------------------------------------------------- +Wed Feb 15 16:07:57 UTC 2017 - thipp@suse.de + +- Update to version 15.0.0: + * [SLE11]some commands need time to finish, immediate close will get wrong status, so use timeout 30s + * [SLE]ditch named group in regexp in golang.req, the oniguruma in ruby 1.8.7 doesn't support named group + * fix a typo in cli.rb + * increate timeout to 300s or go install can't finish + * Remove runtime dependency for Go API + * simplify rpmsysinfo.rb + * release 14.9.1 + * Added go_nostrip macro + * Refactor using plain bash + * small fixes + +------------------------------------------------------------------- +Fri Jul 22 12:47:09 UTC 2016 - tboerger@suse.com + +- Added refactoring.patch while trying new code base +- Dropped the sed for static architecture detection +- Updated files list to reflect new file structure + ------------------------------------------------------------------- Fri Jul 8 16:51:28 UTC 2016 - i@marguerite.su - can't be noarch. we detected %%go_arch at build time. it has to be - architecture-dependent, or it'll be published randomly with one + architecture-dependent, or it'll be published randomly with one from i586/x86_64, whose content (/etc/rpm/macros.go) is unique. ------------------------------------------------------------------- @@ -108,7 +130,7 @@ Tue Jan 19 10:36:14 UTC 2016 - i@marguerite.su Mon Jan 11 11:19:26 UTC 2016 - i@marguerite.su - update version 14.2 - * golang.req: fix ' // indirect' comment in import + * golang.req: fix ' // indirect' comment in import ------------------------------------------------------------------- Mon Jan 11 02:06:17 UTC 2016 - i@marguerite.su @@ -212,7 +234,7 @@ Sat Jul 11 08:48:50 UTC 2015 - i@marguerite.su - update version 3 * skip *example*.go/*test*.go for Requires finding - * support alias format (import xx "xxx") for importpath + * support alias format (import xx "xxx") for importpath * add golang-strip-builddep, a tool to strip unneeded importpath from source codes diff --git a/golang-packaging.spec b/golang-packaging.spec index 11c6eed..310c9cb 100644 --- a/golang-packaging.spec +++ b/golang-packaging.spec @@ -1,7 +1,7 @@ # # spec file for package golang-packaging # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,56 +16,53 @@ # -%define version_unconverted 14.9.2 - Name: golang-packaging -Version: 14.9.2 +Version: 15.0.0 Release: 0 Summary: A toolchain to help packaging golang License: GPL-3.0 Group: Development/Languages/Golang Url: https://github.com/marguerite/%{name} Source: %{name}-%{version}.tar.xz + BuildRequires: rpm -BuildRequires: ruby BuildRequires: xz Requires: go -Requires: ruby BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description 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 %install mkdir -p %{buildroot}%{_sysconfdir}/rpm/ mkdir -p %{buildroot}%{_prefix}/lib/rpm/ + +install -m0755 golang.prov %{buildroot}%{_prefix}/lib/rpm/ +install -m0755 golang.req %{buildroot}%{_prefix}/lib/rpm/ +install -m0755 golang.sh %{buildroot}%{_prefix}/lib/rpm/ +install -m0644 macros.go %{buildroot}%{_sysconfdir}/rpm/ + %if 0%{?suse_version} >= 1320 mkdir -p %{buildroot}%{_prefix}/lib/rpm/fileattrs install -m0644 golang.attr %{buildroot}%{_prefix}/lib/rpm/fileattrs/ %endif -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-macros.rb %{buildroot}%{_prefix}/lib/rpm/ -install -m0644 macros.go %{buildroot}%{_sysconfdir}/rpm/ %files %defattr(-,root,root) -%doc COPYING README.md ChangeLog +%doc README.md CHANGELOG COPYING +%{_prefix}/lib/rpm/golang.prov +%{_prefix}/lib/rpm/golang.req +%{_prefix}/lib/rpm/golang.sh %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-macros.rb %changelog