[golang-github-emicklei-go-restful/f21] update to the latest commit 692a50017a7049b26cf7ea4ccfc0d8c77369a793 - related: #1164152
by Jan Chaloupka
commit a3e8438f1071d473c66389e468fc040b33884bd9
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Dec 10 16:58:02 2014 +0100
update to the latest commit 692a50017a7049b26cf7ea4ccfc0d8c77369a793
- related: #1164152
.gitignore | 2 +-
golang-github-emicklei-go-restful.spec | 8 ++++++--
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2f32626..76f2d0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/go-restful-ad99b12.tar.gz
+/go-restful-692a500.tar.gz
diff --git a/golang-github-emicklei-go-restful.spec b/golang-github-emicklei-go-restful.spec
index 280310a..fada519 100644
--- a/golang-github-emicklei-go-restful.spec
+++ b/golang-github-emicklei-go-restful.spec
@@ -4,12 +4,12 @@
%global project emicklei
%global repo go-restful
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit ad99b12d8d5917a59c03085cbeae1af8d2fc275a
+%global commit 692a50017a7049b26cf7ea4ccfc0d8c77369a793
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.1.git%{shortcommit}%{?dist}
+Release: 0.2.git%{shortcommit}%{?dist}
Summary: Package for building REST-style Web Services using Google Go
License: MIT
URL: https://%{import_path}
@@ -63,6 +63,10 @@ GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}
%{gopath}/src/%{import_path}
%changelog
+* Wed Dec 10 2014 jchaloup <jchaloup(a)redhat.com> - 0-0.2.git692a500
+- update to the latest commit 692a50017a7049b26cf7ea4ccfc0d8c77369a793
+ related: #1164152
+
* Fri Nov 14 2014 jchaloup <jchaloup(a)redhat.com> - 0-0.1.gitad99b12
- First package for Fedora
resolves: #1164152
diff --git a/sources b/sources
index d3a7211..418daa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d22e196df9928632a554b82c87e87fda go-restful-ad99b12.tar.gz
+fc19f5328575efdca921667fd277c118 go-restful-692a500.tar.gz
9 years, 4 months
[golang-github-emicklei-go-restful/f20] update to the latest commit 692a50017a7049b26cf7ea4ccfc0d8c77369a793 - related: #1164152
by Jan Chaloupka
commit 66dee87df22c31be3a2caa3e9ba438bb0e972dbe
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Dec 10 16:58:02 2014 +0100
update to the latest commit 692a50017a7049b26cf7ea4ccfc0d8c77369a793
- related: #1164152
.gitignore | 2 +-
golang-github-emicklei-go-restful.spec | 8 ++++++--
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2f32626..76f2d0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/go-restful-ad99b12.tar.gz
+/go-restful-692a500.tar.gz
diff --git a/golang-github-emicklei-go-restful.spec b/golang-github-emicklei-go-restful.spec
index 280310a..fada519 100644
--- a/golang-github-emicklei-go-restful.spec
+++ b/golang-github-emicklei-go-restful.spec
@@ -4,12 +4,12 @@
%global project emicklei
%global repo go-restful
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit ad99b12d8d5917a59c03085cbeae1af8d2fc275a
+%global commit 692a50017a7049b26cf7ea4ccfc0d8c77369a793
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.1.git%{shortcommit}%{?dist}
+Release: 0.2.git%{shortcommit}%{?dist}
Summary: Package for building REST-style Web Services using Google Go
License: MIT
URL: https://%{import_path}
@@ -63,6 +63,10 @@ GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}
%{gopath}/src/%{import_path}
%changelog
+* Wed Dec 10 2014 jchaloup <jchaloup(a)redhat.com> - 0-0.2.git692a500
+- update to the latest commit 692a50017a7049b26cf7ea4ccfc0d8c77369a793
+ related: #1164152
+
* Fri Nov 14 2014 jchaloup <jchaloup(a)redhat.com> - 0-0.1.gitad99b12
- First package for Fedora
resolves: #1164152
diff --git a/sources b/sources
index d3a7211..418daa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d22e196df9928632a554b82c87e87fda go-restful-ad99b12.tar.gz
+fc19f5328575efdca921667fd277c118 go-restful-692a500.tar.gz
9 years, 4 months
[golang-gopkg-check/el6] Obsolete golang-launchpad-gocheck-devel with devel subpackage - related: #1151779
by Jan Chaloupka
commit ea0ab92d74059d809a9cf819f000975fd44f2739
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Tue Dec 9 18:00:37 2014 +0100
Obsolete golang-launchpad-gocheck-devel with devel subpackage
- related: #1151779
golang-gopkg-check.spec | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/golang-gopkg-check.spec b/golang-gopkg-check.spec
index 85e8f51..9644780 100644
--- a/golang-gopkg-check.spec
+++ b/golang-gopkg-check.spec
@@ -11,7 +11,7 @@
Name: golang-gopkg-%{repo}
Version: 0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Rich testing for the Go language
License: BSD
# gopkg.in/check.v1
@@ -29,6 +29,7 @@ Requires: golang >= 1.2.1-3
Summary: %{summary}
Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path_sec}) = %{version}-%{release}
+Obsoletes: golang-launchpad-gocheck-devel
%description devel
%{summary}
@@ -48,7 +49,7 @@ install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/
cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path_sec}/
%check
-GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}
+#GOPATH={buildroot}{gopath}:{gopath} go test {import_path}
%files devel
%doc LICENSE README.md
@@ -61,5 +62,9 @@ GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}
%{gopath}/src/%{import_path_sec}/*.go
%changelog
+* Tue Dec 09 2014 jchaloup <jchaloup(a)redhat.com> - 0-2
+- Obsolete golang-launchpad-gocheck-devel with devel subpackage
+ related: #1151779
+
* Fri Oct 10 2014 Jan Chaloupka <jchaloup(a)redhat.com> - 0-1
- First package for Fedora
9 years, 4 months
[golang-gopkg-check] Obsolete golang-launchpad-gocheck-devel with devel subpackage - related: #1151779
by Jan Chaloupka
commit 8c181f2baf4e24afdb4eef9e8e63f999dd4cf2a6
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Tue Dec 9 18:00:37 2014 +0100
Obsolete golang-launchpad-gocheck-devel with devel subpackage
- related: #1151779
golang-gopkg-check.spec | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/golang-gopkg-check.spec b/golang-gopkg-check.spec
index c8dffed..fb5a1ae 100644
--- a/golang-gopkg-check.spec
+++ b/golang-gopkg-check.spec
@@ -11,7 +11,7 @@
Name: golang-gopkg-%{repo}
Version: 0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Rich testing for the Go language
License: BSD
# gopkg.in/check.v1
@@ -30,6 +30,7 @@ Requires: golang >= 1.2.1-3
Summary: %{summary}
Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path_sec}) = %{version}-%{release}
+Obsoletes: golang-launchpad-gocheck-devel
%description devel
%{summary}
@@ -49,7 +50,7 @@ install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/
cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path_sec}/
%check
-GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}
+#GOPATH={buildroot}{gopath}:{gopath} go test {import_path}
%files devel
%doc LICENSE README.md
@@ -62,5 +63,9 @@ GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}
%{gopath}/src/%{import_path_sec}/*.go
%changelog
+* Tue Dec 09 2014 jchaloup <jchaloup(a)redhat.com> - 0-2
+- Obsolete golang-launchpad-gocheck-devel with devel subpackage
+ related: #1151779
+
* Fri Oct 10 2014 Jan Chaloupka <jchaloup(a)redhat.com> - 0-1
- First package for Fedora
9 years, 4 months
[golang-gopkg-check/f21] Obsolete golang-launchpad-gocheck-devel with devel subpackage - related: #1151779
by Jan Chaloupka
commit 557bf42d1f6fd9cfc6f217dfa331cba68952bf55
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Tue Dec 9 18:00:37 2014 +0100
Obsolete golang-launchpad-gocheck-devel with devel subpackage
- related: #1151779
golang-gopkg-check.spec | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/golang-gopkg-check.spec b/golang-gopkg-check.spec
index c8dffed..fb5a1ae 100644
--- a/golang-gopkg-check.spec
+++ b/golang-gopkg-check.spec
@@ -11,7 +11,7 @@
Name: golang-gopkg-%{repo}
Version: 0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Rich testing for the Go language
License: BSD
# gopkg.in/check.v1
@@ -30,6 +30,7 @@ Requires: golang >= 1.2.1-3
Summary: %{summary}
Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path_sec}) = %{version}-%{release}
+Obsoletes: golang-launchpad-gocheck-devel
%description devel
%{summary}
@@ -49,7 +50,7 @@ install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/
cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path_sec}/
%check
-GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}
+#GOPATH={buildroot}{gopath}:{gopath} go test {import_path}
%files devel
%doc LICENSE README.md
@@ -62,5 +63,9 @@ GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}
%{gopath}/src/%{import_path_sec}/*.go
%changelog
+* Tue Dec 09 2014 jchaloup <jchaloup(a)redhat.com> - 0-2
+- Obsolete golang-launchpad-gocheck-devel with devel subpackage
+ related: #1151779
+
* Fri Oct 10 2014 Jan Chaloupka <jchaloup(a)redhat.com> - 0-1
- First package for Fedora
9 years, 4 months
[golang-gopkg-check/f20] Obsolete golang-launchpad-gocheck-devel with devel subpackage - related: #1151779
by Jan Chaloupka
commit c3094f7b48d9405c0f7636385d94a80d5b657e32
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Tue Dec 9 18:00:37 2014 +0100
Obsolete golang-launchpad-gocheck-devel with devel subpackage
- related: #1151779
golang-gopkg-check.spec | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/golang-gopkg-check.spec b/golang-gopkg-check.spec
index c8dffed..fb5a1ae 100644
--- a/golang-gopkg-check.spec
+++ b/golang-gopkg-check.spec
@@ -11,7 +11,7 @@
Name: golang-gopkg-%{repo}
Version: 0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Rich testing for the Go language
License: BSD
# gopkg.in/check.v1
@@ -30,6 +30,7 @@ Requires: golang >= 1.2.1-3
Summary: %{summary}
Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path_sec}) = %{version}-%{release}
+Obsoletes: golang-launchpad-gocheck-devel
%description devel
%{summary}
@@ -49,7 +50,7 @@ install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/
cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path_sec}/
%check
-GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}
+#GOPATH={buildroot}{gopath}:{gopath} go test {import_path}
%files devel
%doc LICENSE README.md
@@ -62,5 +63,9 @@ GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}
%{gopath}/src/%{import_path_sec}/*.go
%changelog
+* Tue Dec 09 2014 jchaloup <jchaloup(a)redhat.com> - 0-2
+- Obsolete golang-launchpad-gocheck-devel with devel subpackage
+ related: #1151779
+
* Fri Oct 10 2014 Jan Chaloupka <jchaloup(a)redhat.com> - 0-1
- First package for Fedora
9 years, 4 months
[golang-gopkg-yaml/el6] Update to gopkg.in/check.v2 but still provide gopkg.in/check.v1 - related: #1141875
by Jan Chaloupka
commit 9d0e80deb513bb560b495f7ef01558fff2a9dfeb
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Dec 10 12:20:06 2014 +0100
Update to gopkg.in/check.v2 but still provide gopkg.in/check.v1
- related: #1141875
.gitignore | 1 +
golang-gopkg-yaml.spec | 79 ++++++++++++++++++++++++++++++++++++++++++-----
sources | 1 +
3 files changed, 72 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 55ac9b7..93af28c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/yaml-1b9791953ba4027efaeb728c7355e542a203be5e.tar.gz
+/yaml-d466437aa4adc35830964cffc5b5f262c63ddcb4.tar.gz
diff --git a/golang-gopkg-yaml.spec b/golang-gopkg-yaml.spec
index 3752328..3023dbc 100644
--- a/golang-gopkg-yaml.spec
+++ b/golang-gopkg-yaml.spec
@@ -1,16 +1,28 @@
%global debug_package %{nil}
-%global commit 1b9791953ba4027efaeb728c7355e542a203be5e
+%global commit d466437aa4adc35830964cffc5b5f262c63ddcb4
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global import_path gopkg.in/v1/yaml
+%global import_path gopkg.in/v2/yaml
+%global import_path_sec gopkg.in/yaml.v2
+
+%global v1_commit 1b9791953ba4027efaeb728c7355e542a203be5e
+%global v1_shortcommit %(c=%{v1_commit}; echo ${c:0:7})
+%global v1_import_path gopkg.in/v1/yaml
+%global v1_import_path_sec gopkg.in/yaml.v1
+
Name: golang-gopkg-yaml
Version: 1
-Release: 3%{?dist}
+Release: 5%{?dist}
Summary: Enables Go programs to comfortably encode and decode YAML values
License: LGPLv3 with exceptions
URL: http://%{import_path}
Source0: https://github.com/go-yaml/yaml/archive/%{commit}/yaml-%{commit}.tar.gz
+Source1: https://github.com/go-yaml/yaml/archive/%{v1_commit}/yaml-%{v1_commit}.ta...
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+BuildArch: noarch
+%else
ExclusiveArch: %{ix86} x86_64 %{arm}
+%endif
%description
%{summary}
@@ -19,11 +31,10 @@ ExclusiveArch: %{ix86} x86_64 %{arm}
BuildRequires: golang >= 1.2.1-3
Requires: golang >= 1.2.1-3
Summary: Enables Go programs to comfortably encode and decode YAML values
-Provides: golang(%{import_path}) = %{version}-%{release}
+Provides: golang(%{v1_import_path}) = %{version}-%{release}
+Provides: golang(%{v1_import_path_sec}) = %{version}-%{release}
%description devel
-%{summary}
-
The yaml package enables Go programs to comfortably encode and decode YAML
values. It was developed within Canonical as part of the juju project, and
is based on a pure Go port of the well-known libyaml C library to parse and
@@ -34,23 +45,73 @@ anchors, tags, etc. There are still a few missing bits, such as document
merging, base-60 floats (huh?), and multi-document unmarshalling. These
features are not hard to add, and will be introduced as necessary.
+%package devel-v2
+BuildRequires: golang >= 1.2.1-3
+BuildRequires: golang(gopkg.in/check.v1)
+Requires: golang >= 1.2.1-3
+Summary: Enables Go programs to comfortably encode and decode YAML values
+Provides: golang(%{import_path}) = %{version}-%{release}
+Provides: golang(%{import_path_sec}) = %{version}-%{release}
+
+%description devel-v2
+The yaml package enables Go programs to comfortably encode and decode YAML
+values. It was developed within Canonical as part of the juju project, and
+is based on a pure Go port of the well-known libyaml C library to parse and
+generate YAML data quickly and reliably.
+
+The yaml package supports most of YAML 1.1 and 1.2,
+including support for anchors, tags, map merging, etc.
+Multi-document unmarshalling is not yet implemented, and base-60 floats
+from YAML 1.1 are purposefully not supported since they're a poor design
+ and are gone in YAML 1.2.
+
+
%prep
%setup -n yaml-%{commit} -q
+%setup -n yaml-%{v1_commit} -T -b 1
%build
%install
+install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path}/
+cp -pav *.go %{buildroot}/%{gopath}/src/%{v1_import_path}/
+install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/
+cp -pav *.go %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/
+
+pushd ../yaml-%{commit}
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path}/
+install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/
+cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path_sec}/
+popd
+
+%check
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{v1_import_path_sec}
+pushd ../yaml-%{v1_commit}
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path_sec}
+popd
%files devel
%doc LICENSE LICENSE.libyaml README.md
-%dir %{gopath}/src/gopkg.in
%dir %{gopath}/src/gopkg.in/v1
-%dir %{gopath}/src/%{import_path}
-%{gopath}/src/%{import_path}/*.go
+%{gopath}/src/%{v1_import_path}
+%{gopath}/src/%{v1_import_path_sec}
+
+%files devel-v2
+%doc LICENSE LICENSE.libyaml README.md
+%dir %{gopath}/src/gopkg.in/v2
+%{gopath}/src/%{import_path}
+%{gopath}/src/%{import_path_sec}
%changelog
+* Wed Dec 10 2014 jchaloup <jchaloup(a)redhat.com> - 1-5
+- Update to gopkg.in/check.v2 but still provide gopkg.in/check.v1
+ related: #1141875
+
+* Fri Oct 10 2014 jchaloup <jchaloup(a)redhat.com> - 1-4
+- Adding go test and deps on gopkg.in/check.v1
+- Adding another Provides
+
* Mon Sep 15 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1-3
- Resolves: rhbz#1141875 - newpackage
- no debug_package
diff --git a/sources b/sources
index 2d759f6..da65a5d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
db4790a1e1c2ce0ce068434efb4f01dc yaml-1b9791953ba4027efaeb728c7355e542a203be5e.tar.gz
+2f235793d937f59e262c95f8b4b46813 yaml-d466437aa4adc35830964cffc5b5f262c63ddcb4.tar.gz
9 years, 4 months
[golang-gopkg-yaml] Update to gopkg.in/check.v2 but still provide gopkg.in/check.v1 - related: #1141875
by Jan Chaloupka
commit df31fe63d6361b787f158a243fa5db5e270a8fda
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Dec 10 12:20:06 2014 +0100
Update to gopkg.in/check.v2 but still provide gopkg.in/check.v1
- related: #1141875
.gitignore | 1 +
golang-gopkg-yaml.spec | 74 +++++++++++++++++++++++++++++++++++++++--------
sources | 1 +
3 files changed, 63 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 55ac9b7..93af28c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/yaml-1b9791953ba4027efaeb728c7355e542a203be5e.tar.gz
+/yaml-d466437aa4adc35830964cffc5b5f262c63ddcb4.tar.gz
diff --git a/golang-gopkg-yaml.spec b/golang-gopkg-yaml.spec
index 4861d8c..7445da2 100644
--- a/golang-gopkg-yaml.spec
+++ b/golang-gopkg-yaml.spec
@@ -1,17 +1,28 @@
%global debug_package %{nil}
-%global commit 1b9791953ba4027efaeb728c7355e542a203be5e
+%global commit d466437aa4adc35830964cffc5b5f262c63ddcb4
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global import_path gopkg.in/v1/yaml
-%global import_path_sec gopkg.in/yaml.v1
+%global import_path gopkg.in/v2/yaml
+%global import_path_sec gopkg.in/yaml.v2
+
+%global v1_commit 1b9791953ba4027efaeb728c7355e542a203be5e
+%global v1_shortcommit %(c=%{v1_commit}; echo ${c:0:7})
+%global v1_import_path gopkg.in/v1/yaml
+%global v1_import_path_sec gopkg.in/yaml.v1
+
Name: golang-gopkg-yaml
Version: 1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Enables Go programs to comfortably encode and decode YAML values
License: LGPLv3 with exceptions
URL: http://%{import_path}
Source0: https://github.com/go-yaml/yaml/archive/%{commit}/yaml-%{commit}.tar.gz
+Source1: https://github.com/go-yaml/yaml/archive/%{v1_commit}/yaml-%{v1_commit}.ta...
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
BuildArch: noarch
+%else
+ExclusiveArch: %{ix86} x86_64 %{arm}
+%endif
%description
%{summary}
@@ -21,12 +32,10 @@ BuildRequires: golang >= 1.2.1-3
BuildRequires: golang(gopkg.in/check.v1)
Requires: golang >= 1.2.1-3
Summary: Enables Go programs to comfortably encode and decode YAML values
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path_sec}) = %{version}-%{release}
+Provides: golang(%{v1_import_path}) = %{version}-%{release}
+Provides: golang(%{v1_import_path_sec}) = %{version}-%{release}
%description devel
-%{summary}
-
The yaml package enables Go programs to comfortably encode and decode YAML
values. It was developed within Canonical as part of the juju project, and
is based on a pure Go port of the well-known libyaml C library to parse and
@@ -37,30 +46,69 @@ anchors, tags, etc. There are still a few missing bits, such as document
merging, base-60 floats (huh?), and multi-document unmarshalling. These
features are not hard to add, and will be introduced as necessary.
+%package devel-v2
+BuildRequires: golang >= 1.2.1-3
+BuildRequires: golang(gopkg.in/check.v1)
+Requires: golang >= 1.2.1-3
+Summary: Enables Go programs to comfortably encode and decode YAML values
+Provides: golang(%{import_path}) = %{version}-%{release}
+Provides: golang(%{import_path_sec}) = %{version}-%{release}
+
+%description devel-v2
+The yaml package enables Go programs to comfortably encode and decode YAML
+values. It was developed within Canonical as part of the juju project, and
+is based on a pure Go port of the well-known libyaml C library to parse and
+generate YAML data quickly and reliably.
+
+The yaml package supports most of YAML 1.1 and 1.2,
+including support for anchors, tags, map merging, etc.
+Multi-document unmarshalling is not yet implemented, and base-60 floats
+from YAML 1.1 are purposefully not supported since they're a poor design
+ and are gone in YAML 1.2.
+
+
%prep
%setup -n yaml-%{commit} -q
+%setup -n yaml-%{v1_commit} -T -b 1
%build
%install
+install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path}/
+cp -pav *.go %{buildroot}/%{gopath}/src/%{v1_import_path}/
+install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/
+cp -pav *.go %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/
+
+pushd ../yaml-%{commit}
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path}/
install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/
cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path_sec}/
+popd
%check
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{v1_import_path_sec}
+pushd ../yaml-%{v1_commit}
GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path_sec}
+popd
%files devel
%doc LICENSE LICENSE.libyaml README.md
-%dir %{gopath}/src/gopkg.in
%dir %{gopath}/src/gopkg.in/v1
-%dir %{gopath}/src/%{import_path}
-%dir %{gopath}/src/%{import_path_sec}
-%{gopath}/src/%{import_path}/*.go
-%{gopath}/src/%{import_path_sec}/*.go
+%{gopath}/src/%{v1_import_path}
+%{gopath}/src/%{v1_import_path_sec}
+
+%files devel-v2
+%doc LICENSE LICENSE.libyaml README.md
+%dir %{gopath}/src/gopkg.in/v2
+%{gopath}/src/%{import_path}
+%{gopath}/src/%{import_path_sec}
%changelog
+* Wed Dec 10 2014 jchaloup <jchaloup(a)redhat.com> - 1-5
+- Update to gopkg.in/check.v2 but still provide gopkg.in/check.v1
+ related: #1141875
+
* Fri Oct 10 2014 jchaloup <jchaloup(a)redhat.com> - 1-4
- Adding go test and deps on gopkg.in/check.v1
- Adding another Provides
diff --git a/sources b/sources
index 2d759f6..da65a5d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
db4790a1e1c2ce0ce068434efb4f01dc yaml-1b9791953ba4027efaeb728c7355e542a203be5e.tar.gz
+2f235793d937f59e262c95f8b4b46813 yaml-d466437aa4adc35830964cffc5b5f262c63ddcb4.tar.gz
9 years, 4 months
[golang-gopkg-yaml/f21] Update to gopkg.in/check.v2 but still provide gopkg.in/check.v1 - related: #1141875
by Jan Chaloupka
commit ff086dbe815205e0eafd1557d7854d0fb9bbc8e8
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Dec 10 12:20:06 2014 +0100
Update to gopkg.in/check.v2 but still provide gopkg.in/check.v1
- related: #1141875
.gitignore | 1 +
golang-gopkg-yaml.spec | 79 ++++++++++++++++++++++++++++++++++++++++++-----
sources | 1 +
3 files changed, 72 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 55ac9b7..93af28c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/yaml-1b9791953ba4027efaeb728c7355e542a203be5e.tar.gz
+/yaml-d466437aa4adc35830964cffc5b5f262c63ddcb4.tar.gz
diff --git a/golang-gopkg-yaml.spec b/golang-gopkg-yaml.spec
index 1c940f8..3023dbc 100644
--- a/golang-gopkg-yaml.spec
+++ b/golang-gopkg-yaml.spec
@@ -1,16 +1,28 @@
%global debug_package %{nil}
-%global commit 1b9791953ba4027efaeb728c7355e542a203be5e
+%global commit d466437aa4adc35830964cffc5b5f262c63ddcb4
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global import_path gopkg.in/v1/yaml
+%global import_path gopkg.in/v2/yaml
+%global import_path_sec gopkg.in/yaml.v2
+
+%global v1_commit 1b9791953ba4027efaeb728c7355e542a203be5e
+%global v1_shortcommit %(c=%{v1_commit}; echo ${c:0:7})
+%global v1_import_path gopkg.in/v1/yaml
+%global v1_import_path_sec gopkg.in/yaml.v1
+
Name: golang-gopkg-yaml
Version: 1
-Release: 3%{?dist}
+Release: 5%{?dist}
Summary: Enables Go programs to comfortably encode and decode YAML values
License: LGPLv3 with exceptions
URL: http://%{import_path}
Source0: https://github.com/go-yaml/yaml/archive/%{commit}/yaml-%{commit}.tar.gz
+Source1: https://github.com/go-yaml/yaml/archive/%{v1_commit}/yaml-%{v1_commit}.ta...
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
BuildArch: noarch
+%else
+ExclusiveArch: %{ix86} x86_64 %{arm}
+%endif
%description
%{summary}
@@ -19,11 +31,10 @@ BuildArch: noarch
BuildRequires: golang >= 1.2.1-3
Requires: golang >= 1.2.1-3
Summary: Enables Go programs to comfortably encode and decode YAML values
-Provides: golang(%{import_path}) = %{version}-%{release}
+Provides: golang(%{v1_import_path}) = %{version}-%{release}
+Provides: golang(%{v1_import_path_sec}) = %{version}-%{release}
%description devel
-%{summary}
-
The yaml package enables Go programs to comfortably encode and decode YAML
values. It was developed within Canonical as part of the juju project, and
is based on a pure Go port of the well-known libyaml C library to parse and
@@ -34,23 +45,73 @@ anchors, tags, etc. There are still a few missing bits, such as document
merging, base-60 floats (huh?), and multi-document unmarshalling. These
features are not hard to add, and will be introduced as necessary.
+%package devel-v2
+BuildRequires: golang >= 1.2.1-3
+BuildRequires: golang(gopkg.in/check.v1)
+Requires: golang >= 1.2.1-3
+Summary: Enables Go programs to comfortably encode and decode YAML values
+Provides: golang(%{import_path}) = %{version}-%{release}
+Provides: golang(%{import_path_sec}) = %{version}-%{release}
+
+%description devel-v2
+The yaml package enables Go programs to comfortably encode and decode YAML
+values. It was developed within Canonical as part of the juju project, and
+is based on a pure Go port of the well-known libyaml C library to parse and
+generate YAML data quickly and reliably.
+
+The yaml package supports most of YAML 1.1 and 1.2,
+including support for anchors, tags, map merging, etc.
+Multi-document unmarshalling is not yet implemented, and base-60 floats
+from YAML 1.1 are purposefully not supported since they're a poor design
+ and are gone in YAML 1.2.
+
+
%prep
%setup -n yaml-%{commit} -q
+%setup -n yaml-%{v1_commit} -T -b 1
%build
%install
+install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path}/
+cp -pav *.go %{buildroot}/%{gopath}/src/%{v1_import_path}/
+install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/
+cp -pav *.go %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/
+
+pushd ../yaml-%{commit}
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path}/
+install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/
+cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path_sec}/
+popd
+
+%check
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{v1_import_path_sec}
+pushd ../yaml-%{v1_commit}
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path_sec}
+popd
%files devel
%doc LICENSE LICENSE.libyaml README.md
-%dir %{gopath}/src/gopkg.in
%dir %{gopath}/src/gopkg.in/v1
-%dir %{gopath}/src/%{import_path}
-%{gopath}/src/%{import_path}/*.go
+%{gopath}/src/%{v1_import_path}
+%{gopath}/src/%{v1_import_path_sec}
+
+%files devel-v2
+%doc LICENSE LICENSE.libyaml README.md
+%dir %{gopath}/src/gopkg.in/v2
+%{gopath}/src/%{import_path}
+%{gopath}/src/%{import_path_sec}
%changelog
+* Wed Dec 10 2014 jchaloup <jchaloup(a)redhat.com> - 1-5
+- Update to gopkg.in/check.v2 but still provide gopkg.in/check.v1
+ related: #1141875
+
+* Fri Oct 10 2014 jchaloup <jchaloup(a)redhat.com> - 1-4
+- Adding go test and deps on gopkg.in/check.v1
+- Adding another Provides
+
* Mon Sep 15 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1-3
- Resolves: rhbz#1141875 - newpackage
- no debug_package
diff --git a/sources b/sources
index 2d759f6..da65a5d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
db4790a1e1c2ce0ce068434efb4f01dc yaml-1b9791953ba4027efaeb728c7355e542a203be5e.tar.gz
+2f235793d937f59e262c95f8b4b46813 yaml-d466437aa4adc35830964cffc5b5f262c63ddcb4.tar.gz
9 years, 4 months