commit 6539f1461f1cd1453aec29b92e89a7599eea0c69 Author: Robert-André Mauchin <zebob.m(a)gmail.com&gt; Date: Fri Mar 2 12:27:29 2018 +0100 Spec file refresh Move Appdata to metainfo .gitignore | 1 + ...a-file-installation-to-usr-share-metainfo.patch | 26 +++++ qtox-1.11.0-remove_project_group.patch | 10 ++ qtox-1.12.1-disable_Werror.patch | 11 +++ qtox.spec | 108 +++++++++++++++++++++ sources | 1 + 6 files changed, 157 insertions(+) --- diff --git a/.gitignore b/.gitignore index e69de29..32a4556 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/qtox-1.13.0.tar.gz diff --git a/0001-Move-Appdata-file-installation-to-usr-share-metainfo.patch b/0001-Move-Appdata-file-installation-to-usr-share-metainfo.patch new file mode 100644 index 0000000..8d4a421 --- /dev/null +++ b/0001-Move-Appdata-file-installation-to-usr-share-metainfo.patch @@ -0,0 +1,26 @@ +From 5008a48e7a5ffa492923f37559f248dfdff57b4d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com&gt; +Date: Fri, 16 Feb 2018 18:00:56 +0100 +Subject: [PATCH] Move Appdata file installation to /usr/share/metainfo + according to the spec + +--- + cmake/Installation.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/Installation.cmake b/cmake/Installation.cmake +index a516ec01..eed76c6d 100644 +--- a/cmake/Installation.cmake ++++ b/cmake/Installation.cmake +@@ -33,7 +33,7 @@ if(APPLE) + ) + else() + install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "bin") +- install(FILES "res/qTox.appdata.xml" DESTINATION "share/appdata") ++ install(FILES "res/qTox.appdata.xml" DESTINATION "share/metainfo") + install(FILES "qtox.desktop" DESTINATION "share/applications") + + # Install application icons according to the XDG spec +-- +2.14.3 + diff --git a/qtox-1.11.0-remove_project_group.patch b/qtox-1.11.0-remove_project_group.patch new file mode 100644 index 0000000..4f8969c --- /dev/null +++ b/qtox-1.11.0-remove_project_group.patch @@ -0,0 +1,10 @@ +diff -up qTox-1.11.0/res/qTox.appdata.xml.remove_project_group qTox-1.11.0/res/qTox.appdata.xml +--- qTox-1.11.0/res/qTox.appdata.xml.remove_project_group 2017-07-16 14:33:33.000000000 +0200 ++++ qTox-1.11.0/res/qTox.appdata.xml 2017-08-18 13:01:56.462111208 +0200 +@@ -61,6 +61,5 @@ + </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> + </component> + diff --git a/qtox-1.12.1-disable_Werror.patch b/qtox-1.12.1-disable_Werror.patch new file mode 100644 index 0000000..4fae258 --- /dev/null +++ b/qtox-1.12.1-disable_Werror.patch @@ -0,0 +1,11 @@ +diff -up qTox-1.12.1/CMakeLists.txt.disable_Werror qTox-1.12.1/CMakeLists.txt +--- qTox-1.12.1/CMakeLists.txt.disable_Werror 2017-10-11 23:49:18.000000000 +0200 ++++ qTox-1.12.1/CMakeLists.txt 2017-10-13 00:40:35.822438119 +0200 +@@ -53,7 +53,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} + set(POSITION_INDEPENDENT_CODE True) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-overflow") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-aliasing") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") + + if (NOT WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all") diff --git a/qtox.spec b/qtox.spec new file mode 100644 index 0000000..a16d261 --- /dev/null +++ b/qtox.spec @@ -0,0 +1,108 @@ +Name: qtox +Version: 1.13.0 +Release: 2%{?dist} +Summary: Feature-rich Tox client + +# Main program: GPLv3+ +# src/widget/flowlayout.*: BSD +# Smileys/Universe Smileys/emojione: CC-BY +# Smileys/Classic: CC-BY-SA +License: GPLv3+ and BSD and CC-BY and CC-BY-SA +URL: https://github.com/qTox/qTox/ +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz + +# Remove project_group tag from appdata.xml +Patch0: qtox-1.11.0-remove_project_group.patch +# Remove -Werror from compile flags +Patch1: qtox-1.12.1-disable_Werror.patch +# https://github.com/qTox/qTox/issues/4958 +Patch2: 0001-Move-Appdata-file-installation-to-usr-share-metainfo.patch + +BuildRequires: gcc-c++ +BuildRequires: cmake +BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib +BuildRequires: pkgconfig(Qt5) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: qtsingleapplication +BuildRequires: pkgconfig(libtoxcore) +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(openal) +BuildRequires: pkgconfig(libqrencode) +BuildRequires: pkgconfig(sqlcipher) +BuildRequires: pkgconfig(filteraudio) +BuildRequires: pkgconfig(libexif) +BuildRequires: pkgconfig(check) +BuildRequires: pkgconfig(xscrnsaver) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(atk) +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(libsodium) +BuildRequires: pkgconfig(opus) +BuildRequires: pkgconfig(vpx) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: qt5-linguist +Requires: hicolor-icon-theme + + +%description +qTox is a powerful Tox client that follows the Tox design +guidelines while running on all major platforms. + + +%prep +%autosetup -p1 -n qTox-%{version} + + +%build +mkdir build && cd build +%cmake .. +%make_build + + +%install +cd build +%make_install + +# unzip qtox.svgz +gzip -dS z %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/qtox.svgz + + +%check +cd build +ctest -V %{?_smp_mflags} +desktop-file-validate %{buildroot}%{_datadir}/applications/qtox.desktop +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/qTox.appdata.xml + + +%files +%license LICENSE smileys/Universe/LICENSE-GRAPHICS +%doc README.md CHANGELOG.md +%{_bindir}/qtox +%{_datadir}/metainfo/qTox.appdata.xml +%{_datadir}/applications/qtox.desktop +%{_datadir}/icons/hicolor/*/apps/qtox.* + + +%changelog +* Fri Feb 16 2018 Robert-André Mauchin <zebob.m(a)gmail.com&gt; 1.13.0-2 +- Spec file refresh +- Move Appdata to metainfo + +* Mon Nov 27 2017 Robert-André Mauchin <zebob.m(a)gmail.com&gt; 1.13.0-1 +- New upstream release 1.13.0 + +* Thu Oct 12 2017 Robert-André Mauchin <zebob.m(a)gmail.com&gt; 1.12.1-1 +- New upstream release 1.12.1 + +* Fri Aug 18 2017 Robert-André Mauchin <zebob.m(a)gmail.com&gt; 1.11.0-2 +- Fix typo + +* Sat Jul 29 2017 Robert-André Mauchin <zebob.m(a)gmail.com&gt; 1.11.0-1 +- First RPM release + diff --git a/sources b/sources index e69de29..c813338 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +beb03acac42c0678050f916fc5252eba qtox-1.13.0.tar.gz