diff --git a/.gitignore b/.gitignore index a09fa13..8b1b926 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /onionshare-b035330805a5cbe603ca8a7716bf1f76e054f619.tar.gz /onionshare-94010771719ca39f09d711427b41fde4fea37a68.tar.gz /onionshare-41a30dd4e47520fd271af7ee925f018261f47b14.tar.gz +/v0.9.1.tar.gz diff --git a/onionshare-appdata.patch b/onionshare-appdata.patch new file mode 100644 index 0000000..157b162 --- /dev/null +++ b/onionshare-appdata.patch @@ -0,0 +1,20 @@ +--- onionshare-0.9.1/install/onionshare.appdata.xml.orig 2017-01-03 21:35:59.465563802 +0200 ++++ onionshare-0.9.1/install/onionshare.appdata.xml 2017-01-03 21:37:54.650991498 +0200 +@@ -21,11 +21,15 @@ + + + +- https://raw.githubusercontent.com/micahflee/onionshare/master/screenshots/appdata-server.png ++ https://comzeradd.fedorapeople.org/screenshots/onionshare1.png + Sender sharing files with OnionShare + + +- https://raw.githubusercontent.com/micahflee/onionshare/master/screenshots/appdata-client.png ++ https://comzeradd.fedorapeople.org/screenshots/onionshare2.png ++ Sender sharing files with OnionShare ++ ++ ++ https://comzeradd.fedorapeople.org/screenshots/onionshare3.png + Receiver downloading files with Tor Browser + + diff --git a/onionshare.spec b/onionshare.spec index 6f7352b..e8d87c2 100644 --- a/onionshare.spec +++ b/onionshare.spec @@ -1,17 +1,24 @@ -%global commit 41a30dd4e47520fd271af7ee925f018261f47b14 +%global _hardened_build 1 Name: onionshare -Version: 0.8.1 -Release: 4%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Securely and anonymously share files of any size License: GPLv3 URL: https://onionshare.org/ -Source0: https://github.com/micahflee/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz +Source0: https://github.com/micahflee/%{name}/archive/v%{version}.tar.gz +Patch0: %{name}-appdata.patch BuildArch: noarch -BuildRequires: python2-devel desktop-file-utils -Requires: python2 python-flask python-stem pyqt4 pyqt4-webkit +BuildRequires: python3-devel +BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib +Requires: python3-flask +Requires: python3-stem +Requires: python3-qt5 +Requires: nautilus-python + %description OnionShare lets you securely and anonymously share files of any size. It works @@ -24,17 +31,23 @@ user just needs to use Tor Browser to download a file from you. %prep -%setup -q -n %{name}-%{commit} -sed -i '/^Encoding/ d' install/%{name}.desktop +%setup -qn %{name}-%{version} +%patch0 -p1 -b .orig %build -%{__python2} setup.py build +%{__python3} setup.py build %install -%{__python2} setup.py install --skip-build --root %{buildroot} +%{__python3} setup.py install --skip-build --root %{buildroot} desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop +mkdir -p %{buildroot}%{_datadir}/appdata/ +install -m 644 %{_builddir}/%{name}-%{version}/install/%{name}.appdata.xml \ + %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml + +%check +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %files @@ -43,14 +56,16 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/* %{_datadir}/%{name}/* %{_datadir}/applications/* +%{_datadir}/nautilus-python/extensions/%{name}-nautilus* %{_bindir}/%{name} %{_bindir}/%{name}-gui -%{python2_sitelib}/%{name}/* -%{python2_sitelib}/%{name}_gui/* -%{python2_sitelib}/%{name}-%{version}-py2.7.egg-info +%{python3_sitelib}/%{name}* %changelog +* Tue Jan 03 2017 pjp - 0.9.1-1 +- Update to 0.9.1 + * Tue Jul 19 2016 Fedora Release Engineering - 0.8.1-4 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/sources b/sources index eb3bfcf..631e001 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5ed2f9ab6e3048e688d5ebd44db6ac0 onionshare-41a30dd4e47520fd271af7ee925f018261f47b14.tar.gz +SHA512 (v0.9.1.tar.gz) = 08d16577f29cb5c58bf3c547c9a9671da1066a01d13f0f144bce2223e74f61e8b750dc2d055e2d36309450d605f359001c9281732b2c0df64bcb38e757dfc13c