diff --git a/.gitignore b/.gitignore
index 7587b06..a4b06b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/61664b8425f3e0e4371d4b56016b224b9d69cbbb.zip
+/protobuf-7f07925.tar.gz
diff --git a/golang-googlecode-goprotobuf.spec b/golang-googlecode-goprotobuf.spec
index 1f7d84a..99574ca 100644
--- a/golang-googlecode-goprotobuf.spec
+++ b/golang-googlecode-goprotobuf.spec
@@ -1,17 +1,25 @@
 %global debug_package   %{nil}
-%global import_path     code.google.com/p/goprotobuf
-%global gopath          %{_datadir}/gocode
-%global rev             61664b8425f3e0e4371d4b56016b224b9d69cbbb
-%global shortrev        %(r=%{rev}; echo ${r:0:12})
+%global provider        github
+%global provider_tld    com
+%global project         golang
+%global repo            protobuf
+%global import_path     %{provider}.%{provider_tld}/%{project}/%{repo}
+%global commit          7f07925444bb51fa4cf9dfe6f7661876f8852275
+%global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           golang-googlecode-goprotobuf
 Version:        0
-Release:        0.7.hg%{shortrev}%{?dist}
+Release:        0.10.git%{shortcommit}%{?dist}
 Summary:        Go support for Google protocol buffers
 License:        BSD
-URL:            http://%{import_path}
-Source0:        https://goprotobuf.googlecode.com/archive/%{rev}.zip
+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
+
 BuildRequires:  golang
 Requires:       protobuf
 Provides:       protoc-gen-go = %{version}-%{release}
@@ -24,18 +32,17 @@ and manage protocol buffers.
 Install %{name}-devel for the associated support library.
 
 %package devel
-%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
-BuildArch:      noarch
-%else
-ExclusiveArch:  %{ix86} x86_64 %{arm}
-%endif
-Requires:       golang
-Summary:        Go support for Google protocol buffers
-Provides:       golang(%{import_path}) = %{version}-%{release}
+BuildRequires:  golang >= 1.2.1-3
+Requires:       golang >= 1.2.1-3
+Summary:        %{summary}
 Provides:       golang(%{import_path}/proto) = %{version}-%{release}
 Provides:       golang(%{import_path}/protoc-gen-go) = %{version}-%{release}
+Provides:       golang(%{import_path}/protoc-gen-go/descriptor) = %{version}-%{release}
 Provides:       golang(%{import_path}/protoc-gen-go/generator) = %{version}-%{release}
 Provides:       golang(%{import_path}/protoc-gen-go/plugin) = %{version}-%{release}
+Provides:       golang(%{import_path}/protoc-gen-go/testdata) = %{version}-%{release}
+Provides:       golang(%{import_path}/protoc-gen-go/testdata/my_test) = %{version}-%{release}
+Provides:       golang(%{import_path}/proto/testdata) = %{version}-%{release}
 
 %description devel
 This package provides  a library that implements run-time support for
@@ -45,7 +52,8 @@ buffers in the Go language.
 Install %{name} for the related protocol compiler plugin.
 
 %prep
-%setup -n goprotobuf-%{shortrev}
+%setup -q -n %{repo}-%{commit}
+
 mkdir -p src/%{import_path}
 cp -R proto protoc-gen-go src/%{import_path}/
 
@@ -58,39 +66,32 @@ go build
 %install
 install -d %{buildroot}%{_bindir}
 install -m 755 protoc-gen-go/protoc-gen-go %{buildroot}/%{_bindir}/protoc-gen-go
-install -d %{buildroot}/%{gopath}/src/%{import_path}
-rm -rf proto/testdata protoc-gen-go/{protoc-gen-go,testdata}
-for d in proto protoc-gen-go; do
-   cp -av $d %{buildroot}/%{gopath}/src/%{import_path}/
-done
+
+# devel
+install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
+cp -rpav protoc-gen-go %{buildroot}/%{gopath}/src/%{import_path}/
+cp -rpav proto %{buildroot}/%{gopath}/src/%{import_path}/
+
+%check
+#GOPATH={buildroot}/{gopath}:{gopath} go test {import_path}/protoc-gen-go/testdata
+GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/protoc-gen-go/generator
+#GOPATH={buildroot}/{gopath}:{gopath} go test {import_path}/proto
+#GOPATH={buildroot}/{gopath}:{gopath} go test {import_path}/proto/testdata
 
 %files
 %doc AUTHORS CONTRIBUTORS LICENSE README
 %{_bindir}/protoc-gen-go
+
 %files devel
 %doc AUTHORS CONTRIBUTORS LICENSE README
-%dir %attr(755,root,root) %{gopath}
-%dir %attr(755,root,root) %{gopath}/src
-%dir %attr(755,root,root) %{gopath}/src/code.google.com
-%dir %attr(755,root,root) %{gopath}/src/code.google.com/p
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}/proto
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}/protoc-gen-go
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}/protoc-gen-go/descriptor
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}/protoc-gen-go/generator
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}/protoc-gen-go/plugin
-%{gopath}/src/%{import_path}/proto/Makefile
-%{gopath}/src/%{import_path}/proto/*.go
-%{gopath}/src/%{import_path}/protoc-gen-go/Makefile
-%{gopath}/src/%{import_path}/protoc-gen-go/*.go
-%{gopath}/src/%{import_path}/protoc-gen-go/descriptor/Makefile
-%{gopath}/src/%{import_path}/protoc-gen-go/descriptor/*.pb.go*
-%{gopath}/src/%{import_path}/protoc-gen-go/generator/Makefile
-%{gopath}/src/%{import_path}/protoc-gen-go/generator/*.go
-%{gopath}/src/%{import_path}/protoc-gen-go/plugin/Makefile
-%{gopath}/src/%{import_path}/protoc-gen-go/plugin/*.go*
+%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
+%{gopath}/src/%{import_path}
 
 %changelog
+* Mon Jan 26 2015 jchaloup <jchaloup@redhat.com> - 0-0.10.git7f07925
+- Bump to 7f07925444bb51fa4cf9dfe6f7661876f8852275
+  related: #1018057
+
 * Thu Oct 17 2013 Lokesh Mandvekar <lsm5@redhat.com> - 0-0.7.hg61664b8425f3
 - removed double quotes from provides
 
diff --git a/sources b/sources
index d9f8daa..b573689 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a568da20c12366a8746290449df7e81  61664b8425f3e0e4371d4b56016b224b9d69cbbb.zip
+99d96b5254097523ad55c7eeb68bac9a  protobuf-7f07925.tar.gz