commit 1cae333c68ac1ef433202e1296bbf657cc484eb5 Author: Robert-André Mauchin <zebob.m(a)gmail.com&gt; Date: Sat Dec 5 22:43:09 2020 +0100 Update to 1.17.3 Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com&gt; .gitignore | 1 + qTox-af02542-disable_Werror.patch | 11 ----------- qTox-af02542-remove_project_group.patch | 11 ----------- qTox-c0e9a3b-remove_project_group.patch | 11 +++++++++++ qtox.spec | 22 ++++++++++++---------- sources | 2 +- 6 files changed, 25 insertions(+), 33 deletions(-) --- diff --git a/.gitignore b/.gitignore index 1f0f568..27f7caa 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /qtox-1.16.2.tar.gz /qtox-af02542.tar.gz /qtox-a44cce6.tar.gz +/qtox-c0e9a3b.tar.gz diff --git a/qTox-c0e9a3b-remove_project_group.patch b/qTox-c0e9a3b-remove_project_group.patch new file mode 100644 index 0000000..29e6689 --- /dev/null +++ b/qTox-c0e9a3b-remove_project_group.patch @@ -0,0 +1,11 @@ +diff -up qTox-c0e9a3b79609681e5b9f6bbf8f9a36cb1993dc5f/res/io.github.qtox.qTox.appdata.xml.orig qTox-c0e9a3b79609681e5b9f6bbf8f9a36cb1993dc5f/res/io.github.qtox.qTox.appdata.xml +--- qTox-c0e9a3b79609681e5b9f6bbf8f9a36cb1993dc5f/res/io.github.qtox.qTox.appdata.xml.orig 2020-12-05 22:34:17.689682779 +0100 ++++ qTox-c0e9a3b79609681e5b9f6bbf8f9a36cb1993dc5f/res/io.github.qtox.qTox.appdata.xml 2020-12-05 22:35:02.244903395 +0100 +@@ -62,7 +62,6 @@ + </screenshots> + <url type="homepage">https://qtox.github.io</url> + <update_contact&gt;barrdetwix(a)gmail.com&lt;/update_contact&gt; +- <project_group>qTox</project_group> + <content_rating type="oars-1.0"> + <content_attribute id="social-chat">intense</content_attribute> + <content_attribute id="social-audio">intense</content_attribute> diff --git a/qtox.spec b/qtox.spec index 31ca2d2..a754643 100644 --- a/qtox.spec +++ b/qtox.spec @@ -1,14 +1,15 @@ -%global commit a44cce65beb60c5f280b651e0c084fa9c2bdb0dc +%global commit c0e9a3b79609681e5b9f6bbf8f9a36cb1993dc5f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20191018 +%global snapshotdate 20191205 +# %%global prerelease 1 # git describe -%global qtox_version v1.16.3-704-gedb6af6f +%global qtox_version v1.17.3-316-g12fc33ee %undefine __cmake_in_source_build Name: qtox -Version: 1.16.3 -Release: 5.%{snapshotdate}git%{shortcommit}%{?dist} +Version: 1.17.3 +Release: 1%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} Summary: Feature-rich Tox client # Main program: GPLv3+ @@ -20,9 +21,7 @@ URL: https://github.com/qTox/qTox/ Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz # Remove project_group tag from appdata.xml -Patch0: qTox-af02542-remove_project_group.patch -# Remove -Werror from compile flags -Patch1: qTox-af02542-disable_Werror.patch +Patch0: qTox-c0e9a3b-remove_project_group.patch BuildRequires: gcc-c++ BuildRequires: cmake3 @@ -59,8 +58,8 @@ guidelines while running on all major platforms. %build %cmake3 -DSVGZ_ICON=OFF \ - -DGIT_DESCRIBE=%{qtox_version} \ - -DGIT_VERSION=%{commit} + -DGIT_DESCRIBE=%{qtox_version} \ + -DGIT_VERSION=%{commit} %cmake3_build %install @@ -81,6 +80,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/io.github %{_datadir}/icons/hicolor/*/apps/qtox.* %changelog +* Sat Dec 05 22:19:55 CET 2020 Robert-André Mauchin <zebob.m(a)gmail.com&gt; - 1.17.3-1 +- Update to 1.17.3 + * Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1.16.3-5.20191018gita44cce6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a7b52bd..21e46d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtox-a44cce6.tar.gz) = 200b30bc035a4e203dc1d1599266fb2de0cb87d4716a8fff87e41cd7cfc5a19b23692425bde03ca368b17879865446256b1da6cb60011fa538864b84fdaca0f6 +SHA512 (qtox-c0e9a3b.tar.gz) = a591558220cf45ac480d946380e4e68cebbb4271947846161889d31ddd2acdea0282e77270b92cb28883d812934fd427ced2dca4cdb76afc05e1a352fc7b9dc6