Update to 0.7.1

This commit is contained in:
Sergey Zhemoitel 2020-11-26 10:17:34 +03:00
parent e776fbc695
commit 10eb8cc1b0
2 changed files with 42 additions and 18 deletions

View file

@ -1,7 +1,5 @@
removed_sources:
ZeroNet-0.5.4.tar.gz: 7f4ebe83f3c0c11df9ed5e07337bcc7f8e6655f8
ZeroNet-0.5.6.tar.gz: aebabc6846bfbe88368f314b54781b7d65b721d3
sources: sources:
ZeroNet-0.5.7.tar.gz: eaba56db5a93ae33a7e62945cd76da415dddf92c ZeroNet-0.5.7.tar.gz: eaba56db5a93ae33a7e62945cd76da415dddf92c
ZeroNet-0e2f742b7e2d3e7e618645c72dea308683a6254e.zip: 2a413fb8226c64925da04d5a80e8f5cde3ea32b2 ZeroNet-0e2f742b7e2d3e7e618645c72dea308683a6254e.zip: 2a413fb8226c64925da04d5a80e8f5cde3ea32b2
ZeroNet-c1fd2be8cfadf3e93ae70e3d9763875460bb81a3.zip: 55a811829403086a3d6d24513615758eefa982be ZeroNet-c1fd2be8cfadf3e93ae70e3d9763875460bb81a3.zip: 55a811829403086a3d6d24513615758eefa982be
zeronet-0.7.1.tar.gz: 2b91f391200805b9f3ee22b112b8f832449171b7

View file

@ -5,11 +5,11 @@
%define debug_package %nil %define debug_package %nil
Name: zeronet Name: zeronet
Version: 0.6.5 Version: 0.7.1
Release: 1 Release: 1
Summary: ZeroNet Summary: ZeroNet
URL: https://zeronet.io URL: https://zeronet.io
Source: %{oname}-%{version}.tar.gz Source: https://github.com/HelloZeroNet/ZeroNet/archive/v%{version}/%{name}-%{version}.tar.gz
#Source0: %{oname}-%{gitrev}.zip #Source0: %{oname}-%{gitrev}.zip
Source10: %{name}_starttor Source10: %{name}_starttor
Source11: %{name}_torrc Source11: %{name}_torrc
@ -17,12 +17,38 @@ Source12: %{name}_start
Group: Development/Other Group: Development/Other
License: GPLv2 License: GPLv2
BuildArch: noarch BuildArch: noarch
BuildRequires: python >= 2.7 BuildRequires: pkgconfig(python3)
BuildRequires: python-setuptools BuildRequires: python3egg(setuptools)
BuildRequires: imagemagick BuildRequires: python3egg(gevent) >= 1.1.0
Requires: python-gevent BuildRequires: python3egg(msgpack) >= 0.4.4
Requires: python-msgpack BuildRequires: python3egg(base58)
Requires: tor BuildRequires: python3egg(merkletools)
BuildRequires: python3egg(pyelliptic) == 1.5.6
BuildRequires: python3egg(rsa)
BuildRequires: python3egg(pysocks)
BuildRequires: python3egg(pyasn1)
BuildRequires: python3egg(websocket_client)
BuildRequires: python3egg(gevent-websocket)
BuildRequires: python3egg(bencode.py)
BuildRequires: python3egg(coincurve)
BuildRequires: python3egg(python-bitcoinlib)
BuildRequires: python3egg(maxminddb)
BuildRequires: imagemagick
Requires: python3egg(gevent) >= 1.1.0
Requires: python3egg(msgpack) >= 0.4.4
Requires: python3egg(base58)
Requires: python3egg(merkletools)
Requires: python3egg(pyelliptic) == 1.5.6
Requires: python3egg(rsa)
Requires: python3egg(pysocks)
Requires: python3egg(pyasn1)
Requires: python3egg(websocket_client)
Requires: python3egg(gevent-websocket)
Requires: python3egg(bencode.py)
Requires: python3egg(coincurve)
Requires: python3egg(python-bitcoinlib)
Requires: python3egg(maxminddb)
Requires: tor
%description %description
Decentralized websites using Bitcoin crypto and Decentralized websites using Bitcoin crypto and
@ -36,12 +62,12 @@ the BitTorrent network
%install %install
install -d %{buildroot}/{%{_bindir},%{_datadir}/{%{name},applications,pixmaps},%{_iconsdir}/hicolor/{16x16,32x32,24x24,48x48}/apps/%{name}} install -d %{buildroot}/{%{_bindir},%{_datadir}/{%{name},applications,pixmaps},%{_iconsdir}/hicolor/{16x16,32x32,24x24,48x48}/apps/%{name}}
install -d %{buildroot}/%{python_sitelib}/%{name}/tools install -d %{buildroot}/%{python3_sitelib}/%{name}/tools
install -Dm0755 start.py zeronet.py %{buildroot}/%{python_sitelib}/%{name} install -Dm0755 start.py zeronet.py %{buildroot}/%{python3_sitelib}/%{name}
install -Dm0755 %{SOURCE10} %{buildroot}/%{python_sitelib}/%{name}/tools/start.cmd install -Dm0755 %{SOURCE10} %{buildroot}/%{python3_sitelib}/%{name}/tools/start.cmd
install -Dm0644 %{SOURCE11} %{buildroot}/%{python_sitelib}/%{name}/tools/torrc install -Dm0644 %{SOURCE11} %{buildroot}/%{python3_sitelib}/%{name}/tools/torrc
install -Dm0755 %{SOURCE12} %{buildroot}/%{_bindir}/%{name} install -Dm0755 %{SOURCE12} %{buildroot}/%{_bindir}/%{name}
cp -r plugins src %{buildroot}%{python_sitelib}/%{name} cp -r plugins src %{buildroot}%{python3_sitelib}/%{name}
# menu-entry # menu-entry
cat > %{buildroot}%{_datadir}/applications/%{name}.desktop <<EOF cat > %{buildroot}%{_datadir}/applications/%{name}.desktop <<EOF
@ -71,7 +97,7 @@ EOF
%files %files
%doc LICENSE %doc LICENSE
%{_bindir}/%{name} %{_bindir}/%{name}
%{python_sitelib} %{python3_sitelib}
%{_iconsdir}/hicolor %{_iconsdir}/hicolor
%{_datadir}/pixmaps %{_datadir}/pixmaps
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop