commit 61603412c84463e1149d19cf8383c04aff71b5b8
Author: Lokesh Mandvekar l...@fedoraproject.org
Date: Thu Feb 5 15:40:04 2015 -0600
provide actool and ace-validator in main package
VR: 0.2.0-2.git
- remove mentions of f19
- update to master commit#2fee340
Signed-off-by: Lokesh Mandvekar l...@fedoraproject.org
.gitignore |1 +
golang-github-appc-spec.spec | 50 ++---
sources |2 +-
3 files changed, 34 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c5edd2a..07c6393 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/spec-202fd7b.tar.gz
+/spec-2fee340.tar.gz
diff --git a/golang-github-appc-spec.spec b/golang-github-appc-spec.spec
index 5992610..240d957 100644
--- a/golang-github-appc-spec.spec
+++ b/golang-github-appc-spec.spec
@@ -4,33 +4,31 @@
%global project appc
%global repospec
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit 202fd7b99d16c596b89cc14d42758bdcce35fea1
+%global commit 2fee340e9314b9f0f53cbf0e929d158a09930a5f
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: golang-%{provider}-%{project}-%{repo}
Version:0.2.0
-Release:1.git%{shortcommit}%{?dist}
+Release:2.git%{shortcommit}%{?dist}
Summary:Schema defs and tools for app container specification
+ExclusiveArch: x86_64 %{arm}
License:ASL 2.0
URL:https://%{import_path}
Source0:
https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-%if 0%{?fedora} = 19 || 0%{?rhel} = 7
-BuildArch: noarch
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm}
-%endif
+Provides: actool = %{version}-%{release}
+Provides: ace-validator = %{version}-%{release}
%description
%{summary}
%package devel
BuildRequires: golang = 1.2.1-3
-BuildRequires: golang(github.com/coreos/go-semver/semver)
+BuildRequires: golang(github.com/coreos/go-semver/semver) = 0-0.2
BuildRequires: golang(golang.org/x/crypto/openpgp) = 0-0.2
BuildRequires: golang(golang.org/x/net/html)
BuildRequires: golang(golang.org/x/net/html/atom)
Requires: golang = 1.2.1-3
-Requires: golang(github.com/coreos/go-semver/semver)
+Requires: golang(github.com/coreos/go-semver/semver) = 0-0.2
Summary:%{summary}
Provides: golang(%{import_path}/ace) = %{version}-%{release}
Provides: golang(%{import_path}/aci) = %{version}-%{release}
@@ -48,25 +46,36 @@ building other packages which use %{project}/%{repo}.
%prep
%setup -qn %{repo}-%{commit}
-rm -rf Godeps examples
+rm -rf examples
+
+%build
+GOPATH=$GOPATH:%{gopath}:$(pwd)/Godeps/_workspace ./build
+rm -rf Godeps
find . -name *.go \
-print |\
xargs sed -i 's/github.com\/appc\/spec\/Godeps\/_workspace\/src\///g'
-%build
-
%install
+install -d -p %{buildroot}%{_bindir}
+install -p -m 755 bin/actool %{buildroot}%{_bindir}
+install -p -m 755 bin/ace-validator %{buildroot}%{_bindir}
+
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
for dir in */ ; do
-cp -pav $dir %{buildroot}/%{gopath}/src/%{import_path}/
+cp -rpav $dir %{buildroot}/%{gopath}/src/%{import_path}/
done
%check
-for dir in $(find . -mindepth 1 -maxdepth 3 -type d); do
-if [ $(find $dir -maxdepth 1 -name *_test.go | wc -l) != '0' ]; then
-GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/$dir
-fi
-done
+#for dir in $(find . -mindepth 1 -maxdepth 3 -type d); do
+#if [ $(find $dir -maxdepth 1 -name *_test.go | wc -l) != '0' ]; then
+#GOPATH=%{buildroot}/%{gopath}:%{gopath}:$(pwd)/Godeps/_workspace go
test %{import_path}/$dir
+#fi
+#done
+
+%files
+%doc CONTRIBUTING.md LICENSE README.md SPEC.md
+%{_bindir}/actool
+%{_bindir}/ace-validator
%files devel
%doc CONTRIBUTING.md LICENSE README.md SPEC.md
@@ -74,6 +83,11 @@ done
%{gopath}/src/%{import_path}
%changelog
+* Tue Feb 03 2015 Lokesh Mandvekar l...@fedoraproject.org -
0.2.0-2.git2fee340
+- update to master commit#2fee340
+- provide actool and ace-validator in main package
+- remove mentions of fedora 19 (EOL)
+
* Sat Jan 31 2015 Lokesh Mandvekar l...@fedoraproject.org -
0.2.0-1.git202fd7b
- Resolves: rhbz#1174030 - first package upload
- update to master commit#202fd7b
diff --git a/sources b/sources
index a1b076f..5d62a4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-baf8838313bc203fefe509c0a89ded3a spec-202fd7b.tar.gz
+4a750b93ef311c2b337b9f18e84213ab spec-2fee340.tar.gz
___
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
