[golang] add excluding the files too
by Vincent Batts
commit 5f099a58529982244ba01c0be9603f147d6299e0
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Wed May 7 23:29:08 2014 -0400
add excluding the files too
golang.spec | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index 34fbcf5..140ff72 100644
--- a/golang.spec
+++ b/golang.spec
@@ -636,9 +636,13 @@ fi
%{goroot}/src/
# files that are generated based on compile-time ARCH will go in that arch's pkg-bin-*
%exclude %{goroot}/src/cmd/5l/enam.c
+%exclude %{goroot}/src/cmd/6l/enam.c
+%exclude %{goroot}/src/cmd/8l/enam.c
%exclude %{goroot}/src/pkg/runtime/zasm_linux_386.h
%exclude %{goroot}/src/pkg/runtime/zasm_linux_amd64.h
%exclude %{goroot}/src/pkg/runtime/zasm_linux_arm.h
+%exclude %{goroot}/src/pkg/runtime/zgoarch_386.go
+%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go
%exclude %{goroot}/src/pkg/runtime/zgoarch_arm.go
%exclude %{goroot}/src/pkg/runtime/zmalloc_linux_386.c
%exclude %{goroot}/src/pkg/runtime/zmalloc_linux_amd64.c
9 years, 12 months
[golang] bump release number
by Vincent Batts
commit 6e4126fb0153259bd1e56ef8455ebcb426110b02
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Wed May 7 15:49:17 2014 -0400
bump release number
golang.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index 4f82676..34fbcf5 100644
--- a/golang.spec
+++ b/golang.spec
@@ -39,7 +39,7 @@
Name: golang
Version: 1.2.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: The Go Programming Language
License: BSD
@@ -877,6 +877,9 @@ fi
%changelog
+* Wed May 07 2014 Vincent Batts <vbatts(a)redhat.com> 1.2.1-7
+- missed two arch-dependent src files
+
* Wed May 07 2014 Vincent Batts <vbatts(a)redhat.com> 1.2.1-6
- put generated arch-dependent src in their respective RPMs
9 years, 12 months
[golang] missed two files
by Vincent Batts
commit 9207febd2c519c48ea85c63087afd30ef10963fa
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Wed May 7 15:47:49 2014 -0400
missed two files
golang.spec | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index 0dcd339..4f82676 100644
--- a/golang.spec
+++ b/golang.spec
@@ -699,7 +699,9 @@ fi
%{goroot}/pkg/tool/linux_386/pprof
# arch dependent generated files, used by cgo
+%{goroot}/src/cmd/8l/enam.c
%{goroot}/src/pkg/runtime/zasm_linux_386.h
+%{goroot}/src/pkg/runtime/zgoarch_386.go
%{goroot}/src/pkg/runtime/zmalloc_linux_386.c
%{goroot}/src/pkg/runtime/zmprof_linux_386.c
%{goroot}/src/pkg/runtime/znetpoll_linux_386.c
@@ -734,7 +736,9 @@ fi
%{goroot}/pkg/tool/linux_amd64/pprof
# arch dependent generated files, used by cgo
+%{goroot}/src/cmd/6l/enam.c
%{goroot}/src/pkg/runtime/zasm_linux_amd64.h
+%{goroot}/src/pkg/runtime/zgoarch_amd64.go
%{goroot}/src/pkg/runtime/zmalloc_linux_amd64.c
%{goroot}/src/pkg/runtime/zmprof_linux_amd64.c
%{goroot}/src/pkg/runtime/znetpoll_linux_amd64.c
9 years, 12 months
[geard] make integration tests more resilient
by Lokesh Mandvekar
commit d7a1691094250c9e836ea1875c36b048e5a4536b
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Wed May 7 14:48:03 2014 -0400
make integration tests more resilient
.gitignore | 1 +
geard.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cae0f6d..d7cf3c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/geard-b31df16.tar.gz
/geard-7fd4f55.tar.gz
+/geard-c105889.tar.gz
diff --git a/geard.spec b/geard.spec
index 86d4e9d..da2c15f 100644
--- a/geard.spec
+++ b/geard.spec
@@ -9,13 +9,13 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit 7fd4f55df7f657c6c6cf424b01dd46ca6ce28353
+%global commit c10588936f5c0829799a9db39030c25ee6da7fc9
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: geard
Version: 0
-Release: 0.6.git%{shortcommit}%{?dist}
-Summary: CLI client for installing Docker images as containers
+Release: 0.7.git%{shortcommit}%{?dist}
+Summary: Geard
License: ASL 2.0
URL: http://github.com/openshift/geard
ExclusiveArch: x86_64
@@ -90,6 +90,9 @@ install -d -p %{buildroot}%{_sharedstatedir}/containers
%dir %{_sharedstatedir}/containers
%changelog
+* Wed May 07 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0-0.7.git
+- make tests more resilient
+
* Fri May 02 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0-0.6.git
- release 6
diff --git a/sources b/sources
index 4be67f8..e87858b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f56db613c1f40a45fa64d3c3dccf7051 geard-7fd4f55.tar.gz
+6113c405955ea965a5cb9f927a6bb01a geard-c105889.tar.gz
9 years, 12 months
[golang] 1.2.1-6: arch-specific bits
by Vincent Batts
commit df7b191378d8ecfe0a1e27fc377d813af8f527c2
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Wed May 7 13:39:21 2014 -0400
1.2.1-6: arch-specific bits
arch-specific source needs to be in arch-specific rpms
golang.spec | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 84 insertions(+), 1 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index a4af927..0dcd339 100644
--- a/golang.spec
+++ b/golang.spec
@@ -39,7 +39,7 @@
Name: golang
Version: 1.2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: The Go Programming Language
License: BSD
@@ -634,6 +634,44 @@ fi
%files src
%{goroot}/src/
+# files that are generated based on compile-time ARCH will go in that arch's pkg-bin-*
+%exclude %{goroot}/src/cmd/5l/enam.c
+%exclude %{goroot}/src/pkg/runtime/zasm_linux_386.h
+%exclude %{goroot}/src/pkg/runtime/zasm_linux_amd64.h
+%exclude %{goroot}/src/pkg/runtime/zasm_linux_arm.h
+%exclude %{goroot}/src/pkg/runtime/zgoarch_arm.go
+%exclude %{goroot}/src/pkg/runtime/zmalloc_linux_386.c
+%exclude %{goroot}/src/pkg/runtime/zmalloc_linux_amd64.c
+%exclude %{goroot}/src/pkg/runtime/zmalloc_linux_arm.c
+%exclude %{goroot}/src/pkg/runtime/zmprof_linux_386.c
+%exclude %{goroot}/src/pkg/runtime/zmprof_linux_amd64.c
+%exclude %{goroot}/src/pkg/runtime/zmprof_linux_arm.c
+%exclude %{goroot}/src/pkg/runtime/znetpoll_linux_386.c
+%exclude %{goroot}/src/pkg/runtime/znetpoll_linux_amd64.c
+%exclude %{goroot}/src/pkg/runtime/znetpoll_linux_arm.c
+%exclude %{goroot}/src/pkg/runtime/znoasm_arm_linux_arm.c
+%exclude %{goroot}/src/pkg/runtime/zruntime1_linux_386.c
+%exclude %{goroot}/src/pkg/runtime/zruntime1_linux_amd64.c
+%exclude %{goroot}/src/pkg/runtime/zruntime1_linux_arm.c
+%exclude %{goroot}/src/pkg/runtime/zruntime_defs_linux_386.go
+%exclude %{goroot}/src/pkg/runtime/zruntime_defs_linux_amd64.go
+%exclude %{goroot}/src/pkg/runtime/zruntime_defs_linux_arm.go
+%exclude %{goroot}/src/pkg/runtime/zsema_linux_386.c
+%exclude %{goroot}/src/pkg/runtime/zsema_linux_amd64.c
+%exclude %{goroot}/src/pkg/runtime/zsema_linux_arm.c
+%exclude %{goroot}/src/pkg/runtime/zsigqueue_linux_386.c
+%exclude %{goroot}/src/pkg/runtime/zsigqueue_linux_amd64.c
+%exclude %{goroot}/src/pkg/runtime/zsigqueue_linux_arm.c
+%exclude %{goroot}/src/pkg/runtime/zstring_linux_386.c
+%exclude %{goroot}/src/pkg/runtime/zstring_linux_amd64.c
+%exclude %{goroot}/src/pkg/runtime/zstring_linux_arm.c
+%exclude %{goroot}/src/pkg/runtime/zsys_linux_386.s
+%exclude %{goroot}/src/pkg/runtime/zsys_linux_amd64.s
+%exclude %{goroot}/src/pkg/runtime/zsys_linux_arm.s
+%exclude %{goroot}/src/pkg/runtime/ztime_linux_386.c
+%exclude %{goroot}/src/pkg/runtime/ztime_linux_amd64.c
+%exclude %{goroot}/src/pkg/runtime/ztime_linux_arm.c
+
%ifarch %{ix86}
%files pkg-bin-linux-386
@@ -659,6 +697,19 @@ fi
%{goroot}/pkg/tool/linux_386/objdump
%{goroot}/pkg/tool/linux_386/pack
%{goroot}/pkg/tool/linux_386/pprof
+
+# arch dependent generated files, used by cgo
+%{goroot}/src/pkg/runtime/zasm_linux_386.h
+%{goroot}/src/pkg/runtime/zmalloc_linux_386.c
+%{goroot}/src/pkg/runtime/zmprof_linux_386.c
+%{goroot}/src/pkg/runtime/znetpoll_linux_386.c
+%{goroot}/src/pkg/runtime/zruntime1_linux_386.c
+%{goroot}/src/pkg/runtime/zruntime_defs_linux_386.go
+%{goroot}/src/pkg/runtime/zsema_linux_386.c
+%{goroot}/src/pkg/runtime/zsigqueue_linux_386.c
+%{goroot}/src/pkg/runtime/zstring_linux_386.c
+%{goroot}/src/pkg/runtime/zsys_linux_386.s
+%{goroot}/src/pkg/runtime/ztime_linux_386.c
%endif
%ifarch x86_64
@@ -681,6 +732,19 @@ fi
%{goroot}/pkg/tool/linux_amd64/objdump
%{goroot}/pkg/tool/linux_amd64/pack
%{goroot}/pkg/tool/linux_amd64/pprof
+
+# arch dependent generated files, used by cgo
+%{goroot}/src/pkg/runtime/zasm_linux_amd64.h
+%{goroot}/src/pkg/runtime/zmalloc_linux_amd64.c
+%{goroot}/src/pkg/runtime/zmprof_linux_amd64.c
+%{goroot}/src/pkg/runtime/znetpoll_linux_amd64.c
+%{goroot}/src/pkg/runtime/zruntime1_linux_amd64.c
+%{goroot}/src/pkg/runtime/zruntime_defs_linux_amd64.go
+%{goroot}/src/pkg/runtime/zsema_linux_amd64.c
+%{goroot}/src/pkg/runtime/zsigqueue_linux_amd64.c
+%{goroot}/src/pkg/runtime/zstring_linux_amd64.c
+%{goroot}/src/pkg/runtime/zsys_linux_amd64.s
+%{goroot}/src/pkg/runtime/ztime_linux_amd64.c
%endif
%ifarch %{arm}
@@ -707,6 +771,22 @@ fi
%{goroot}/pkg/tool/linux_arm/objdump
%{goroot}/pkg/tool/linux_arm/pack
%{goroot}/pkg/tool/linux_arm/pprof
+
+# arch dependent generated files, used by cgo
+%{goroot}/src/cmd/5l/enam.c
+%{goroot}/src/pkg/runtime/zasm_linux_arm.h
+%{goroot}/src/pkg/runtime/zgoarch_arm.go
+%{goroot}/src/pkg/runtime/zmalloc_linux_arm.c
+%{goroot}/src/pkg/runtime/zmprof_linux_arm.c
+%{goroot}/src/pkg/runtime/znetpoll_linux_arm.c
+%{goroot}/src/pkg/runtime/znoasm_arm_linux_arm.c
+%{goroot}/src/pkg/runtime/zruntime1_linux_arm.c
+%{goroot}/src/pkg/runtime/zruntime_defs_linux_arm.go
+%{goroot}/src/pkg/runtime/zsema_linux_arm.c
+%{goroot}/src/pkg/runtime/zsigqueue_linux_arm.c
+%{goroot}/src/pkg/runtime/zstring_linux_arm.c
+%{goroot}/src/pkg/runtime/zsys_linux_arm.s
+%{goroot}/src/pkg/runtime/ztime_linux_arm.c
%endif
%files pkg-linux-386
@@ -793,6 +873,9 @@ fi
%changelog
+* Wed May 07 2014 Vincent Batts <vbatts(a)redhat.com> 1.2.1-6
+- put generated arch-dependent src in their respective RPMs
+
* Fri Apr 11 2014 Vincent Batts <vbatts(a)redhat.com> 1.2.1-5
- skip test that is causing a SIGABRT on fc21 bz1086900
9 years, 12 months
