From cf242a83b164161b91729bd381cffe1bdb1b0178 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Oct 12 2013 12:38:34 +0000
Subject: Prepare for packages unbundling


Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

---

diff --git a/etcd.spec b/etcd.spec
index 6a3d2bc..6e41e83 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -2,7 +2,7 @@
 
 Name:		etcd
 Version:	0.1.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A highly-available key value store for shared configuration
 
 License:	ASL 2.0
@@ -24,18 +24,33 @@ A highly-available key value store for shared configuration.
 
 %prep
 %setup -q
-sed -i "s/^\(VER=\).*HEAD)/\1%{version}/" ./scripts/release-version
+echo "package main
+const releaseVersion = \"%{version}\"" > release_version.go
 %patch1 -p1 -b .systemd-activation
+# These all packages should be unbundled
+mkdir -p src/code.google.com/p
+cp -r third_party/code.google.com/p/go.net/ src/code.google.com/p/
+cp -r third_party/code.google.com/p/goprotobuf/ src/code.google.com/p/
+mkdir -p src/github.com/coreos
+cp -r third_party/github.com/coreos/go-log/ src/github.com/coreos/
+cp -r third_party/github.com/coreos/go-raft/ src/github.com/coreos/
+cp -r third_party/github.com/coreos/go-systemd/ src/github.com/coreos/
+# for etcd itself
+ln -s ../../../ src/github.com/coreos/etcd
+mkdir -p src/bitbucket.org/kardianos
+cp -r third_party/bitbucket.org/kardianos/osext/ src/bitbucket.org/kardianos/
 
 %build
-./build
+GOPATH="${PWD}" go build -v -x -o etcd
 
 %install
-install -D -p  etcd %{buildroot}%{_bindir}/etcd
-install -t %{buildroot}%{_bindir} etcd
+install -D -p -m 0755 etcd %{buildroot}%{_bindir}/etcd
 install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
 install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.socket
 
+%check
+# empty for now
+
 %post
 %systemd_post %{name}.service
 
@@ -52,6 +67,10 @@ install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.socket
 %doc LICENSE README.md Documentation/internal-protocol-versioning.md
 
 %changelog
+* Sat Oct 12 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-3
+- Prepare for packages unbundling
+- Verbose build
+
 * Sat Oct 12 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-2
 - Fix typo in the etc.service file
 
@@ -60,4 +79,4 @@ install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.socket
 - Integrate with systemd
 
 * Mon Aug 26 2013 Luke Cypret <cypret@fedoraproject.org> - 0.1.1-1
-Initial creation
+- Initial creation