[rfpkg] Fixup buildrequires and use correct python macros
by Leigh Scott
commit 7024bcc1d31346283478360089077017791ef919
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Sep 29 09:08:21 2019 +0100
Fixup buildrequires and use correct python macros
rfpkg.spec | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/rfpkg.spec b/rfpkg.spec
index 1dbe11b..be3ace3 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -23,6 +23,7 @@ BuildArch: noarch
BuildRequires: pkgconfig
BuildRequires: bash-completion
+BuildRequires: python-rpm-macros
Requires: git
Requires: koji
@@ -30,9 +31,9 @@ Requires: redhat-rpm-config
%if %{with python2}
# This package redefines __python and can use the python_ macros
-%global __python %{__python2}
-BuildRequires: python2-devel
+BuildRequires: python2
+BuildRequires: python2-rpm-macros
BuildRequires: python2-setuptools
# We br these things for man page generation due to imports
BuildRequires: rpmfusion-cert
@@ -51,9 +52,9 @@ Requires: packagedb-cli > 2.2
%else # python3
# This package redefines __python and can use the python_ macros
-%global __python %{__python3}
-BuildRequires: python3-devel
+BuildRequires: python3
+BuildRequires: python3-rpm-macros
BuildRequires: python3-setuptools
# We br these things for man page generation due to imports
@@ -83,12 +84,21 @@ RPM Fusion utility for working with dist-git.
%setup -q
%build
+%if %{with python2}
%py_build
%{__python} doc/rfpkg_man_page.py > rfpkg.1
+%else
+%py3_build
+%{__python3} doc/rfpkg_man_page.py > rfpkg.1
+%endif
%install
+%if %{with python2}
%py_install
+%else
+%py3_install
+%endif
%{__install} -d %{buildroot}%{_mandir}/man1
%{__install} -p -m 0644 rfpkg.1 %{buildroot}%{_mandir}/man1
%if 0%{?rhel} && 0%{?rhel} == 7
@@ -102,7 +112,11 @@ mv %{buildroot}%{compdir}/rfpkg.bash $RPM_BUILD_ROOT%{compdir}/rfpkg
# cannot use -m nose on EL6 (python 2.6)
nosetests
%else
-#{__python} -m nose
+%if %{with python2}
+#{__python2} -m nose
+%else
+#{__python3} -m nose
+%endif
%endif
4 years, 6 months
[xmltv] Pull in upstream patches to resolve grabber issues
by Gary Buhrmaster
commit 5e8b5054c9318e28ec65347472f4fc7b4321a282
Author: Gary Buhrmaster <gary.buhrmaster(a)gmail.com>
Date: Sun Sep 29 07:52:58 2019 +0000
Pull in upstream patches to resolve grabber issues
0015-telsu-update-time-parser-for-new-format.patch | 26 +++++++++
...pparit-update-for-new-class-names-in-HTML.patch | 65 ++++++++++++++++++++++
xmltv.spec | 10 +++-
3 files changed, 100 insertions(+), 1 deletion(-)
---
diff --git a/0015-telsu-update-time-parser-for-new-format.patch b/0015-telsu-update-time-parser-for-new-format.patch
new file mode 100644
index 0000000..16829ac
--- /dev/null
+++ b/0015-telsu-update-time-parser-for-new-format.patch
@@ -0,0 +1,26 @@
+From 7aec62ed5d84700c86121261961da07fc7edd07c Mon Sep 17 00:00:00 2001
+From: Stefan Becker <chemobejk(a)gmail.com>
+Date: Sun, 1 Sep 2019 01:08:02 +0300
+Subject: [PATCH 15/16] telsu: update time parser for new format
+
+The time format is now 'HH.MM' instead of 'HH:MM'.
+---
+ grab/fi/fi/source/telsu.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grab/fi/fi/source/telsu.pm b/grab/fi/fi/source/telsu.pm
+index eac8b988..d77303eb 100644
+--- a/grab/fi/fi/source/telsu.pm
++++ b/grab/fi/fi/source/telsu.pm
+@@ -116,7 +116,7 @@ sub grab {
+
+ if ($title && $time && $desc) {
+ if (my($new, $start_h, $start_m, $end_h, $end_m) =
+- $time->as_text() =~ /^(.+)\s(\d{2}):(\d{2})\s-\s(\d{2}):(\d{2})/) {
++ $time->as_text() =~ /^(.+)\s(\d{2})[:.](\d{2})\s-\s(\d{2})[:.](\d{2})/) {
+ $title = $title->as_text();
+ $desc = $desc->as_text();
+
+--
+2.21.0
+
diff --git a/0016-ampparit-update-for-new-class-names-in-HTML.patch b/0016-ampparit-update-for-new-class-names-in-HTML.patch
new file mode 100644
index 0000000..05867fb
--- /dev/null
+++ b/0016-ampparit-update-for-new-class-names-in-HTML.patch
@@ -0,0 +1,65 @@
+From b25f2115957cd60a3f08927e65b081849bdae2ff Mon Sep 17 00:00:00 2001
+From: Stefan Becker <chemobejk(a)gmail.com>
+Date: Sun, 1 Sep 2019 01:28:52 +0300
+Subject: [PATCH 16/16] ampparit: update for new class names in HTML
+
+---
+ grab/fi/fi/source/ampparit.pm | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/grab/fi/fi/source/ampparit.pm b/grab/fi/fi/source/ampparit.pm
+index 3984bc03..8d2768e9 100644
+--- a/grab/fi/fi/source/ampparit.pm
++++ b/grab/fi/fi/source/ampparit.pm
+@@ -39,7 +39,8 @@ sub channels {
+ # <div class="channel col-xs-6 col-sm-4 col-md-3 col-lg-3">
+ # <div class="channel-wrap">
+ # <div class="channel-header">
+- # <a class="logo" href="/tv/yle-tv1">
++ # <a class="channel-title__logo" href="/tv/yle-tv1">
++ # or <a class="channel-title__name" href="/tv/yle-tv1">
+ # <img src="..." alt="Yle TV1">
+ # </a>
+ # ...
+@@ -52,7 +53,7 @@ sub channels {
+ #
+ if (my $container = $root->look_down("class" => "programming-container")) {
+ if (my @links = $container->look_down("_tag" => "a",
+- "class" => qr/^(?:logo|name)$/)) {
++ "class" => qr/^channel-title__(?:logo|name)$/)) {
+ foreach my $link (@links) {
+ my $id = $link->attr("href");
+
+@@ -108,12 +109,12 @@ sub grab {
+ # ...
+ # <div class="programs">
+ # <div data-tip="..." data-for="..." class="program">
+- # <time class="program-start-time" title="ke 25.7. 6:00" datetime="2018-07-25T03:00:00.000Z">
++ # <time class="program__start-time" title="ke 25.7. 6:00" datetime="2018-07-25T03:00:00.000Z">
+ # 06:00
+ # </time>
+- # <div class="program-right">
+- # <div class="program-title">Aamun AVAus</div>
+- # <div class="program-description">
++ # <div class="program__right">
++ # <div class="program__title">Aamun AVAus</div>
++ # <div class="program__description">
+ # ...
+ # </div>
+ # </div>
+@@ -126,9 +127,9 @@ sub grab {
+ if (my @programmes = $container->look_down("class" => "program")) {
+ foreach my $programme (@programmes) {
+ my $start = $programme->look_down("_tag" => "time",
+- "class" => "program-start-time");
+- my $title = $programme->look_down("class" => "program-title");
+- my $desc = $programme->look_down("class" => "program-description");
++ "class" => "program__start-time");
++ my $title = $programme->look_down("class" => "program__title");
++ my $desc = $programme->look_down("class" => "program__description");
+
+ if ($start && $title && $desc) {
+ if (my($hour, $minute) =
+--
+2.21.0
+
diff --git a/xmltv.spec b/xmltv.spec
index db9a5b9..faa8430 100644
--- a/xmltv.spec
+++ b/xmltv.spec
@@ -1,6 +1,6 @@
Name: xmltv
Version: 0.6.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A set of utilities to manage your TV viewing
License: GPLv2+
@@ -34,6 +34,11 @@ Patch0012: 0012-correct-FSF-address-issue-65.patch
Patch0013: 0013-remove-version-on-use-XMLTV-to-eliminate-certain-pac.patch
# Upstream commit 4579542 - Warning message when unable to retrieve web page (exit status 1)
Patch0014: 0014-Warning-message-when-unable-to-retrieve-web-page-exi.patch
+# Upstream commit 7aec62e - telsu: update time parser for new format
+Patch0015: 0015-telsu-update-time-parser-for-new-format.patch
+# Upstream commit b25f211 - ampparit: update for new class names in HTML
+Patch0016: 0016-ampparit-update-for-new-class-names-in-HTML.patch
+
BuildArch: noarch
@@ -274,6 +279,9 @@ make test
%changelog
+* Sun Sep 29 2019 Gary Buhrmaster <gary.buhrmaster(a)gmail.com> - 0.6.1-9
+- Pull in upstream patches to resolve grabber issues
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.6.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
4 years, 6 months
[rfpkg] minor changes
by Sérgio M. Basto
Summary of changes:
9138171... minor changes (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 6 months
[rfpkg/el7] (12 commits) ...minor changes
by Sérgio M. Basto
Summary of changes:
b17af39... Patch F30 to use python3 (*)
0950819... Add requires and Buildrequires python3-future (*)
435b206... Fix python2 shebang in python3 build (*)
7d80e7e... Fix --dist/--release option for 'master' %dist detection (*)
e04bd8f... Rebuild for python-3.8 (*)
9ef1bde... Tweak %%if for el8 (*)
9b55968... minor improvements (*)
13765a7... Update to 1.26.0 Sync with fedpkg 1.37 (*)
d49e225... Fix sources (*)
773012e... Bug fix (rfpkg new-sources) (*)
1a39ceb... New version with more fixes on multilib builds and python2 (*)
9138171... minor changes (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 6 months
[rfpkg/f30: 8/8] minor changes
by Sérgio M. Basto
commit 913817112b836acfc4fe5ce8dea9b0321516a7f5
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Sep 29 04:24:14 2019 +0100
minor changes
rfpkg.spec | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/rfpkg.spec b/rfpkg.spec
index cd1bee0..1dbe11b 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -23,8 +23,8 @@ BuildArch: noarch
BuildRequires: pkgconfig
BuildRequires: bash-completion
-BuildRequires: git
+Requires: git
Requires: koji
Requires: redhat-rpm-config
@@ -54,7 +54,6 @@ Requires: packagedb-cli > 2.2
%global __python %{__python3}
BuildRequires: python3-devel
-BuildRequires: python3-future
BuildRequires: python3-setuptools
# We br these things for man page generation due to imports
@@ -70,7 +69,6 @@ Requires: python3-rpkg
Requires: redhat-rpm-config
Requires: python3-pycurl
Requires: python3-fedora
-Requires: python3-future
Requires: python3-rpmfusion-cert
Requires: rpmfusion-packager >= 0.6.3-2
Requires: bodhi-client
4 years, 6 months
[rfpkg/f29] (8 commits) ...minor changes
by Sérgio M. Basto
Summary of changes:
e04bd8f... Rebuild for python-3.8 (*)
9ef1bde... Tweak %%if for el8 (*)
9b55968... minor improvements (*)
13765a7... Update to 1.26.0 Sync with fedpkg 1.37 (*)
d49e225... Fix sources (*)
773012e... Bug fix (rfpkg new-sources) (*)
1a39ceb... New version with more fixes on multilib builds and python2 (*)
9138171... minor changes (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 6 months
[rfpkg/f30] (8 commits) ...minor changes
by Sérgio M. Basto
Summary of changes:
e04bd8f... Rebuild for python-3.8 (*)
9ef1bde... Tweak %%if for el8 (*)
9b55968... minor improvements (*)
13765a7... Update to 1.26.0 Sync with fedpkg 1.37 (*)
d49e225... Fix sources (*)
773012e... Bug fix (rfpkg new-sources) (*)
1a39ceb... New version with more fixes on multilib builds and python2 (*)
9138171... minor changes
(*) This commit already existed in another branch; no separate mail sent
4 years, 6 months