[smplayer] smplayer.appdata.xml also upstreamed, but not validate well on epel 7 and 8
by Sérgio M. Basto
commit 402e5c4be184d1152684623a24b13b8c37394b7d
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Aug 17 22:39:36 2021 +0100
smplayer.appdata.xml also upstreamed, but not validate well on epel 7 and 8
smplayer.appdata.xml | 62 ----------------------------------------------------
smplayer.spec | 15 ++++++++++---
2 files changed, 12 insertions(+), 65 deletions(-)
---
diff --git a/smplayer.spec b/smplayer.spec
index 45b9007..6c1e1ec 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -2,13 +2,12 @@ Name: smplayer
Version: 21.8.0
%global smplayer_themes_ver 20.11.0
%global smplayer_skins_ver 20.11.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A graphical frontend for mplayer and mpv
License: GPLv2+
URL: https://www.smplayer.info/
Source0: https://downloads.sourceforge.net/smplayer/smplayer-%{version}.tar.bz2
-Source2: %{name}.appdata.xml
Source3: https://downloads.sourceforge.net/smplayer/smplayer-themes-%{smplayer_the...
Source4: https://downloads.sourceforge.net/smplayer/smplayer-skins-%{smplayer_skin...
# Fix regression in Thunar (TODO: re-check in upcoming versions!)
@@ -126,11 +125,18 @@ pushd smplayer-skins-%{smplayer_skins_ver}
mv README.txt README-skins.txt
mv Changelog Changelog-skins.txt
popd
-install -m 0644 -D %{SOURCE2} %{buildroot}%{_metainfodir}/%{name}.appdata.xml
+
+%if (0%{?rhel} && 0%{?rhel} <= 7)
+mkdir -p %{buildroot}/usr/share/appdata/
+mv %{buildroot}/usr/share/metainfo/%{name}.appdata.xml %{buildroot}%{_metainfodir}/%{name}.appdata.xml
+%endif
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+#https://bugzilla.redhat.com/show_bug.cgi?id=1830923
+%if (0%{?rhel} == 0)
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
+%endif
%if (0%{?rhel} && 0%{?rhel} <= 7)
%post
@@ -169,6 +175,9 @@ fi
%{_datadir}/smplayer/themes/
%changelog
+* Tue Aug 17 2021 Sérgio Basto <sergio(a)serjux.com> - 21.8.0-2
+- smplayer.appdata.xml also upstreamed, but not validate well on epel 7 and 8
+
* Mon Aug 16 2021 Sérgio Basto <sergio(a)serjux.com> - 21.8.0-1
- Update smplayer to 21.8.0
- Patch3 was upstremed
2 years, 8 months
[smplayer/f35] (2 commits) ...fix the buld
by Sérgio M. Basto
Summary of changes:
80706ad... Update smplayer to 21.8.0 (*)
ba6130c... fix the buld (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[vdr-markad/f33] Update to 3.0.10
by Martin Gansser
Summary of changes:
e12581e... Update to 3.0.10 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[vdr-markad/f34] Update to 3.0.10
by Martin Gansser
Summary of changes:
e12581e... Update to 3.0.10 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[vdr-markad/f35] Update to 3.0.10
by Martin Gansser
Summary of changes:
e12581e... Update to 3.0.10 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[vdr-markad] Update to 3.0.10
by Martin Gansser
commit e12581ed73ec0891d4f3e7b7e2ae0941eee3bd38
Author: Martin Gansser <mgansser(a)online.de>
Date: Tue Aug 17 15:33:29 2021 +0200
Update to 3.0.10
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 85d6fed..10676e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2
/vdr-markad-3.0.7.tar.gz
/vdr-markad-3.0.8.tar.gz
/vdr-markad-3.0.9.tar.gz
+/vdr-markad-3.0.10.tar.gz
diff --git a/sources b/sources
index 95c7315..c4c2fcf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-markad-3.0.9.tar.gz) = 3048d23923dca687f587b62ff56f6e8276db79739e7eec866c72577439a125a7fcff81cb3e537a9550f85abfdbd80af2f07ce9c96f691e14deca2470af2049e5
+SHA512 (vdr-markad-3.0.10.tar.gz) = dafc518ff61eeac80da031282f0eec656e1ff2207942a457d133b404019561af5e51a1ac7750c8b32ab00165e708d997a0fb3b6aee9bc8dfa16f5bf8d12a18b6
diff --git a/vdr-markad.spec b/vdr-markad.spec
index 75aa2a0..fd6b97f 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -1,5 +1,5 @@
Name: vdr-markad
-Version: 3.0.9
+Version: 3.0.10
Release: 1%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
@@ -48,6 +48,9 @@ fi
%{vdr_vardir}/markad/
%changelog
+* Tue Aug 17 2021 Martin Gansser <martinkg(a)fedoraproject.org> - 3.0.10-1
+- Update to 3.0.10
+
* Tue Aug 17 2021 Martin Gansser <martinkg(a)fedoraproject.org> - 3.0.9-1
- Update to 3.0.9
2 years, 8 months
[smplayer] fix the buld
by Sérgio M. Basto
commit ba6130c0d536f682695d3b81c961a5b568cbdebe
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Aug 17 11:34:35 2021 +0100
fix the buld
mongoose_gcc11.patch | 11 -----------
...esktop-files.patch => smplayer-21.08.0-desktop-files.patch | 6 +++---
smplayer.spec | 5 ++---
update_smplayer.sh | 2 +-
4 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/smplayer-0.8.3-desktop-files.patch b/smplayer-21.08.0-desktop-files.patch
similarity index 78%
rename from smplayer-0.8.3-desktop-files.patch
rename to smplayer-21.08.0-desktop-files.patch
index 644fb5b..35dd860 100644
--- a/smplayer-0.8.3-desktop-files.patch
+++ b/smplayer-21.08.0-desktop-files.patch
@@ -1,8 +1,8 @@
---- ./smplayer.desktop.orig 2017-12-25 23:26:46.000000000 +0000
-+++ ./smplayer.desktop 2018-01-10 00:37:31.198919686 +0000
+--- ./smplayer.desktop.orig 2021-08-16 12:58:35.000000000 +0100
++++ ./smplayer.desktop 2021-08-17 11:17:43.468385823 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
- Categories=Qt;KDE;AudioVideo;Player;Video;
+ Categories=Qt;AudioVideo;Player;Video;
Comment=A great MPlayer front-end
-Exec=smplayer %U
+Exec=smplayer %f
diff --git a/smplayer.spec b/smplayer.spec
index a8f796a..45b9007 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -13,9 +13,8 @@ Source3: https://downloads.sourceforge.net/smplayer/smplayer-themes-%{smp
Source4: https://downloads.sourceforge.net/smplayer/smplayer-skins-%{smplayer_skin...
# Fix regression in Thunar (TODO: re-check in upcoming versions!)
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217
-Patch0: smplayer-0.8.3-desktop-files.patch
+Patch0: smplayer-21.08.0-desktop-files.patch
Patch2: smplayer-14.9.0.6966-system-qtsingleapplication.patch
-Patch3: mongoose_gcc11.patch
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
@@ -81,7 +80,6 @@ rm -rf src/qtsingleapplication/
%patch0 -p1 -b .desktop-files
%patch2 -p1 -b .qtsingleapplication
-%patch3 -p1 -b .mongoose_gcc11
# correction for wrong-file-end-of-line-encoding
%{__sed} -i 's/\r//' *.txt
@@ -173,6 +171,7 @@ fi
%changelog
* Mon Aug 16 2021 Sérgio Basto <sergio(a)serjux.com> - 21.8.0-1
- Update smplayer to 21.8.0
+- Patch3 was upstremed
* Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 21.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/update_smplayer.sh b/update_smplayer.sh
index 5b85037..1ebd464 100755
--- a/update_smplayer.sh
+++ b/update_smplayer.sh
@@ -2,7 +2,7 @@ version=21.8.0
#stube_ver=19.6.0
themes_ver=20.11.0
skins_ver=20.11.0
-REPOS="f33 f32 el8 el7"
+REPOS="f35 f34 f33 el8 el7"
if [ -z "$1" ]
then
2 years, 8 months