From 82ef906544dbb86829e3613ce5165ffab52f8f37 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Aug 31 2022 14:48:30 +0000 Subject: [PATCH 1/2] Updated to version 4.3.1. --- diff --git a/.gitignore b/.gitignore index 4dac511..f3430db 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,6 @@ /Electrum-4.1.5.tar.gz.ThomasV.asc /Electrum-4.2.1.tar.gz /Electrum-4.2.1.tar.gz.asc +/Electrum-4.3.1.tar.gz +/gpgkey-electrum.gpg +/Electrum-4.3.1.tar.gz.asc diff --git a/electrum.appdata.xml b/electrum.appdata.xml deleted file mode 100644 index 4d70232..0000000 --- a/electrum.appdata.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - electrum.desktop - CC0-1.0 - MIT and BSD - Electrum - A lightweight Bitcoin Client - -

- Electrum is an easy to use Bitcoin client. It protects you from losing - coins in a backup mistake or computer failure, because your wallet can - be recovered from a secret phrase that you can write on paper or learn - by heart. There is no waiting time when you start the client, because - it does not download the Bitcoin block chain. -

- - - - - https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/06-main-empty.png - Main window on after the wizard is done - - - https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/01-install-wizard-connect-to-sever.png - Install wizard connect to server - - - https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/02-install-wizard-wallet-type.png - Install wizard wallet type - - - https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/03-install-wizard-keystore.png - Install wizard keystore - - - https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/04-install-wizard-generation-seed.png - Install wizard generation seed - - - https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/05-install-wizard-password.png - Install wizard password - - - https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/07-receive.png - Receive bitcoin - - - https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/10-send-freedom-fund.png - Send bitcoin - - - https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/11-url-integration.png - URL integration - - - https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/13-main-many-transactions.png - Main window after several transactions - - - - https://electrum.org/ - jonnyheggheim_at_sigaint.org - diff --git a/electrum.metainfo.xml b/electrum.metainfo.xml new file mode 100644 index 0000000..4d70232 --- /dev/null +++ b/electrum.metainfo.xml @@ -0,0 +1,64 @@ + + + + electrum.desktop + CC0-1.0 + MIT and BSD + Electrum + A lightweight Bitcoin Client + +

+ Electrum is an easy to use Bitcoin client. It protects you from losing + coins in a backup mistake or computer failure, because your wallet can + be recovered from a secret phrase that you can write on paper or learn + by heart. There is no waiting time when you start the client, because + it does not download the Bitcoin block chain. +

+ + + + + https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/06-main-empty.png + Main window on after the wizard is done + + + https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/01-install-wizard-connect-to-sever.png + Install wizard connect to server + + + https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/02-install-wizard-wallet-type.png + Install wizard wallet type + + + https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/03-install-wizard-keystore.png + Install wizard keystore + + + https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/04-install-wizard-generation-seed.png + Install wizard generation seed + + + https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/05-install-wizard-password.png + Install wizard password + + + https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/07-receive.png + Receive bitcoin + + + https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/10-send-freedom-fund.png + Send bitcoin + + + https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/11-url-integration.png + URL integration + + + https://jonny.fedorapeople.org/electrum-2.7.12-screenshot-gnome/13-main-many-transactions.png + Main window after several transactions + + + + https://electrum.org/ + jonnyheggheim_at_sigaint.org + diff --git a/electrum.spec b/electrum.spec index e067a1b..5c0de50 100644 --- a/electrum.spec +++ b/electrum.spec @@ -1,6 +1,6 @@ Name: electrum -Version: 4.2.1 -Release: 4%{?dist} +Version: 4.3.1 +Release: 1%{?dist} Summary: A lightweight Bitcoin Client License: MIT @@ -9,9 +9,9 @@ Source0: https://download.electrum.org/%{version}/Electrum-%{version}.tar Source1: https://download.electrum.org/%{version}/Electrum-%{version}.tar.gz.asc #Wed Feb 01 2017, exported the upstream gpg key using the command: #gpg2 --export --export-options export-minimal 6694D8DE7BE8EE5631BED9502BD5824B7F9470E6 9EDAFF80E080659604F4A76B2EBB056FD847F8A7 0EEDCFD5CAFB459067349B23CA9EEEC43DF911DC > gpgkey-electrum.gpg -Source2: gpgkey-electrum.gpg -Source3: electrum.appdata.xml -Source4: electrum.1 +Source2: gpgkey-%{name}.gpg +Source3: %{name}.metainfo.xml +Source4: %{name}.1 Patch0: fix-desktop-exec.patch BuildArch: noarch @@ -21,9 +21,11 @@ BuildRequires: python3-setuptools BuildRequires: python3-qt5-devel BuildRequires: gettext +BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: gnupg2 +Requires: hicolor-icon-theme Requires: python%{python3_version}dist(pyqt5) Requires: python3-cryptography # Unlucky rpm automatic dependency generation doesn't catch this dependency @@ -44,7 +46,7 @@ by heart. There is no waiting time when you start the client, because it does not download the Bitcoin block chain. %prep -gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 -n Electrum-%{version} rm -rf Electrum.egg-info rm -rf packages @@ -54,7 +56,7 @@ rm -rf packages %install %{py3_install} -install -Dpm 644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +install -Dpm 644 %{SOURCE3} %{buildroot}%{_metainfodir}/%{name}.metainfo.xml install -Dpm 644 %{SOURCE4} %{buildroot}%{_mandir}/man1/%{name}.1 # Remove shebang lines from .py files that aren't executable, and @@ -69,23 +71,32 @@ find %{buildroot} -name \*.py \ %find_lang %{name} %check -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml +appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.metainfo.xml +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %files -f %{name}.lang %doc AUTHORS -%doc README.rst +%doc README.md %doc RELEASE-NOTES %doc PKG-INFO %license LICENCE -%{_bindir}/electrum +%{_bindir}/%{name} %{_mandir}/man1/%{name}.1* +%{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/%{name}.desktop -%{_datadir}/appdata/%{name}.appdata.xml +%{_metainfodir}/%{name}.metainfo.xml %{python3_sitelib}/* %exclude %{python3_sitelib}/%{name}/locale %changelog +* Wed Aug 31 2022 Vitaly Zaitsev - 4.3.1-1 +- Updated to version 4.3.1. +- Switched metainfo to the latest XDG standard. +- Switched to gpgverify macros as required by packaging guidelines. +- Added desktop file check. +- Moved binary file with GPG keys to Fedora look-aside cache. + * Thu Jul 21 2022 Fedora Release Engineering - 4.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/gpgkey-electrum.gpg b/gpgkey-electrum.gpg deleted file mode 100644 index 421f9d8..0000000 Binary files a/gpgkey-electrum.gpg and /dev/null differ diff --git a/sources b/sources index bb52e42..60c75f9 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -SHA512 (Electrum-4.2.1.tar.gz) = 980dfab33f7ae1dfb2f9e77272d00919224b7d4267d5f9a298ba082779ef5cc10260926dd5ad75f6ff54c1b5f451bbe4ee3d0c3908db5b54b3546cb5e9ec49f6 -SHA512 (Electrum-4.2.1.tar.gz.asc) = cd5f9759e9fceacf767cbf086799b419d166f71c2c131d6c45b2f4df667419fc3d6058e9d308c1183046c52f2025eb12058112e25c678e5d6626a45db518aa60 +SHA512 (Electrum-4.3.1.tar.gz) = 5b968814c2df5530fe3149915134c6faf054472bc9cd4fc36978ac3597869333c181ff7805a643647b7a9158d8aa7de0e5c375189103643eba1b3ac03b416893 +SHA512 (Electrum-4.3.1.tar.gz.asc) = d6f8ab234f334a7ea41394f2557c78b4ebfb5da2d4b418cf47c08ebb2e1839d789e5c74420ecc12b18ee32596c6ff6734bd19c068ed336384e5478a4345e3ca5 +SHA512 (gpgkey-electrum.gpg) = 87799a6fcc1adcbae151f0a004f22a1955492e5b6ee68e97682284f6cdab89aa04b48ca118955c427d480e333126fbf05ba0790fd56832eeeb0d6803e7bc0930 From 3ce3366779caf88d313e8929de6c35a3ebc58852 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Aug 31 2022 15:36:45 +0000 Subject: [PATCH 2/2] Converted to 202x-era Python packaging guidelines. --- diff --git a/electrum.spec b/electrum.spec index 5c0de50..ea2a424 100644 --- a/electrum.spec +++ b/electrum.spec @@ -17,8 +17,6 @@ Patch0: fix-desktop-exec.patch BuildArch: noarch BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-qt5-devel BuildRequires: gettext BuildRequires: desktop-file-utils @@ -26,14 +24,17 @@ BuildRequires: libappstream-glib BuildRequires: gnupg2 Requires: hicolor-icon-theme -Requires: python%{python3_version}dist(pyqt5) -Requires: python3-cryptography + # Unlucky rpm automatic dependency generation doesn't catch this dependency Requires: libsecp256k1 -Recommends: zbar -Recommends: python3-trezor >= 0.13.0 -Recommends: python3-btchip >= 0.1.32 +# Extra items are not tracked by runtime autodeps yet +Requires: %{py3_dist cryptography} +Requires: %{py3_dist pyqt5} + +Recommends: zbar +Recommends: python3-trezor >= 0.13.0 +Recommends: python3-btchip >= 0.1.32 Conflicts: python3-trezor < 0.11.2 Conflicts: python3-btchip < 0.1.32 @@ -51,11 +52,16 @@ it does not download the Bitcoin block chain. rm -rf Electrum.egg-info rm -rf packages +%generate_buildrequires +%pyproject_buildrequires -x gui -x crypto + %build -%{py3_build} +%pyproject_wheel %install -%{py3_install} +%pyproject_install +%pyproject_save_files %{name} + install -Dpm 644 %{SOURCE3} %{buildroot}%{_metainfodir}/%{name}.metainfo.xml install -Dpm 644 %{SOURCE4} %{buildroot}%{_mandir}/man1/%{name}.1 @@ -68,17 +74,12 @@ find %{buildroot} -name \*.py \ -perm /u+x,g+x,o+x ! -exec grep -m 1 -q '^#!' {} \; \ -exec chmod a-x {} \; \) \) -%find_lang %{name} - %check -appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.metainfo.xml +appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.metainfo.xml desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop -%files -f %{name}.lang -%doc AUTHORS -%doc README.md -%doc RELEASE-NOTES -%doc PKG-INFO +%files -f %{pyproject_files} +%doc AUTHORS README.md RELEASE-NOTES %license LICENCE %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* @@ -86,12 +87,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/%{name}.desktop %{_metainfodir}/%{name}.metainfo.xml -%{python3_sitelib}/* -%exclude %{python3_sitelib}/%{name}/locale %changelog * Wed Aug 31 2022 Vitaly Zaitsev - 4.3.1-1 - Updated to version 4.3.1. +- Converted to 202x-era Python packaging guidelines. - Switched metainfo to the latest XDG standard. - Switched to gpgverify macros as required by packaging guidelines. - Added desktop file check.