jchaloup pushed to golang-github-gorilla-mux (el6). "Bump to upstream 8096f47503459bcc74d1f4c487b7e6e42e5746b5 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 23 07:47:43 UTC 2015


>From dabc1a1fade97586b922f41d9dd4e77835b96ce0 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Tue, 21 Apr 2015 12:37:02 +0200
Subject: Bump to upstream 8096f47503459bcc74d1f4c487b7e6e42e5746b5 - related:
 #1001317


diff --git a/.gitignore b/.gitignore
index dfc8338..44d3f7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/mux-e718e93.tar.gz
-/mux-136d54f.tar.gz
+/mux-8096f47.tar.gz
diff --git a/golang-github-gorilla-mux.spec b/golang-github-gorilla-mux.spec
index 30144ec..afeb4cd 100644
--- a/golang-github-gorilla-mux.spec
+++ b/golang-github-gorilla-mux.spec
@@ -1,17 +1,21 @@
 %global debug_package   %{nil}
-%global import_path     github.com/gorilla/mux
-%global gopath          %{_datadir}/gocode
-%global commit          136d54f81f00414c45c3c68dd47e98cc97519c5e
+%global provider        github
+%global provider_tld    com
+%global project         gorilla
+%global repo            mux
+# https://github.com/gorilla/mux
+%global import_path     %{provider}.%{provider_tld}/%{project}/%{repo}
+%global commit          8096f47503459bcc74d1f4c487b7e6e42e5746b5
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
-Name:           golang-github-gorilla-mux
+Name:           golang-%{provider}-%{project}-%{repo}
 Version:        0
-Release:        0.13.git%{shortcommit}%{?dist}
+Release:        0.16.git%{shortcommit}%{?dist}
 Summary:        A powerful URL router and dispatcher for golang
 License:        BSD
 URL:            http://www.gorillatoolkit.org/pkg/mux
-Source0:        https://github.com/gorilla/mux/archive/%{commit}/mux-%{shortcommit}.tar.gz
-%if 0%{?fedora} >= 19
+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}
@@ -26,9 +30,9 @@ registered routes and calls a handler for the route that matches the URL or
 other conditions.
 
 %package devel
-BuildRequires:  golang
+BuildRequires:  golang >= 1.2.1-3
 BuildRequires:  golang(github.com/gorilla/context)
-Requires:       golang
+Requires:       golang >= 1.2.1-3
 Requires:       golang(github.com/gorilla/context)
 Summary:        A powerful URL router and dispatcher for golang
 Provides:       golang(%{import_path}) = %{version}-%{release}
@@ -45,13 +49,13 @@ This package contains library source intended for building other packages
 which use gorilla/mux.
 
 %prep
-%setup -n %setup -n mux-%{commit}
+%setup -q -n %{repo}-%{commit}
 
 %build
 
 %install
-install -d %{buildroot}/%{gopath}/src/%{import_path}
-cp -av *.go %{buildroot}/%{gopath}/src/%{import_path}
+install -d -p %{buildroot}/%{gopath}/src/%{import_path}
+cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path}
 
 %check
 GOPATH=%{gopath}:%{buildroot}/%{gopath} go test %{import_path}
@@ -59,17 +63,24 @@ GOPATH=%{gopath}:%{buildroot}/%{gopath} go test %{import_path}
 %files devel
 %defattr(-,root,root,-)
 %doc LICENSE README.md
-%dir %attr(755,root,root) %{gopath}
-%dir %attr(755,root,root) %{gopath}/src
-%dir %attr(755,root,root) %{gopath}/src/github.com
-%dir %attr(755,root,root) %{gopath}/src/github.com/gorilla
-%dir %attr(755,root,root) %{gopath}/src/github.com/gorilla/mux
-%{gopath}/src/%{import_path}/*.go
+%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
+%{gopath}/src/%{import_path}
 
 %changelog
+* Tue Apr 21 2015 jchaloup <jchaloup at redhat.com> - 0-0.16.git8096f47
+- Bump to upstream 8096f47503459bcc74d1f4c487b7e6e42e5746b5
+  related: #1001317
+
+* Thu Jul 31 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 0-0.15.git
+- do not own dirs owned by golang
+- archfulness and defattr for el6 handled separately
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.14.git136d54f
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Sat May 31 2014 Lokesh Mandvekar <lsm5 at redhat.com> 0-0.13.git
 - update to commit 136d54f81f (required for docker 1.0
-https://github.com/dotcloud/docker/issues/5908 )
+  https://github.com/dotcloud/docker/issues/5908 )
 
 * Fri Jan 17 2014 Lokesh Mandvekar <lsm5 at redhat.com> 0-0.12.gite718e93
 - exclusivearch for el6+
diff --git a/sources b/sources
index 08f2ed1..5f0bda0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-09b6fc6485df4dff29435e0321264555  mux-136d54f.tar.gz
+9b643adab0edea5dd1dc7a2951ed5216  mux-8096f47.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/golang-github-gorilla-mux.git/commit/?h=el6&id=dabc1a1fade97586b922f41d9dd4e77835b96ce0


More information about the scm-commits mailing list