[smplayer] Fix and vailidate appdata
by Leigh Scott
commit fe746f5ebda64c9a44dc2ce15394f813afcd16e1
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Sep 10 17:53:15 2020 +0100
Fix and vailidate appdata
smplayer.appdata.xml | 54 +++++++++++++++++++++++++++++++++-------------------
smplayer.spec | 7 ++++++-
2 files changed, 40 insertions(+), 21 deletions(-)
---
diff --git a/smplayer.appdata.xml b/smplayer.appdata.xml
index 2fb9859..432e27d 100644
--- a/smplayer.appdata.xml
+++ b/smplayer.appdata.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2015 Ankur Sinha <ankursinha AT fedoraproject DOT org> -->
-
-<!-- HOUSEKEEPING, REMOVE THIS COMMENT WHEN THIS GOES UPSTREAM
-BugReportURL: rhbz-#
-SentUpstream: yyyy-mm-dd
--->
-
-<application>
- <id type="desktop">rpmfusion-smplayer.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+ <id>smplayer</id>
+
+ <name>smplayer</name>
<summary>A graphical frontend for mpv and mplayer</summary>
+
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0-or-later</project_license>
+
<description>
<p>
SMPlayer is a free media player for Windows and Linux with built-in
@@ -34,15 +33,30 @@ SentUpstream: yyyy-mm-dd
possibility to play Youtube videos or download subtitles.
</p>
</description>
- <url type="homepage">http://smplayer.sourceforge.net/linux/</url>
+
+ <launchable type="desktop-id">smplayer.desktop</launchable>
+ <categories>
+ <category>AudioVideo</category>
+ <category>Video</category>
+ </categories>
+ <url type="homepage">https://www.smplayer.info/</url>
+ <update_contact>https://www.smplayer.info/en/contact</update_contact>
<screenshots>
- <screenshot type="default">http://smplayer.sourceforge.net/images/screenshots/mainwindow.png</screenshot>
- <screenshot type="default">http://smplayer.sourceforge.net/images/screenshots/thumbnail_generator_en...</screenshot>
- <screenshot type="default">http://smplayer.sourceforge.net/images/screenshots/find_subtitles.png</screenshot>
- <screenshot type="default">http://smplayer.sourceforge.net/images/screenshots/smplayer_skin_modern3.png</screenshot>
+ <screenshot type="default">
+ <image>http://smplayer.sourceforge.net/images/screenshots/mainwindow.png</image>
+ </screenshot>
+ <screenshot>
+ <image>http://smplayer.sourceforge.net/images/screenshots/thumbnail_generator_en...</image>
+ </screenshot>
+ <screenshot>
+ <image>http://smplayer.sourceforge.net/images/screenshots/find_subtitles.png</image>
+ </screenshot>
+ <screenshot>
+ <image>http://smplayer.sourceforge.net/images/screenshots/smplayer_skin_modern3.png</image>
+ </screenshot>
</screenshots>
- <!-- FIXME: change this to an upstream email address for spec updates
- <updatecontact>someone_who_cares(a)upstream_project.org</updatecontact>
- -->
-</application>
-
+ <content_rating type="oars-1.1"/>
+ <releases>
+ <release version="20.6.0" date="2020-06-17"/>
+ </releases>
+</component>
diff --git a/smplayer.spec b/smplayer.spec
index 7a987bc..ef8e67b 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -2,7 +2,7 @@ Name: smplayer
Version: 20.6.0
%global smplayer_themes_ver 18.6.0
%global smplayer_skins_ver 15.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A graphical frontend for mplayer and mpv
License: GPLv2+
@@ -18,6 +18,7 @@ Patch2: smplayer-14.9.0.6966-system-qtsingleapplication.patch
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
+BuildRequires: libappstream-glib
BuildRequires: pkgconfig(Qt5)
BuildRequires: pkgconfig(Qt5Designer)
BuildRequires: pkgconfig(Qt5Concurrent)
@@ -133,6 +134,7 @@ install -m 0644 -D %{SOURCE2} %{buildroot}%{_metainfodir}/%{name}.appdata.xml
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+appstream-util validate --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
%if (0%{?rhel} && 0%{?rhel} <= 7)
%post
@@ -172,6 +174,9 @@ fi
%{_datadir}/smplayer/themes/
%changelog
+* Thu Sep 10 2020 Leigh Scott <leigh123linux(a)gmail.com> - 20.6.0-3
+- Fix and vailidate appdata
+
* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 20.6.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
3 years, 7 months
[chromium-freeworld] Remove bundlepylibs and clang toggles
by qvint
commit 7f7c325e15f9bfd78ad62dbaa2cc5686d6a3b48c
Author: qvint <dotqvint(a)gmail.com>
Date: Thu Sep 10 16:25:26 2020 +0300
Remove bundlepylibs and clang toggles
They don't work anyway
chromium-freeworld.spec | 70 +------------------------------------------------
1 file changed, 1 insertion(+), 69 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index e68f8df..711447d 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -16,22 +16,10 @@
%global __requires_exclude %{chromiumdir}/.*\\.so
%global __provides_exclude_from %{chromiumdir}/.*\\.so
#######################################CONFIGS###########################################
-# Fedora's Python 2 stack is being removed, we use the bundled Python libraries
-# This can be revisited once we upgrade to Python 3
-%global bundlepylibs 1
-%if 0%{bundlepylibs}
-%bcond_with system_ply
-%else
-%bcond_without system_ply
-%endif
#Require harfbuzz >= 2.4.0 for hb_subset_input_set_retain_gids
%bcond_without system_harfbuzz
# Require libxml2 > 2.9.4 for XML_PARSE_NOXXE
%bcond_without system_libxml2
-
-# Clang toggle
-%global clang 0
-
# Allow testing whether icu can be unbundled
# A patch fix building so enabled by default for Fedora 30
# Need icu version >= 64
@@ -97,11 +85,7 @@ Source15: LICENSE
########################################################################################
#Compiler settings
# Make sure we don't encounter any bug
-%if %{clang}
-BuildRequires: clang, llvm, lld
-%else
BuildRequires: gcc-c++
-%endif
# Basic tools and libraries needed for building
BuildRequires: ninja-build, nodejs, bison, gperf, hwdata
BuildRequires: libgcc, glibc, libatomic
@@ -127,25 +111,7 @@ BuildRequires: pkgconfig(wayland-cursor)
BuildRequires: pkgconfig(wayland-scanner)
BuildRequires: pkgconfig(wayland-server)
%endif
-
-#Python stuffs
-%if 0%{?bundlepylibs}
-
-# Using bundled bits, do nothing.
-#This is needed for remove_bundled_libraries.py
BuildRequires: /usr/bin/python2
-
-%else
-BuildRequires: python2-rpm-macros
-BuildRequires: python2-beautifulsoup4
-BuildRequires: python2-lxml
-BuildRequires: python2-html5lib
-BuildRequires: python2-markupsafe
-Buildrequires: python2-six
-%if %{with system_ply}
-BuildRequires: python2-ply
-%endif
-%endif
BuildRequires: python2-setuptools
%if %{with system_re2}
BuildRequires: re2-devel
@@ -304,10 +270,8 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/catapult \
third_party/catapult/common/py_vulcanize/third_party/rcssmin \
third_party/catapult/common/py_vulcanize/third_party/rjsmin \
-%if 0%{?bundlepylibs}
third_party/catapult/third_party/beautifulsoup4 \
third_party/catapult/third_party/html5lib-python \
-%endif
third_party/catapult/third_party/polymer \
third_party/catapult/third_party/six \
third_party/catapult/tracing/third_party/d3 \
@@ -389,9 +353,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/lss \
third_party/lzma_sdk \
third_party/mako \
-%if 0%{?bundlepylibs}
third_party/markupsafe \
-%endif
third_party/mesa \
third_party/metrics_proto \
%if %{ozone}
@@ -423,9 +385,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/pdfium/third_party/skia_shared \
third_party/perfetto \
third_party/pffft \
-%if !%{with system_ply}
third_party/ply \
-%endif
third_party/polymer \
third_party/private-join-and-compute \
third_party/protobuf \
@@ -523,15 +483,6 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
sed -i 's|//third_party/usb_ids|/usr/share/hwdata|g' \
services/device/public/cpp/usb/BUILD.gn
-%if !0%{?bundlepylibs}
-rmdir third_party/markupsafe
-ln -s %{python2_sitearch}/markupsafe third_party/markupsafe
-%if %{with system_ply}
-rmdir third_party/ply
-ln -s %{python2_sitelib}/ply third_party/ply
-%endif
-%endif
-
# Fix the path to nodejs binary
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
@@ -541,17 +492,6 @@ ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
ulimit -n 2048
#export compilar variables
-
-%if %{clang}
-
-export AR=llvm-ar NM=llvm-nm AS=llvm-as
-export CC=clang CXX=clang++
-
-# Add required compiler flags here
-export CXXFLAGS="$CXXFLAGS -Wno-unknown-warning-option"
-export CFLAGS="$CFLAGS -Wno-unknown-warning-option"
-
-%else
export AR=ar NM=nm AS=as
export CC=gcc CXX=g++
export CXXFLAGS="$CXXFLAGS -fpermissive"
@@ -564,8 +504,6 @@ export CXXFLAGS="$CXXFLAGS -w"
export CFLAGS="$CFLAGS -g0"
export CXXFLAGS="$CXXFLAGS -g0"
%endif
-#end compiler part
-%endif
gn_args=(
is_debug=false
@@ -617,14 +555,7 @@ gn_args+=(
gn_args+=(
-%if %{clang}
- is_clang=true
- 'clang_base_path="/usr"'
- clang_use_chrome_plugins=false
- use_lld=true
-%else
is_clang=false
-%endif
)
#Pipewire
@@ -769,6 +700,7 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%changelog
* Thu Sep 10 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.102-1
- Update to 85.0.4183.102
+- Remove bundlepylibs and clang toggles
* Mon Aug 31 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.83-2
- Ship ANGLE libEGL.so and libGLESv2.so (rfbz#5738)
3 years, 7 months
[chromium-freeworld] Update to 85.0.4183.102
by qvint
commit c2339bf0a33b321357410e6896c88ce3b586f3c1
Author: qvint <dotqvint(a)gmail.com>
Date: Thu Sep 10 16:14:57 2020 +0300
Update to 85.0.4183.102
chromium-freeworld.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index f9947bc..e68f8df 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -56,8 +56,8 @@
%global ozone 0
##############################Package Definitions######################################
Name: chromium-freeworld
-Version: 85.0.4183.83
-Release: 2%{?dist}
+Version: 85.0.4183.102
+Release: 1%{?dist}
Summary: Chromium built with all freeworld codecs and VA-API support
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
URL: https://www.chromium.org/Home
@@ -767,6 +767,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
+* Thu Sep 10 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.102-1
+- Update to 85.0.4183.102
+
* Mon Aug 31 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.83-2
- Ship ANGLE libEGL.so and libGLESv2.so (rfbz#5738)
diff --git a/sources b/sources
index b360cf6..cf13561 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (chromium-85.0.4183.83.tar.xz) = 9b491133ad5a04a9a65d8be2a8102102e6698dc30e9dd310825f9a6648655595656bef1ba2d9d5a6d64c1e0adb755010672986a0de46ce00cd0a5769bff30436
+SHA512 (chromium-85.0.4183.102.tar.xz) = acd6f0a7b74018098752b6598e09a2bd6d1c9f1120c39a5c6cd3d924c466be92b854f3c7f91693ba9506e47b173ef12c14427f998362524b2497fbe5587a6b6c
SHA512 (chromium-patches-chromium-85-patchset-2.tar.gz) = b8252b778ff16f1fbb0be22ebd1b9f711fafe6d6837e0806e4281aa659756a091c79609e2e4dd865b5f2d377f159c12d47feab201d4d72a93de5fc5ff596ff2e
3 years, 7 months
[rpmfusion-free-appstream-data] Regenerate for audacity-freeworld and openmw
by Leigh Scott
commit 80a7bf96044d9129d6ad4c82a38beff74a873d4f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Sep 10 12:45:23 2020 +0100
Regenerate for audacity-freeworld and openmw
rpmfusion-free-appstream-data.spec | 5 ++++-
sources | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/rpmfusion-free-appstream-data.spec b/rpmfusion-free-appstream-data.spec
index 5f9b115..bfb39ff 100644
--- a/rpmfusion-free-appstream-data.spec
+++ b/rpmfusion-free-appstream-data.spec
@@ -3,7 +3,7 @@
Name: %{reponame}-%{repoversion}-appstream-data
Version: 33
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Appstream metadata for the RPM Fusion free repository
BuildArch: noarch
@@ -40,6 +40,9 @@ DESTDIR=%{buildroot} appstream-util install %{SOURCE0} %{SOURCE1}
%dir %{_datadir}/app-info/xmls
%changelog
+* Thu Sep 10 2020 Leigh Scott <leigh123linux(a)gmail.com> - 33-2
+- Regenerate for audacity-freeworld and openmw
+
* Thu Feb 20 2020 Leigh Scott <leigh123linux(a)gmail.com> - 33-1
- Update for rawhide
diff --git a/sources b/sources
index b712068..f27e4af 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rpmfusion-free-33-icons.tar.gz) = b3c6a5ce24c22eedce3efad14b3ba45cab9175f9aa0309941a494fbe3040f5e320d12becf78f035e9f35c6fc6b50d5869cbdc24780b05a08d5542fba0ca5b58e
-SHA512 (rpmfusion-free-33.xml.gz) = 8eda7c50daa686aa5b4a10455423d47a8dc0a1849aad8b75546a737fa15eb18341e1a8ee31a3d9a71d9a65d5db88855111b138f7427c07522195a15f6fb2a458
+SHA512 (rpmfusion-free-33-icons.tar.gz) = 0b73ec1dec26858a1a0d1a62c31f6bb4b92605d749445044336c638da134f3328a4380d461e9899bd38a1581eb37f9ae85876a4d9e73c4688bd011db28a04882
+SHA512 (rpmfusion-free-33.xml.gz) = b57a6219c118b8ae46f4c357a952d304751a47598fb9d2327f70811471d78f766548302b486388cf588683bcf2e064fba5080675ce4fc6e6daf884179b1817d8
3 years, 7 months
[rpmfusion-free-appstream-data/f33] Regenerate for audacity-freeworld and openmw
by Leigh Scott
commit 7a3a3d01670c39de832e594c1a3dcca88592e54b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Sep 10 12:45:23 2020 +0100
Regenerate for audacity-freeworld and openmw
rpmfusion-free-appstream-data.spec | 5 ++++-
sources | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/rpmfusion-free-appstream-data.spec b/rpmfusion-free-appstream-data.spec
index 5f9b115..bfb39ff 100644
--- a/rpmfusion-free-appstream-data.spec
+++ b/rpmfusion-free-appstream-data.spec
@@ -3,7 +3,7 @@
Name: %{reponame}-%{repoversion}-appstream-data
Version: 33
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Appstream metadata for the RPM Fusion free repository
BuildArch: noarch
@@ -40,6 +40,9 @@ DESTDIR=%{buildroot} appstream-util install %{SOURCE0} %{SOURCE1}
%dir %{_datadir}/app-info/xmls
%changelog
+* Thu Sep 10 2020 Leigh Scott <leigh123linux(a)gmail.com> - 33-2
+- Regenerate for audacity-freeworld and openmw
+
* Thu Feb 20 2020 Leigh Scott <leigh123linux(a)gmail.com> - 33-1
- Update for rawhide
diff --git a/sources b/sources
index b712068..f27e4af 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rpmfusion-free-33-icons.tar.gz) = b3c6a5ce24c22eedce3efad14b3ba45cab9175f9aa0309941a494fbe3040f5e320d12becf78f035e9f35c6fc6b50d5869cbdc24780b05a08d5542fba0ca5b58e
-SHA512 (rpmfusion-free-33.xml.gz) = 8eda7c50daa686aa5b4a10455423d47a8dc0a1849aad8b75546a737fa15eb18341e1a8ee31a3d9a71d9a65d5db88855111b138f7427c07522195a15f6fb2a458
+SHA512 (rpmfusion-free-33-icons.tar.gz) = 0b73ec1dec26858a1a0d1a62c31f6bb4b92605d749445044336c638da134f3328a4380d461e9899bd38a1581eb37f9ae85876a4d9e73c4688bd011db28a04882
+SHA512 (rpmfusion-free-33.xml.gz) = b57a6219c118b8ae46f4c357a952d304751a47598fb9d2327f70811471d78f766548302b486388cf588683bcf2e064fba5080675ce4fc6e6daf884179b1817d8
3 years, 7 months
