[golang-github-kr-pty/f20: 3/5] messup, fix in next commit

[Lokesh Mandvekar]

commit 3c48718a543631293e240a6a97329da5a2d7d5f3
Merge: dca0298 15ca666
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Sun Sep 22 01:53:40 2013 -0500

    messup, fix in next commit
    
    Signed-off-by: Lokesh Mandvekar <lsm5 at redhat.com>

 golang-github-kr-pty.spec |   50 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 50 insertions(+), 0 deletions(-)
---
diff --cc golang-github-kr-pty.spec
index 0fcf27e,b358b76..792dfaf
--- a/golang-github-kr-pty.spec
+++ b/golang-github-kr-pty.spec
@@@ -1,72 -1,55 +1,122 @@@
++<<<<<<< HEAD
 +%global debug_package   %{nil}
 +%global pkgname         github-kr-pty
 +%global import_path     github.com/kr/pty
 +%global goroot          %(go env GOROOT)
 +%global pkgarch         %(go env GOOS)_%(go env GOARCH)
 +%global commit          27435c699baee43a12e025d8cfde2ee3cbe0ceb6
 +%global shortcommit     %(c=%{commit}; echo ${c:0:7})
 +
 +Name:           golang-%{pkgname}
 +Version:        0
 +Release:        0.9.git%{shortcommit}%{?dist}
++=======
+ %global import_path     github.com/kr/pty
+ %global gopath          %{_datadir}/gocode
+ %global commit          27435c699baee43a12e025d8cfde2ee3cbe0ceb6
+ %global shortcommit     %(c=%{commit}; echo ${c:0:7})
+ 
+ Name:           golang-github-kr-pty
+ Version:        0
+ Release:        0.10.git%{shortcommit}%{?dist}
++>>>>>>> master
  Summary:        PTY interface for Go
  License:        MIT
  URL:            http://godoc.org/%{import_path}
  Source0:        https://%{import_path}/archive/%{commit}/pty-%{shortcommit}.tar.gz
++<<<<<<< HEAD
++=======
+ BuildArch:      noarch
++>>>>>>> master
  
  %description
  Pty is a Go package for using UNIX pseudo-terminals.
  
  %package devel
++<<<<<<< HEAD
 +BuildRequires:  golang
++=======
++>>>>>>> master
  Requires:       golang
  Summary:        PTY interface for Go
  Provides:       golang("%{import_path}") = %{version}-%{release}
  
  %description devel
++<<<<<<< HEAD
 +%{summary}
 +
 +%prep
 +%setup -c
 +mkdir -p src/$(dirname %{import_path})
 +cp -R pty-%{commit} src/$(dirname %{import_path})/pty
 +
 +%build
 +unset GOROOT GOPATH GOOS GOARCH
 +if [ ! -d %{goroot}/src/pkg/%{import_path} ]; then
 +    GOPATH=$(readlink -f .) go install %{import_path}
 +else
 +    GOPATH=$(readlink -f .)
 +    pushd $GOPATH/src
 +    for dir in $(find %{import_path} -type d) ; do
 +        mkdir -p $GOPATH/pkg/%{pkgarch}/$(dirname $dir)
 +        go build -o $GOPATH/pkg/%{pkgarch}/${dir}.a %{import_path}
 +    done
 +    popd
 +fi
 +
 +%install
 +mkdir -p %{buildroot}/%{goroot}/src/pkg/%{import_path}
 +cp -a src/%{import_path}/*.go %{buildroot}%{goroot}/src/pkg/%{import_path}
 +mkdir -p %{buildroot}%{goroot}/pkg/
 +cp -a pkg/* %{buildroot}%{goroot}/pkg/
 +
 +%files devel
 +%defattr(-,root,root,-)
 +%doc src/%{import_path}/License src/%{import_path}/README.md
 +%dir %attr(755,root,root) %{goroot}/src/pkg/github.com/
 +%dir %attr(755,root,root) %{goroot}/src/pkg/github.com/kr/
 +%dir %attr(755,root,root) %{goroot}/src/pkg/%{import_path}
 +%{goroot}/src/pkg/%{import_path}/doc.go
 +%{goroot}/src/pkg/%{import_path}/pty_darwin.go
 +%{goroot}/src/pkg/%{import_path}/pty_linux.go
 +%{goroot}/src/pkg/%{import_path}/run.go
 +%{goroot}/src/pkg/%{import_path}/util.go
 +%dir %attr(755,root,root) %{goroot}/pkg/%{pkgarch}/github.com/
 +%dir %attr(755,root,root) %{goroot}/pkg/%{pkgarch}/github.com/kr/
 +%{goroot}/pkg/%{pkgarch}/%{import_path}.a
 +
 +%changelog
++=======
+ Pty is a Go package for using UNIX pseudo-terminals.
+ 
+ This package contains library source intended for building other packages
+ which use kr/pty.
+ 
+ %prep
+ %setup -n pty-%{commit}
+ 
+ %build
+ 
+ %install
+ install -d %{buildroot}/%{gopath}/src/%{import_path}
+ cp -av *.go %{buildroot}/%{gopath}/src/%{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/kr
+ %dir %attr(755,root,root) %{gopath}/src/github.com/kr/pty
+ %{gopath}/src/%{import_path}/*.go
+ 
+ 
+ %changelog
+ * Sun Sep 22 2013 Matthew Miller <mattdm at fedoraproject.org> 0-0.10.git27435c6
+ - install just the source code for devel package
+ 
++>>>>>>> master
  * Tue Sep 17 2013 Lokesh Mandvekar <lsm5 at redhat.com> 0-0.9.git27435c6
  - version format changed
  - docdir unversioned