diff --git a/python3.patch b/python3.patch deleted file mode 100644 index 4e7686e..0000000 --- a/python3.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- wavextract.bak 2023-10-20 10:55:38.266247987 -0500 -+++ wavextract 2023-10-20 10:55:57.311161774 -0500 -@@ -98,15 +98,15 @@ - try: - savefile(extreplace(arg, ".wav"), wavextract(arg)) - run_status = 0 -- except Error, e: -- print e -+ except Error as e: -+ print(e) - run_status = 1 -- except CriticalError, e: -- print e -+ except CriticalError as e: -+ print(e) - sys.exit(1) - else: -- print "wavextract - program for extracting embedded audio data from JPEG images" -- print "Usage: %s image1.jpg image2.jpg ..." % sys.argv[0] -+ print("wavextract - program for extracting embedded audio data from JPEG images") -+ print("Usage: %s image1.jpg image2.jpg ..." % sys.argv[0]) - sys.exit(0) - - sys.exit(run_status) diff --git a/wavextract.spec b/wavextract.spec index 563be44..25d7497 100644 --- a/wavextract.spec +++ b/wavextract.spec @@ -1,13 +1,12 @@ Name: wavextract Version: 1.0.0 -Release: 39%{?dist} +Release: 30%{?dist} Summary: Program for extracting embedded audio data from JPEG images Summary(pl): Program do wyciągania zagnieżdżonych danych audio z plików JPEG -License: GPL-2.0-or-later +License: GPLv2+ URL: http://developer.berlios.de/projects/wavextract Source0: http://download.berlios.de/wavextract/%name-%version.tar.gz Patch0: wavextract-1.0.0-pillow.patch -Patch1: python3.patch BuildArch: noarch BuildRequires: python3-devel Requires: python3 python3-imaging @@ -20,9 +19,9 @@ Program do wyciągania zagnieżdżonych danych audio z plików JPEG. %prep %setup -qn %{name} -%patch -P 0 -p1 -%patch -P 1 -p0 +%patch0 -p1 %py3_shebang_fix ./wavextract +2to3 -w wavextract %build #nothing to build @@ -37,33 +36,6 @@ cp %{name} $RPM_BUILD_ROOT%{_bindir}/%{name} %{_bindir}/%{name} %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.0.0-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.0.0-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.0.0-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.0.0-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 1.0.0-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.0.0-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Oct 20 2023 Gwyn Ciesla - 1.0.0-33 -- Drop dependency on 2to3 - -* Sat Jul 22 2023 Fedora Release Engineering - 1.0.0-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Mar 03 2023 Gwyn Ciesla - 1.0.0-31 -- migrated to SPDX license - * Sat Jan 21 2023 Fedora Release Engineering - 1.0.0-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild