commit fd8bdc22d349e445b2f12e0ace480e212745d983
Author: Lokesh Mandvekar <[email protected]>
Date: Wed Nov 19 08:55:01 2014 -0800
Resolves: rhbz#1165690
From: Jan Chaloupka <[email protected]>
Signed-off-by: Lokesh Mandvekar <[email protected]>
.gitignore | 1 +
golang-github-coreos-go-systemd.spec | 48 ++++++++++++++++++++++------------
sources | 2 +-
3 files changed, 33 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 685ebb5..6f1188a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/go-systemd-68bc612.tar.gz
/v2.tar.gz
+/go-systemd-a606a1e.tar.gz
diff --git a/golang-github-coreos-go-systemd.spec
b/golang-github-coreos-go-systemd.spec
index 963adfc..4630d9d 100644
--- a/golang-github-coreos-go-systemd.spec
+++ b/golang-github-coreos-go-systemd.spec
@@ -1,16 +1,20 @@
%global debug_package %{nil}
-%global import_path github.com/coreos/go-systemd
-%global gopath %{_datadir}/gocode
-%global commit f743bc15d6bddd23662280b4ad20f7c874cdd5ad
+%global provider github
+%global provider_tld com
+%global project coreos
+%global repo go-systemd
+%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+
+%global commit a606a1e936df81b70d85448221c7b1c6d8a74ef1
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: golang-github-coreos-go-systemd
Version: 2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Go bindings to systemd socket activation, journal and D-BUS
APIs
License: ASL 2.0
URL: http://%{import_path}
-Source0: https://%{import_path}/archive/v%{version}.tar.gz
+Source0:
https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
BuildArch: noarch
%else
@@ -21,12 +25,15 @@ ExclusiveArch: %{ix86} x86_64 %{arm}
%{summary}
%package devel
-Requires: golang
+Requires: golang >= 1.2.1-3
+Requires: golang(github.com/godbus/dbus)
Summary: Go bindings to systemd socket activation, journal and D-BUS
APIs
Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path}/activation) = %{version}-%{release}
Provides: golang(%{import_path}/dbus) = %{version}-%{release}
+Provides: golang(%{import_path}/daemon) = %{version}-%{release}
Provides: golang(%{import_path}/journal) = %{version}-%{release}
+Provides: golang(%{import_path}/unit) = %{version}-%{release}
%description devel
%{summary}
@@ -35,29 +42,36 @@ This package contains library source intended for building
other packages
which use coreos/go-systemd.
%prep
-%setup -n go-systemd-%{version}
+%setup -qn %{repo}-%{commit}
%build
%install
-install -d -p
%{buildroot}/%{gopath}/src/%{import_path}/{activation,dbus,journal}
-cp -av {activation,dbus,journal} %{buildroot}/%{gopath}/src/%{import_path}
+install -d -p
%{buildroot}/%{gopath}/src/%{import_path}/{activation,daemon,dbus,journal,unit}
+cp -pav {activation,daemon,dbus,journal,unit}
%{buildroot}/%{gopath}/src/%{import_path}
%files devel
%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/coreos
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}/activation
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}/dbus
-%dir %attr(755,root,root) %{gopath}/src/%{import_path}/journal
+%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
+%dir %{gopath}/src/%{import_path}
+%dir %{gopath}/src/%{import_path}/activation
+%dir %{gopath}/src/%{import_path}/daemon
+%dir %{gopath}/src/%{import_path}/dbus
+%dir %{gopath}/src/%{import_path}/journal
+%dir %{gopath}/src/%{import_path}/unit
%{gopath}/src/%{import_path}/activation/*.go
+%{gopath}/src/%{import_path}/daemon/*.go
%{gopath}/src/%{import_path}/dbus/*.go
%{gopath}/src/%{import_path}/journal/*.go
+%{gopath}/src/%{import_path}/unit/*.go
%changelog
+* Wed Nov 19 2014 jchaloup <[email protected]> - 2-2
+- Update to a606a1e936df81b70d85448221c7b1c6d8a74ef1 commit
+ resolves: #1165688
+- remove gopath and add golang >= 1.2.1-3
+- add Requires on github.com/godbus/dbus
+
* Mon Jun 09 2014 Lokesh Mandvekar <[email protected]> - 2-1
- upstream version bump to v2
- change in NVR format since numbered versions are available
diff --git a/sources b/sources
index eaf119c..2a58d8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-05ee81675250d0eb72dc4e9e0e295523 v2.tar.gz
+e93f53db402fd601878ca55e8f1e95ce go-systemd-a606a1e.tar.gz
_______________________________________________
golang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/golang
