From 50220fc63ab8a1cf7bf6c5b7b095936a31ab7f91 Mon Sep 17 00:00:00 2001
From: Juan Orti Alcaine <juan.orti@nologin.es>
Date: Nov 09 2017 13:33:11 +0000
Subject: Version 2.0.4


---

diff --git a/.gitignore b/.gitignore
index d09773e..f441835 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /nyx-1.4.6-20170712git08eec6f.tar.xz
+/nyx-2.0.4.tar.gz
diff --git a/nyx.spec b/nyx.spec
index 2fef0bd..f36d317 100644
--- a/nyx.spec
+++ b/nyx.spec
@@ -1,56 +1,46 @@
-%global commit 08eec6f9067538778264eb952097ef982e2b4bc0
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20170712
+%global _description\
+Nyx is a command-line monitor for Tor. With this you can get detailed\
+real-time information about your relay such as bandwidth usage,\
+connections, logs, and much more.
 
 Name:           nyx
-Version:        1.4.6
-Release:        2.%{date}git%{shortcommit}%{?dist}
-Summary:        Terminal status monitor for Tor
+Version:        2.0.4
+Release:        1%{?dist}
+Summary:        Command-line monitor for Tor
 License:        GPLv3
-URL:            https://gitweb.torproject.org/nyx.git
-# git clone https://git.torproject.org/nyx.git
-# cd nyx; git archive --format=tar --prefix=nyx/ %%{commit} | xz > ../%%{name}-%%{version}-%%{date}git%%{shortcommit}.tar.xz
-Source0:        %{name}-%{version}-%{date}git%{shortcommit}.tar.xz
+URL:            https://nyx.torproject.org
+Source0:        https://files.pythonhosted.org/packages/source/n/%{name}/%{name}-%{version}.tar.gz
 BuildArch:      noarch
 BuildRequires:  python3-devel
-BuildRequires:  python3-stem
-BuildRequires:  python3-sphinx
+# Tests disabled
+#BuildRequires:  python3-stem
+#BuildRequires:  python3-pytest-flakes
+#BuildRequires:  python3-pytest-pep8
 Requires:       python3-stem
 Suggests:       %{name}-doc = %{version}-%{release}
+Provides:       tor-arm = %{version}-%{release}
+Obsoletes:      tor-arm <= 1.4.5.0-17
 
-%description
-The anonymizing relay monitor (nyx) is a terminal status monitor for Tor relays,
-intended for command-line aficionados, ssh connections, and anyone with a tty
-terminal. This works much like top does for system usage, providing real time
-statistics for:
-
- - bandwidth, CPU, and memory usage
- - relay's current configuration
- - logged events
- - connection details (IP, host name, fingerprint, and consensus data)
- - etc.
-
+%description %_description
 
 %package doc
-Summary:        Documentation for nyx
+Summary:        %summary
 
-%description doc
-Documentation for nyx
+%description doc %_description
 
 %prep
-%autosetup -n %{name}
+%autosetup
 
 %build
 %py3_build
-pushd docs
-SPHINXBUILD=sphinx-build-3 make man
-SPHINXBUILD=sphinx-build-3 make html
-SPHINXBUILD=sphinx-build-3 make text
-popd
 
 %install
 %py3_install
-install -D -m 0644 docs/_build/man/Nyx.1 %{buildroot}%{_mandir}/man1/nyx.1
+install -D -m 0644 nyx.1 %{buildroot}%{_mandir}/man1/nyx.1
+
+%check
+# Tests disabled
+#%%{__python3} run_tests.py
 
 %files
 %license LICENSE
@@ -59,10 +49,14 @@ install -D -m 0644 docs/_build/man/Nyx.1 %{buildroot}%{_mandir}/man1/nyx.1
 %{python3_sitelib}/%{name}-%{version}*-py*.egg-info
 
 %files doc
-%doc docs/_build/html docs/_build/text
+%license LICENSE
+%doc web
 %{_mandir}/man1/nyx.1*
 
 %changelog
+* Wed Nov 08 2017 Juan Orti Alcaine <jorti@fedoraproject.org> - 2.0.4-1
+- Version 2.0.4
+
 * Wed Jul 12 2017 Juan Orti Alcaine <jorti@fedoraproject.org> - 1.4.6-2.20170712git08eec6f
 - Use Python3
 - Doc subpackage
diff --git a/sources b/sources
index 4a2e4a7..8f811af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nyx-1.4.6-20170712git08eec6f.tar.xz) = 9a759aea6b059d8724c2396c97f780e40236437b1cce9ec33d99f47dc6b5bd28e2b38518c9f8a560e81d4ea327955fc187802aae2f72d77e759fb36181e1c4af
+SHA512 (nyx-2.0.4.tar.gz) = bb64b6c38bbfc9837215503a69b4a6b7a11b8a1e230f42c51a405472689a3d46d74dd06b2417c90512b63e9605b33198c5132b660f9eca037016a39c5e4f0ecf