diff --git a/airnef-1.1-missing-re-import.patch b/airnef-1.1-missing-re-import.patch deleted file mode 100644 index 4fc1d33..0000000 --- a/airnef-1.1-missing-re-import.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/airnef.pyw b/airnef.pyw -index 3d9c17d..cd36eac 100644 ---- a/airnef.pyw -+++ b/airnef.pyw -@@ -48,6 +48,7 @@ else: - import time - import subprocess - import os -+import re - import errno - import platform - import json diff --git a/airnef.spec b/airnef.spec index 4430946..3c931b6 100644 --- a/airnef.spec +++ b/airnef.spec @@ -11,17 +11,15 @@ Name: airnef Version: 1.1 -Release: 35%{?dist} +Release: 6%{?dist} Summary: Wireless download from your Nikon/Canon Camera -# Automatically converted from old format: GPLv3 - review is highly recommended. -License: GPL-3.0-only +License: GPLv3 URL: http://www.testcams.com/airnef/ BuildArch: noarch Source0: http://www.testcams.com/airnef/Version_%{version}/airnef_v%{version}_Source.zip Patch0: airnef-1.1-rpm-paths.patch -Patch1: airnef-1.1-missing-re-import.patch BuildRequires: %python-devel @@ -82,7 +80,7 @@ install -m 755 wrapper %buildroot%_bindir/airnefcmd %_bindir/* %dir %appdir %appdir/*.py -%if "%python" == "python3" +%if %python == python3 %appdir/__pycache__ %else %appdir/*.pyo @@ -94,91 +92,8 @@ install -m 755 wrapper %buildroot%_bindir/airnefcmd %appresdir/*.xbm + %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 1.1-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Sep 19 2025 Python Maint - 1.1-34 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 1.1-33 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Wed Jul 23 2025 Fedora Release Engineering - 1.1-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jun 02 2025 Python Maint - 1.1-31 -- Rebuilt for Python 3.14 - -* Thu Jan 16 2025 Fedora Release Engineering - 1.1-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Jul 29 2024 Miroslav Suchý - 1.1-29 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 1.1-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 1.1-27 -- Rebuilt for Python 3.13 - -* Mon Jan 22 2024 Fedora Release Engineering - 1.1-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.1-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1.1-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Python Maint - 1.1-23 -- Rebuilt for Python 3.12 - -* Wed Jan 18 2023 Fedora Release Engineering - 1.1-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.1-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 1.1-20 -- Rebuilt for Python 3.11 - -* Wed Jan 19 2022 Fedora Release Engineering - 1.1-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Dec 04 2021 Pavel Raiskup - 1.1-18 -- add missing 're' import, rhbz#1990073 - -* Wed Jul 21 2021 Fedora Release Engineering - 1.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 1.1-15 -- Rebuilt for Python 3.10 - -* Mon Jan 25 2021 Fedora Release Engineering - 1.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 1.1-12 -- Rebuilt for Python 3.9 - -* Thu Apr 02 2020 Björn Esser - 1.1-11 -- Fix string quoting for rpm >= 4.16 - -* Tue Jan 28 2020 Fedora Release Engineering - 1.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 1.1-9 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 1.1-8 -- Rebuilt for Python 3.8 - -* Wed Jul 24 2019 Fedora Release Engineering - 1.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Thu Apr 25 2019 Pavel Raiskup - 1.1-6 - require python3-tkinter (rhbz#1702714)