[mimms] Patch to use python3
by Leigh Scott
commit 9976583789efe5b7815911781354367fd8360357
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 1 17:16:56 2024 +0100
Patch to use python3
convert_to_py3.patch | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++
mimms.spec | 19 ++++++++-----
2 files changed, 91 insertions(+), 7 deletions(-)
---
diff --git a/convert_to_py3.patch b/convert_to_py3.patch
new file mode 100644
index 0000000..45eccb1
--- /dev/null
+++ b/convert_to_py3.patch
@@ -0,0 +1,79 @@
+diff -uNrp a/libmimms/core.py b/libmimms/core.py
+--- a/libmimms/core.py 2008-05-12 01:53:08.000000000 +0100
++++ b/libmimms/core.py 2024-09-01 17:06:28.465911780 +0100
+@@ -26,7 +26,7 @@ import sys
+
+ from optparse import OptionParser
+ from time import time
+-from urlparse import urlparse
++from urllib.parse import urlparse
+
+ from . import libmms
+
+@@ -99,7 +99,7 @@ def download(options):
+ "Using the given options, download the stream to a file."
+
+ status = "Connecting ..."
+- if not options.quiet: print status,
++ if not options.quiet: print(status, end=' ')
+ sys.stdout.flush()
+
+ stream = libmms.Stream(options.url, options.bandwidth)
+@@ -117,7 +117,7 @@ def download(options):
+
+ clear = " " * len(status)
+ status = "%s => %s" % (options.url, filename)
+- if not options.quiet: print "\r", clear, "\r", status
++ if not options.quiet: print("\r", clear, "\r", status)
+ sys.stdout.flush()
+
+ timeout_timer = Timer()
+@@ -171,7 +171,7 @@ def download(options):
+ seconds_to_string(remaining)
+ )
+
+- if not options.quiet: print "\r", clear, "\r", status,
++ if not options.quiet: print("\r", clear, "\r", status, end=' ')
+ sys.stdout.flush()
+
+ if options.time and timeout_timer.elapsed() > (options.time*60):
+@@ -231,19 +231,20 @@ def run(argv):
+ download(options)
+ except Timeout:
+ if not options.quiet:
+- print
+- print "Download stopped after user-specified timeout."
++ print()
++ print("Download stopped after user-specified timeout.")
+ except NotResumeableError:
+ if not options.quiet:
+- print
+- print >> sys.stderr, "Non-seekable streams cannot be resumed."
++ print()
++ print("Non-seekable streams cannot be resumed.", file=sys.stderr)
+ except KeyboardInterrupt:
+ if not options.quiet:
+- print
+- print >> sys.stderr, "Download aborted by user."
+- except libmms.Error, e:
+- print >> sys.stderr, "libmms error:", e.message
++ print()
++ print("Download aborted by user.", file=sys.stderr)
++ except libmms.Error as e:
++ print("libmms error:", e.message, file=sys.stderr)
+ else:
+ if not options.quiet:
+- print
+- print "Download complete!"
++ print()
++ print("Download complete!")
++
+diff -uNrp a/mimms b/mimms
+--- a/mimms 2008-05-12 01:53:08.000000000 +0100
++++ b/mimms 2024-09-01 17:10:20.195006924 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.5
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ #
+ # mimms - mms stream downloader
diff --git a/mimms.spec b/mimms.spec
index a8a8851..851f321 100644
--- a/mimms.spec
+++ b/mimms.spec
@@ -1,12 +1,14 @@
Summary: MMS stream downloader
Name: mimms
Version: 3.2.1
-Release: 25%{?dist}
+Release: 26%{?dist}
License: GPLv3+
Group: Applications/Multimedia
URL: http://savannah.nongnu.org/projects/mimms/
Source: http://download.savannah.gnu.org/releases/mimms/mimms-%{version}.tar.bz2
-BuildRequires: python2-devel
+Patch0: convert_to_py3.patch
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
Requires: libmms >= 0.4
BuildArch: noarch
@@ -15,23 +17,26 @@ mimms is a program designed to allow you to download streams using the MMS
protocol and save them to your computer, as opposed to watching them live.
%prep
-%setup -q
+%autosetup -p1
%build
-%py2_build
+%py3_build
%install
-%py2_install
+%py3_install
%files
%doc AUTHORS NEWS README
%license COPYING
%{_bindir}/mimms
-%{python2_sitelib}/mimms-*.egg-info
-%{python2_sitelib}/libmimms/
+%{python3_sitelib}/mimms-*.egg-info
+%{python3_sitelib}/libmimms/
%{_mandir}/man1/mimms.1*
%changelog
+* Sun Sep 01 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3.2.1-26
+- Patch to use python3
+
* Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3.2.1-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
2 months, 2 weeks
[gr-dab/f41] Update to 0.5
by Leigh Scott
Summary of changes:
e676ed6... Update to 0.5 (*)
(*) This commit already existed in another branch; no separate mail sent
2 months, 3 weeks
[gr-dab] Update to 0.5
by Leigh Scott
commit e676ed6f4a6afa956abec37dff42c5d830c30df7
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 1 13:46:20 2024 +0100
Update to 0.5
.gitignore | 1 +
gr-dab-0.4-gnuradio39.patch | 4893 -------------------------------------------
gr-dab.spec | 39 +-
sources | 2 +-
4 files changed, 17 insertions(+), 4918 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f8d6675..c5f3ce5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/gr-dab-a33609bd75192878f9f60c1a9b02fd7473649160.tar.gz
/gr-dab-0.3.tar.gz
/gr-dab-0.4.tar.gz
+/gr-dab-0.5.tar.gz
diff --git a/gr-dab.spec b/gr-dab.spec
index e0be877..7b50501 100644
--- a/gr-dab.spec
+++ b/gr-dab.spec
@@ -6,8 +6,8 @@
Name: gr-dab
URL: https://github.com/andrmuel/gr-dab
-Version: 0.4
-Release: 20%{?dist}
+Version: 0.5
+Release: 1%{?dist}
License: GPLv3+
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -38,9 +38,6 @@ Requires: python3-scipy
Requires: python3-matplotlib
Summary: GNU Radio DAB digital audio broadcasting module
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-# https://github.com/andrmuel/gr-dab/issues/28
-# experimental and untested downstream patch
-Patch0: gr-dab-0.4-gnuradio39.patch
%description
GNU Radio DAB digital audio broadcasting module.
@@ -54,7 +51,7 @@ Development files for gr-dab.
#%%package doc
#Summary: Documentation files for gr-dab
-#Requires: %{name} = %{version}-%{release}
+#Requires: %%{name} = %%{version}-%%{release}
# doxygen bug workaround
#BuildArch: noarch
@@ -64,12 +61,6 @@ Development files for gr-dab.
%prep
%autosetup -p1
-# hack to deal with wrong name
-# drop when upstream adds correct support for gnuradio-3.9
-pushd include
-ln -s grdab dab
-popd
-
%build
%cmake -DENABLE_DOXYGEN=OFF
%cmake_build
@@ -78,37 +69,37 @@ popd
%cmake_install
# remove hashbangs
-pushd %{buildroot}%{python3_sitearch}/grdab
+pushd %{buildroot}%{python3_sitearch}/gnuradio
find . -type f -exec sed -i '/^[ \t]*#!\/usr\/bin\/\(env\|python\)/ d' {} \;
popd
-# tests not ported to gnuradio-3.9, re-enable once ported by upstream
-#%%check
-#cd %%{_vpath_builddir}
-#make test
+%check
+cd %{_vpath_builddir}
+make test
%ldconfig_scriptlets
%files
%license COPYING
%doc AUTHORS README.md THANKS
-%exclude %{_docdir}/%{name}/html
-%exclude %{_docdir}/%{name}/xml
%{_datadir}/gnuradio/grc/blocks/*
%{_libdir}/libgnuradio-dab.so.3.*
-%{python3_sitearch}/{dab,grdab}
+%{python3_sitearch}/gnuradio/
%{_bindir}/*
%files devel
-%{_includedir}/grdab
+%{_includedir}/dab
%{_libdir}/*.so
-%{_libdir}/cmake/{dab,grdab}
+%{_libdir}/cmake/gnuradio-dab/
#%%files doc
-#%doc %{_docdir}/%{name}/html
-#%doc %{_docdir}/%{name}/xml
+#%%doc %%{_docdir}/%%{name}/html
+#%%doc %%{_docdir}/%%{name}/xml
%changelog
+* Sun Sep 01 2024 Leigh Scott <leigh123linux(a)gmail.com> - 0.5-1
+- Update to 0.5
+
* Thu Jun 13 2024 Leigh Scott <leigh123linux(a)gmail.com> - 0.4-20
- Rebuilt for Python 3.13
diff --git a/sources b/sources
index f4aef4d..aad0506 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gr-dab-0.4.tar.gz) = 3630412e8e31ae73b9d904ad999d1205d753e614f17f336c6ff34a45874b3ddecd9b3b66348c30d09a50d2f1846a8ea493dbb7c04c8d352e20ded9e040b9df72
+SHA512 (gr-dab-0.5.tar.gz) = b4199ed006e34e2ecc00b819c44416bc585552c7b14eefae5d40b06067544862a38dbcf254dc010df1583664233a28cac920878caff1234b7ce617079d1c4b47
2 months, 3 weeks
[vdr-markad] Update to 4.1.5
by Martin Gansser
commit 4c0b8d41fce8eff2da7f6c00c2d253819988c6c6
Author: Martin Gansser <mgansser(a)netcom-mail.de>
Date: Sun Sep 1 12:46:53 2024 +0200
Update to 4.1.5
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f1b3e26..f937073 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,3 +106,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2
/vdr-markad-4.1.2.tar.gz
/vdr-markad-4.1.3.tar.gz
/vdr-markad-4.1.4.tar.gz
+/vdr-markad-4.1.5.tar.gz
diff --git a/sources b/sources
index 5f2a1a4..caac709 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-markad-4.1.4.tar.gz) = 90f2915d12b7f71dd3749c0ba34889d5b3a5e6c426a0d1816846a7f67f312b92d07c2c9cfe56ab051fcde4922df1d20e10e95fb4c1bd80715769815d1e6169f0
+SHA512 (vdr-markad-4.1.5.tar.gz) = a8ae49b329b1426f0651438981c747943459a9df24e6b141ba052ab66d3f28d37253d89fd7bff548b7b249e3b2fa4cb639fb4b2107d76cd9c3c3f5090d21aa3c
diff --git a/vdr-markad.spec b/vdr-markad.spec
index 604f142..b4c538e 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -5,7 +5,7 @@
%endif
Name: vdr-markad
-Version: 4.1.4
+Version: 4.1.5
Release: 1%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
@@ -72,6 +72,9 @@ fi
%doc html
%changelog
+* Sun Sep 01 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 4.1.5-1
+- Update to 4.1.5
+
* Fri Aug 30 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 4.1.4-1
- Update to 4.1.4
2 months, 3 weeks