commit f0b6db66028373d4cdca2952c840f1e23c0712e8
Author: Jan Chaloupka <[email protected]>
Date: Fri Feb 13 11:30:18 2015 +0100
Bump to upstream bc946d07d1016848dfd2507f90f0859c9471681e
.gitignore | 2 +-
golang-googlecode-gogoprotobuf.spec | 163 +++++++++++++++++++----------------
sources | 2 +-
3 files changed, 90 insertions(+), 77 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 94a0ac3..26820cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/d228c1a206c3a756d7ec6cc3579d92d00c35a161.tar.gz
+/protobuf-bc946d0.tar.gz
diff --git a/golang-googlecode-gogoprotobuf.spec
b/golang-googlecode-gogoprotobuf.spec
index b8b5a62..1dc2e0e 100644
--- a/golang-googlecode-gogoprotobuf.spec
+++ b/golang-googlecode-gogoprotobuf.spec
@@ -1,21 +1,23 @@
%global debug_package %{nil}
-%global provider_prefix code
-%global provider google
+%global provider github
%global provider_tld com
-%global project p
-%global repo gogoprotobuf
-%global import_path
%{provider_prefix}.%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit d228c1a206c3a756d7ec6cc3579d92d00c35a161
+%global project gogo
+%global repo protobuf
+%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+%global nname golang-github-gogo-protobuf
+
+%global commit bc946d07d1016848dfd2507f90f0859c9471681e
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global setupcommit %(c=%{commit}; echo ${c:0:12})
-Name: golang-%{provider}%{provider_prefix}-%{repo}
+%global g_import_path code.google.com/p/gogoprotobuf
+
+Name: golang-googlecode-gogoprotobuf
Version: 0
-Release: 0.9.git%{shortcommit}%{?dist}
+Release: 0.10.git%{shortcommit}%{?dist}
Summary: A fork of goprotobuf with several extra features
License: BSD
URL: http://%{import_path}
-Source0: https://gogoprotobuf.googlecode.com/archive/%{commit}.tar.gz
+Source0:
https://github.com/%{project}/%{repo}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
BuildRequires: golang >= 1.2.1-3
ExclusiveArch: %{ix86} x86_64 %{arm}
Requires: protobuf
@@ -23,20 +25,18 @@ Requires: protobuf
%description
%{summary}
-%package devel
+%package -n %{nname}-devel
BuildRequires: golang >= 1.2.1-3
Requires: golang >= 1.2.1-3
Requires: %{name}
-Summary: A fork of goprotobuf with several extra features
-Provides: golang(%{import_path}) = %{version}-%{release}
+Summary: %{summary}
+Provides: golang(%{import_path}/dockertest/gogodocker-gen) =
%{version}-%{release}
Provides: golang(%{import_path}/fieldpath) = %{version}-%{release}
-Provides: golang(%{import_path}/parser) = %{version}-%{release}
+Provides: golang(%{import_path}/fieldpath/fieldpath-gen) =
%{version}-%{release}
+Provides: golang(%{import_path}/gogoproto) = %{version}-%{release}
Provides: golang(%{import_path}/io) = %{version}-%{release}
-Provides: golang(%{import_path}/proto) = %{version}-%{release}
-Provides: golang(%{import_path}/protoc-gen-gogo) = %{version}-%{release}
-Provides: golang(%{import_path}/protoc-gen-gogo/descriptor) =
%{version}-%{release}
-Provides: golang(%{import_path}/protoc-gen-gogo/generator) =
%{version}-%{release}
-Provides: golang(%{import_path}/protoc-gen-gogo/plugin) =
%{version}-%{release}
+Provides: golang(%{import_path}/parser) = %{version}-%{release}
+Provides: golang(%{import_path}/pbpath) = %{version}-%{release}
Provides: golang(%{import_path}/plugin/defaultcheck) =
%{version}-%{release}
Provides: golang(%{import_path}/plugin/description) =
%{version}-%{release}
Provides: golang(%{import_path}/plugin/embedcheck) =
%{version}-%{release}
@@ -51,92 +51,105 @@ Provides: golang(%{import_path}/plugin/stringer) =
%{version}-%{release}
Provides: golang(%{import_path}/plugin/testgen) = %{version}-%{release}
Provides: golang(%{import_path}/plugin/union) = %{version}-%{release}
Provides: golang(%{import_path}/plugin/unmarshal) = %{version}-%{release}
-Provides: golang(%{import_path}/plugin/unsafemarshaler) =
%{version}-%{release}
-Provides: golang(%{import_path}/plugin/unsafeunmarshaler) =
%{version}-%{release}
+Provides: golang(%{import_path}/proto) = %{version}-%{release}
+Provides: golang(%{import_path}/protoc-gen-gogo) = %{version}-%{release}
+Provides: golang(%{import_path}/protoc-gen-gogo/descriptor) =
%{version}-%{release}
+Provides: golang(%{import_path}/protoc-gen-gogo/generator) =
%{version}-%{release}
+Provides: golang(%{import_path}/protoc-gen-gogo/plugin) =
%{version}-%{release}
+Provides: golang(%{import_path}/protoc-gen-gogo/version) =
%{version}-%{release}
+
+%package devel
+BuildRequires: golang >= 1.2.1-3
+Requires: golang >= 1.2.1-3
+Requires: %{name}
+Summary: %{summary}
+Provides: golang(%{g_import_path}/dockertest/gogodocker-gen) =
%{version}-%{release}
+Provides: golang(%{g_import_path}/fieldpath) = %{version}-%{release}
+Provides: golang(%{g_import_path}/fieldpath/fieldpath-gen) =
%{version}-%{release}
+Provides: golang(%{g_import_path}/gogoproto) = %{version}-%{release}
+Provides: golang(%{g_import_path}/io) = %{version}-%{release}
+Provides: golang(%{g_import_path}/parser) = %{version}-%{release}
+Provides: golang(%{g_import_path}/pbpath) = %{version}-%{release}
+Provides: golang(%{g_import_path}/plugin/defaultcheck) =
%{version}-%{release}
+Provides: golang(%{g_import_path}/plugin/description) =
%{version}-%{release}
+Provides: golang(%{g_import_path}/plugin/embedcheck) =
%{version}-%{release}
+Provides: golang(%{g_import_path}/plugin/enumstringer) =
%{version}-%{release}
+Provides: golang(%{g_import_path}/plugin/equal) = %{version}-%{release}
+Provides: golang(%{g_import_path}/plugin/face) = %{version}-%{release}
+Provides: golang(%{g_import_path}/plugin/gostring) =
%{version}-%{release}
+Provides: golang(%{g_import_path}/plugin/marshalto) =
%{version}-%{release}
+Provides: golang(%{g_import_path}/plugin/populate) =
%{version}-%{release}
+Provides: golang(%{g_import_path}/plugin/size) = %{version}-%{release}
+Provides: golang(%{g_import_path}/plugin/stringer) =
%{version}-%{release}
+Provides: golang(%{g_import_path}/plugin/testgen) = %{version}-%{release}
+Provides: golang(%{g_import_path}/plugin/union) = %{version}-%{release}
+Provides: golang(%{g_import_path}/plugin/unmarshal) =
%{version}-%{release}
+Provides: golang(%{g_import_path}/proto) = %{version}-%{release}
+Provides: golang(%{g_import_path}/protoc-gen-gogo) =
%{version}-%{release}
+Provides: golang(%{g_import_path}/protoc-gen-gogo/descriptor) =
%{version}-%{release}
+Provides: golang(%{g_import_path}/protoc-gen-gogo/generator) =
%{version}-%{release}
+Provides: golang(%{g_import_path}/protoc-gen-gogo/plugin) =
%{version}-%{release}
+Provides: golang(%{g_import_path}/protoc-gen-gogo/version) =
%{version}-%{release}
%description devel
%{summary}
+%description -n %{nname}-devel
+%{summary}
+
%prep
-%setup -q -n %{repo}-%{setupcommit}
+%setup -q -n %{repo}-%{commit}
%build
unset GOPATH
export GOPATH=$(pwd)
-mkdir -p src/code.google.com/p/
-ln -s $(pwd) src/code.google.com/p/gogoprotobuf
+mkdir -p src/github.com/gogo/
+ln -s ../../../ src/github.com/gogo/protobuf
cd protoc-gen-gogo
go build
%install
+#### binary ####
install -d %{buildroot}%{_bindir}
install -m 755 protoc-gen-gogo/protoc-gen-gogo
%{buildroot}/%{_bindir}/protoc-gen-gogo
rm -rf proto/testdata protoc-gen-gogo/{protoc-gen-gogo,testdata}
fieldpath/fieldpath-gen
+
+#### devel ####
mkdir -p %{buildroot}/%{gopath}/src/%{import_path}
+mkdir -p %{buildroot}/%{gopath}/src/%{g_import_path}
+
for d in fieldpath io parser plugin proto protoc-gen-gogo; do
cp -pav $d %{buildroot}/%{gopath}/src/%{import_path}
+ cp -pav $d %{buildroot}/%{gopath}/src/%{g_import_path}
find %{buildroot}/%{gopath}/ -name Makefile -delete
done
+cd %{buildroot}/%{gopath}/src/%{g_import_path}/
+# github.com/gogo/protobuf -> code.google.com/p/gogoprotobuf
+sed -i 's/"github\.com\/gogo\/protobuf/"code\.google\.com\/p\/gogoprotobuf/g' \
+ $(find . -name '*.go')
+
%files
%doc CONTRIBUTORS LICENSE README
%{_bindir}/protoc-gen-gogo
+%files -n %{nname}-devel
+%doc CONTRIBUTORS LICENSE README
+%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
+%{gopath}/src/%{import_path}
+
%files devel
%doc CONTRIBUTORS LICENSE README
-%dir %{gopath}/src/%{import_path}
-%dir %{gopath}/src/%{import_path}/fieldpath
-%dir %{gopath}/src/%{import_path}/parser
-%dir %{gopath}/src/%{import_path}/plugin
-%dir %{gopath}/src/%{import_path}/plugin/defaultcheck
-%dir %{gopath}/src/%{import_path}/plugin/description
-%dir %{gopath}/src/%{import_path}/plugin/embedcheck
-%dir %{gopath}/src/%{import_path}/plugin/enumstringer
-%dir %{gopath}/src/%{import_path}/plugin/equal
-%dir %{gopath}/src/%{import_path}/plugin/face
-%dir %{gopath}/src/%{import_path}/plugin/gostring
-%dir %{gopath}/src/%{import_path}/plugin/marshalto
-%dir %{gopath}/src/%{import_path}/plugin/populate
-%dir %{gopath}/src/%{import_path}/plugin/size
-%dir %{gopath}/src/%{import_path}/plugin/stringer
-%dir %{gopath}/src/%{import_path}/plugin/testgen
-%dir %{gopath}/src/%{import_path}/plugin/union
-%dir %{gopath}/src/%{import_path}/plugin/unmarshal
-%dir %{gopath}/src/%{import_path}/plugin/unsafemarshaler
-%dir %{gopath}/src/%{import_path}/plugin/unsafeunmarshaler
-%dir %{gopath}/src/%{import_path}/io
-%dir %{gopath}/src/%{import_path}/proto
-%dir %{gopath}/src/%{import_path}/protoc-gen-gogo
-%dir %{gopath}/src/%{import_path}/protoc-gen-gogo/descriptor
-%dir %{gopath}/src/%{import_path}/protoc-gen-gogo/generator
-%dir %{gopath}/src/%{import_path}/protoc-gen-gogo/plugin
-%{gopath}/src/%{import_path}/fieldpath/*.go
-%{gopath}/src/%{import_path}/io/*.go
-%{gopath}/src/%{import_path}/parser/*.go
-%{gopath}/src/%{import_path}/plugin/defaultcheck/*.go
-%{gopath}/src/%{import_path}/plugin/description/*.go
-%{gopath}/src/%{import_path}/plugin/embedcheck/*.go
-%{gopath}/src/%{import_path}/plugin/enumstringer/*.go
-%{gopath}/src/%{import_path}/plugin/equal/*.go
-%{gopath}/src/%{import_path}/plugin/face/*.go
-%{gopath}/src/%{import_path}/plugin/gostring/*.go
-%{gopath}/src/%{import_path}/plugin/marshalto/*.go
-%{gopath}/src/%{import_path}/plugin/populate/*.go
-%{gopath}/src/%{import_path}/plugin/size/*.go
-%{gopath}/src/%{import_path}/plugin/stringer/*.go
-%{gopath}/src/%{import_path}/plugin/testgen/*.go
-%{gopath}/src/%{import_path}/plugin/union/*.go
-%{gopath}/src/%{import_path}/plugin/unmarshal/*.go
-%{gopath}/src/%{import_path}/plugin/unsafemarshaler/*.go
-%{gopath}/src/%{import_path}/plugin/unsafeunmarshaler/*.go
-%{gopath}/src/%{import_path}/proto/*.go
-%{gopath}/src/%{import_path}/protoc-gen-gogo/*.go
-%{gopath}/src/%{import_path}/protoc-gen-gogo/descriptor/*.pb.go*
-%{gopath}/src/%{import_path}/protoc-gen-gogo/descriptor/*.go*
-%{gopath}/src/%{import_path}/protoc-gen-gogo/generator/*.go
-%{gopath}/src/%{import_path}/protoc-gen-gogo/plugin/*.go*
+%{gopath}/src/%{g_import_path}
+
+
%changelog
+* Fri Feb 13 2015 jchaloup <[email protected]> - 0-0.10.gitbc946d0
+- Bump to upstream bc946d07d1016848dfd2507f90f0859c9471681e
+ import path has changed -> add devel package to keep back compatibility
+ with code.google.com/p/gogoprotobuf import paths
+
* Fri Sep 19 2014 jchaloup <[email protected]> - 0-0.9.gitd228c1a
- initial commit (package review #1120882)
diff --git a/sources b/sources
index 6393b17..5422f3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2576e2b124987e7b49484535f2dd2f59
d228c1a206c3a756d7ec6cc3579d92d00c35a161.tar.gz
+3a4e31f90732afbbfb9cdd8383ad61ff protobuf-bc946d0.tar.gz
_______________________________________________
golang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/golang
