kubo pushed to asciinema (f22). "Update to new version (..more)"

Fri Mar 27 16:24:10 UTC 2015

>From 7122f5f1aee273756653c2722e9267def2bac354 Mon Sep 17 00:00:00 2001
From: Jakub Jedelsky <jakub.jedelsky at gmail.com>
Date: Fri, 6 Mar 2015 22:59:46 +0100
Subject: Update to new version

- Rewritten to Go
- License changed to GPLv3

diff --git a/.gitignore b/.gitignore
index ea68c06..f4ba189 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /v0.9.7.tar.gz
 /v0.9.8.tar.gz
+/v0.9.9.tar.gz
+/asciinema.1
diff --git a/asciinema.spec b/asciinema.spec
index 710eec6..29e6b40 100644
--- a/asciinema.spec
+++ b/asciinema.spec
@@ -1,30 +1,41 @@
-%if 0%{?rhel}
-%global __python2 %{__python}
-%global python2_sitelib %{python_sitelib}
-%endif
+%global debug_package		%{nil}
+%global provider		github
+%global provider_tld		com
+%global	pkgname			asciinema
+%global project			%{pkgname}-cli
 
+<<<<<<< HEAD
 Name:		asciinema
 Version:	0.9.8
 Release:	2%{?dist}
 Summary:	Command line recorder for asciinema.org service
+=======
+%global	import_path		%{provider}.%{provider_tld}/%{pkgname}/%{project}
+
+%global commit			b68b7e6333e971fc1960c647b4ccfb451ca7f39c
+%global shortcommit		%(c=%{commit}; echo ${c:0:7})
+
+
+Name:		%{pkgname}
+Version:	0.9.9
+Release:	1%{?dist}
+Summary:	Command line client (terminal recorder) for asciinema.org service
+>>>>>>> Update to new version
 
 Group:		Applications/Internet
-License:	MIT
+License:	GPLv3
 URL:		http://asciinema.org
-Source0:	https://github.com/sickill/%{name}/archive/v%{version}.tar.gz
-# https://github.com/sickill/asciinema/issues/51
-Patch1:		asciinema-0.9.7-pty-recorder.patch
-
-BuildArch:	noarch
+Source0:	https://github.com/%{pkgname}/%{project}/archive/v%{version}.tar.gz
+Source1:	asciinema.1
 
-BuildRequires:	python-setuptools
-BuildRequires:	python2-devel
-BuildRequires:	python-nose
-BuildRequires:	python-requests >= 1.1.0
-BuildRequires:	ncurses
-Requires:	python-requests >= 1.1.0
-Requires:	ncurses
-Requires:	python-setuptools
+BuildRequires:	golang
+BuildRequires:	golang-src
+BuildRequires:	gcc
+BuildRequires:	golang(github.com/kr/pty)
+BuildRequires:	golang(code.google.com/p/go.crypto/ssh/terminal)
+BuildRequires:	golang(code.google.com/p/gcfg)
+BuildRequires:	python
+Requires:	glibc
 
 
 %description
@@ -32,43 +43,93 @@ Asciinema is a free and open source solution for recording the terminal sessions
 and sharing them on the web.
 
 
+%package devel
+BuildRequires:		golang >= 1.2.1-3
+BuildRequires:		golang(github.com/kr/pty)
+BuildRequires:		golang(code.google.com/p/go.crypto/ssh/terminal)
+BuildRequires:		golang(code.google.com/p/gcfg)
+Requires:		golang >= 1.2.1-3
+Requires:		golang(github.com/kr/pty)
+Requires:		golang(code.google.com/p/go.crypto/ssh/terminal)
+Requires:		golang(code.google.com/p/gcfg)
+Summary:		A golang registry for global request variables (source libraries)
+Provides:		%{pkgname}-devel = %{version}-%{release}
+Provides:		golang(%{import_path}) = %{version}-%{release}
+Provides:		golang(%{import_path}/api) = %{version}-%{release}
+Provides:		golang(%{import_path}/cli) = %{version}-%{release}
+Provides:		golang(%{import_path}/commands) = %{version}-%{release}
+Provides:		golang(%{import_path}/ptyx) = %{version}-%{release}
+Provides:		golang(%{import_path}/terminal) = %{version}-%{release}
+Provides:		golang(%{import_path}/util) = %{version}-%{release}
+
+
+%description devel
+%{summary}
+
+This package provides the source libraries for asciinema(-cli).
+
+
 %prep
-%setup -q
-%patch1 -p1
+%setup -q -n %{pkgname}-%{version}
 
 
 %build
-%{__python2} setup.py build
+# set up temporary build gopath, and put our directory there
+mkdir -p ./_build/src/%{import_path}
+ln -s $(pwd)/* ./_build/src/%{import_path}/
 
+export GOPATH=$(pwd)/_build:%{gopath}
+go build -o "bin/%{project}" -ldflags "-X main.GitCommit %{shortcommit} -s -linkmode external"
 
-%install
-%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
+%install
+# binary
+install -d %{buildroot}%{_bindir}
+install -p -m 755 bin/%{project} %{buildroot}%{_bindir}/%{project}
+pushd %{buildroot}%{_bindir}
+ln -s %{project} %{pkgname}
+popd
+
+# man page
+install -d %{buildroot}%{_mandir}/man1
+install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/
+
+# devel
+install -d -p %{buildroot}%{gopath}/src/%{import_path}
+for dir in api cli commands ptyx terminal util ;do
+	cp -rpav $dir %{buildroot}%{gopath}/src/%{import_path}/
+done
 
 %check
-nosetests tests/*_test.py
+GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/terminal
+GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/commands
+GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/cli
 
 
 %files
-%doc LICENSE.txt README.md config.example
+%doc CHANGELOG.md LICENSE README.md
+%{_bindir}/asciinema-cli
 %{_bindir}/asciinema
-%{python2_sitelib}/*.egg-info
-%dir %{python2_sitelib}/%{name}
-%{python2_sitelib}/%{name}/*
+%{_mandir}/man1/*
+
+
+%files devel
+%doc CHANGELOG.md LICENSE README.md
+%dir %{gopath}/src/%{provider}.%{provider_tld}/%{pkgname}/%{project}
+%{gopath}/src/%{import_path}
 
 
 %changelog
+* Sat Dec 27 2014 Jakub Jedelsky <jakub.jedelsky at gmail.com> - 0.9.9-1
+- Update to new version
+- Rewritten to Go
+- License changed to GPLv3
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-* Tue Feb 11 2014 Jakub Jedelsky <jakub.jedelsky at gmail.com> - 0.9.8-1
-- update to version 0.9.8
-
-* Thu Feb  6 2014 Jakub Jedelsky <jakub.jedelsky at gmail.com> - 0.9.7-5
-- package python-setuptools is required
-
-* Tue Jan 28 2014 Jakub Jedelsky <jakub.jedelsky at gmail.com> - 0.9.7-4
-- Add support for EPEL6
+* Mon Feb 10 2014 Jakub Jedelsky <jakub.jedelsky at gmail.com> - 0.9.8-1
+- Update to new version
 
 * Mon Jan 27 2014 Jakub Jedelsky <jakub.jedelsky at gmail.com> - 0.9.7-3
 - Add check of tests
@@ -77,6 +138,7 @@ nosetests tests/*_test.py
 
 * Mon Dec  2 2013 Jakub Jedelsky <jakub.jedelsky at gmail.com> - 0.9.7-2
 - A few spec file changes
+- Edit Summary
 
 * Mon Nov 25 2013 Jakub Jedelsky <jakub.jedelsky at gmail.com> - 0.9.7-1
 - Initial package
diff --git a/sources b/sources
index fa6c6aa..5fe2d21 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-050fbe0efd20f6ed7e49b8db01890cdb  v0.9.8.tar.gz
+f6a22f20100a616b6a98fc083f78a421  asciinema.1
+de31c3105c5447a6a2b27da6283affd9  v0.9.9.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/asciinema.git/commit/?h=f22&id=7122f5f1aee273756653c2722e9267def2bac354
