From 91cded4b21e0d11d1f596a365aa4227e45bca64259c4c51c17d04e7a0f168112 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sat, 2 Jan 2016 17:33:34 +0000 Subject: [PATCH 1/3] Accepting request 351673 from home:MargueriteSu:branches:devel:languages:go OBS-URL: https://build.opensuse.org/request/show/351673 OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/golang-packaging?expand=0&rev=15 --- golang-packaging-10.tar.gz | 3 --- golang-packaging-11.tar.gz | 3 +++ golang-packaging.changes | 6 ++++++ golang-packaging.spec | 40 ++++++++++++++++++++------------------ 4 files changed, 30 insertions(+), 22 deletions(-) delete mode 100644 golang-packaging-10.tar.gz create mode 100644 golang-packaging-11.tar.gz diff --git a/golang-packaging-10.tar.gz b/golang-packaging-10.tar.gz deleted file mode 100644 index fc23a12..0000000 --- a/golang-packaging-10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c26d1745a8f13ba7f0fda7f2886e42e36394a7128d57ed4bb99c4fb874c6a3cc -size 15354 diff --git a/golang-packaging-11.tar.gz b/golang-packaging-11.tar.gz new file mode 100644 index 0000000..16a669b --- /dev/null +++ b/golang-packaging-11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:879cc6a93fdd2699d305d53e802af2c26aa2e78441c1459195a5412de8cf583d +size 15653 diff --git a/golang-packaging.changes b/golang-packaging.changes index 092b194..cbaa102 100644 --- a/golang-packaging.changes +++ b/golang-packaging.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jan 2 05:57:41 UTC 2016 - i@marguerite.su + +- update version 11 + * fix for sles and openSUSE < 13.2 + ------------------------------------------------------------------- Fri Sep 4 16:24:13 UTC 2015 - i@marguerite.su diff --git a/golang-packaging.spec b/golang-packaging.spec index 2bf229e..1ee12f3 100644 --- a/golang-packaging.spec +++ b/golang-packaging.spec @@ -1,7 +1,7 @@ # # spec file for package golang-packaging # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,22 +16,20 @@ # -%if %{?sles_version} -%define _rpmconfigdir %{_libexecdir}/rpm -%endif - Name: golang-packaging -Version: 10 +Version: 11 Release: 0 Summary: A toolchain to help packaging golang License: GPL-3.0 -Group: Development/Languages/Other +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 Requires: ruby -Requires: golang(API) = 1.5 +Requires: golang(API) = %{go_api_ver} BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description A toolchain to help packaging golang, written in ruby. @@ -43,20 +41,24 @@ A toolchain to help packaging golang, written in ruby. %install mkdir -p %{buildroot}%{_sysconfdir}/rpm/ -mkdir -p %{buildroot}%{_rpmconfigdir}/fileattrs -install -m0644 golang.attr %{buildroot}%{_rpmconfigdir}/fileattrs/ -install -m0755 golang.prov %{buildroot}%{_rpmconfigdir}/ -install -m0755 golang.req %{buildroot}%{_rpmconfigdir}/ -install -m0755 golang-strip-builddep %{buildroot}%{_rpmconfigdir}/ -install -m0644 macros.go-extra %{buildroot}%{_sysconfdir}/rpm/ +mkdir -p %{buildroot}%{_prefix}/lib/rpm/fileattrs +%if 0%{?suse_version} >= 1320 +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/ +install -m0755 golang-strip-builddep %{buildroot}%{_prefix}/lib/rpm/ +install -m0644 macros.golang-packaging %{buildroot}%{_sysconfdir}/rpm/ %files %defattr(-,root,root) %doc COPYING README.md TODO ChangeLog -%config %{_sysconfdir}/rpm/macros.go-extra -%{_rpmconfigdir}/fileattrs/golang.attr -%{_rpmconfigdir}/golang.prov -%{_rpmconfigdir}/golang.req -%{_rpmconfigdir}/golang-strip-builddep +%config %{_sysconfdir}/rpm/macros.golang-packaging +%if %{?suse_version} >= 1320 +%{_prefix}/lib/rpm/fileattrs/golang.attr +%endif +%{_prefix}/lib/rpm/golang.prov +%{_prefix}/lib/rpm/golang.req +%{_prefix}/lib/rpm/golang-strip-builddep %changelog From e08a38f10189ae1ec40c40372c7c6d88e2275e0efc353b6c73587f17182f1edc Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sun, 3 Jan 2016 11:25:01 +0000 Subject: [PATCH 2/3] Accepting request 351752 from home:MargueriteSu:branches:devel:languages:go OBS-URL: https://build.opensuse.org/request/show/351752 OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/golang-packaging?expand=0&rev=16 --- golang-packaging-11.tar.gz | 3 --- golang-packaging-12.tar.gz | 3 +++ golang-packaging.changes | 8 ++++++++ golang-packaging.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 golang-packaging-11.tar.gz create mode 100644 golang-packaging-12.tar.gz diff --git a/golang-packaging-11.tar.gz b/golang-packaging-11.tar.gz deleted file mode 100644 index 16a669b..0000000 --- a/golang-packaging-11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:879cc6a93fdd2699d305d53e802af2c26aa2e78441c1459195a5412de8cf583d -size 15653 diff --git a/golang-packaging-12.tar.gz b/golang-packaging-12.tar.gz new file mode 100644 index 0000000..905048b --- /dev/null +++ b/golang-packaging-12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e5f5206b4e43ac2ddcef2898060095c48aec77ad51a30298070cd19accc8a92 +size 15829 diff --git a/golang-packaging.changes b/golang-packaging.changes index cbaa102..662d769 100644 --- a/golang-packaging.changes +++ b/golang-packaging.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Jan 3 03:50:28 UTC 2016 - i@marguerite.su + +- update version 12 + * don't find provides/requires on -source, -debuginfo, -debugsource + subpackages + * add scripts to generate file lists. + ------------------------------------------------------------------- Sat Jan 2 05:57:41 UTC 2016 - i@marguerite.su diff --git a/golang-packaging.spec b/golang-packaging.spec index 1ee12f3..0937cb8 100644 --- a/golang-packaging.spec +++ b/golang-packaging.spec @@ -17,7 +17,7 @@ Name: golang-packaging -Version: 11 +Version: 12 Release: 0 Summary: A toolchain to help packaging golang License: GPL-3.0 From 8198a9f8ba19b294634efc9b41bbbea800e38e3df2ed26d0df787ee7d76e45da Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Mon, 4 Jan 2016 16:33:59 +0000 Subject: [PATCH 3/3] Accepting request 351930 from home:MargueriteSu:branches:devel:languages:go OBS-URL: https://build.opensuse.org/request/show/351930 OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/golang-packaging?expand=0&rev=17 --- golang-packaging-12.tar.gz | 3 --- golang-packaging-13.tar.gz | 3 +++ golang-packaging.changes | 11 +++++++++++ golang-packaging.spec | 7 +++++-- 4 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 golang-packaging-12.tar.gz create mode 100644 golang-packaging-13.tar.gz diff --git a/golang-packaging-12.tar.gz b/golang-packaging-12.tar.gz deleted file mode 100644 index 905048b..0000000 --- a/golang-packaging-12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e5f5206b4e43ac2ddcef2898060095c48aec77ad51a30298070cd19accc8a92 -size 15829 diff --git a/golang-packaging-13.tar.gz b/golang-packaging-13.tar.gz new file mode 100644 index 0000000..b4947fb --- /dev/null +++ b/golang-packaging-13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4dc543a3c6444b16c5d2193a366b8bffd90340d74dc4de0f2452ade5eba10ba +size 19055 diff --git a/golang-packaging.changes b/golang-packaging.changes index 662d769..6985002 100644 --- a/golang-packaging.changes +++ b/golang-packaging.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jan 4 01:52:15 UTC 2016 - i@marguerite.su + +- update version 13 + * provides the importpath itself + * fix regex not to check files like .golden in -source + * 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. + ------------------------------------------------------------------- Sun Jan 3 03:50:28 UTC 2016 - i@marguerite.su diff --git a/golang-packaging.spec b/golang-packaging.spec index 0937cb8..1714bcd 100644 --- a/golang-packaging.spec +++ b/golang-packaging.spec @@ -17,7 +17,7 @@ Name: golang-packaging -Version: 12 +Version: 13 Release: 0 Summary: A toolchain to help packaging golang License: GPL-3.0 @@ -41,12 +41,14 @@ A toolchain to help packaging golang, written in ruby. %install mkdir -p %{buildroot}%{_sysconfdir}/rpm/ -mkdir -p %{buildroot}%{_prefix}/lib/rpm/fileattrs +mkdir -p %{buildroot}%{_prefix}/lib/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-strip-builddep %{buildroot}%{_prefix}/lib/rpm/ install -m0644 macros.golang-packaging %{buildroot}%{_sysconfdir}/rpm/ @@ -57,6 +59,7 @@ install -m0644 macros.golang-packaging %{buildroot}%{_sysconfdir}/rpm/ %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