diff --git a/.gitignore b/.gitignore index c1ff84a..2823272 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /flameshot-0.5.0.tar.gz +/flameshot-0.5.1.tar.gz diff --git a/flameshot-0.5.0-add-appdata.patch b/flameshot-0.5.0-add-appdata.patch deleted file mode 100644 index c37287a..0000000 --- a/flameshot-0.5.0-add-appdata.patch +++ /dev/null @@ -1,69 +0,0 @@ -From aef7f09d61a27e033f5ba0a8c359a498d9c8a24e Mon Sep 17 00:00:00 2001 -From: Vitaly Zaitsev -Date: Tue, 8 Jan 2018 21:31:46 +0100 -Subject: [PATCH] Added AppData manifest file for Gnome Software. (#68) - -Signed-off-by: Vitaly Zaitsev ---- - docs/appdata/flameshot.appdata.xml | 25 +++++++++++++++++++++++++ - flameshot.pro | 6 +++++- - 2 files changed, 30 insertions(+), 1 deletion(-) - create mode 100644 docs/appdata/flameshot.appdata.xml - -diff --git a/docs/appdata/flameshot.appdata.xml b/docs/appdata/flameshot.appdata.xml -new file mode 100644 -index 0000000..a592691 ---- /dev/null -+++ b/docs/appdata/flameshot.appdata.xml -@@ -0,0 +1,25 @@ -+ -+ -+ -+ flameshot.desktop -+ CC0-1.0 -+ GPLv3+ and ASL 2.0 and GPLv2 and LGPLv3 and Free Art -+ Flameshot -+ Powerful and simple to use screenshot software -+ -+

-+ Powerful and simple to use screenshot software with built-in -+ editor with advanced features. -+

-+ -+ -+ -+ https://raw.githubusercontent.com/lupoDharkael/flameshot/master/img/appPreview/usageStatic.png -+ -+ -+ https://raw.githubusercontent.com/lupoDharkael/flameshot/master/img/appPreview/animatedUsage.gif -+ -+ -+ https://github.com/lupoDharkael/flameshot -+ https://github.com/lupoDharkael -+ -diff --git a/flameshot.pro b/flameshot.pro -index 5994781..b20fbd0 100644 ---- a/flameshot.pro -+++ b/flameshot.pro -@@ -193,6 +193,9 @@ unix: { - - completion.path = /usr/share/bash-completion/completions/ - completion.files = docs/bash-completion/flameshot -+ -+ appdata.path = $${BASEDIR}$${PREFIX}/share/appdata/ -+ appdata.files = docs/appdata/flameshot.appdata.xml - - desktopentry.path = $${BASEDIR}$${USRPATH}/share/applications - desktopentryinit.path = $${BASEDIR}$${USRPATH}/share/applications -@@ -219,6 +222,7 @@ unix: { - qmfile \ - servicedbus \ - dbus \ -- completion -+ completion \ -+ appdata - } - --- -2.14.3 - diff --git a/flameshot-0.5.0-fix-desktop.patch b/flameshot-0.5.0-fix-desktop.patch deleted file mode 100644 index 776006b..0000000 --- a/flameshot-0.5.0-fix-desktop.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d33db9934506241e531b4631ef59ab7682509956 Mon Sep 17 00:00:00 2001 -From: Vitaly Zaitsev -Date: Tue, 9 Jan 2018 01:33:32 +0500 -Subject: [PATCH] Fixed errors in desktop files: (#69) - - * removed shebang; - * removed encoding tag as it no longer required; - * changed chmod from 755 to 644 as required by standard. - -Signed-off-by: Vitaly Zaitsev ---- - docs/desktopEntry/package/flameshot-config.desktop | 1 - - docs/desktopEntry/package/flameshot-init.desktop | 1 - - docs/desktopEntry/package/flameshot.desktop | 3 +-- - 3 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/docs/desktopEntry/package/flameshot-config.desktop b/docs/desktopEntry/package/flameshot-config.desktop -index a37cc34..8e0bd06 100644 ---- a/docs/desktopEntry/package/flameshot-config.desktop -+++ b/docs/desktopEntry/package/flameshot-config.desktop -@@ -1,5 +1,4 @@ - [Desktop Entry] --Encoding=UTF-8 - Name=Configure Flameshot - Name[es]=Configurar Flameshot - GenericName=Screenshot tool -diff --git a/docs/desktopEntry/package/flameshot-init.desktop b/docs/desktopEntry/package/flameshot-init.desktop -index da8059e..801212f 100644 ---- a/docs/desktopEntry/package/flameshot-init.desktop -+++ b/docs/desktopEntry/package/flameshot-init.desktop -@@ -1,5 +1,4 @@ - [Desktop Entry] --Encoding=UTF-8 - Name=Launch Flameshot - Name[es]=Iniciar Flameshot - GenericName=Screenshot tool -diff --git a/docs/desktopEntry/package/flameshot.desktop b/docs/desktopEntry/package/flameshot.desktop -index 8e0f412..1ecbad3 100644 ---- a/docs/desktopEntry/package/flameshot.desktop -+++ b/docs/desktopEntry/package/flameshot.desktop -@@ -1,8 +1,7 @@ - [Desktop Entry] --Encoding=UTF-8 --Name=Flameshot - Name=Take graphical screenshot - Name[es]=Tomar captura gráfica -+GenericName=Screen capture tool - GenericName[es]=Herramienta de captura de pantalla - Comment=Powerfull yet simple to use screenshot software. - Comment[es]=Potente pero simple de usar software de capturas. --- -2.14.3 - diff --git a/flameshot.spec b/flameshot.spec index 311903d..3dc76fe 100644 --- a/flameshot.spec +++ b/flameshot.spec @@ -1,6 +1,6 @@ Name: flameshot -Version: 0.5.0 -Release: 3%{?dist} +Version: 0.5.1 +Release: 1%{?dist} # Main code: GPLv3 # Logo: Free Art License v1.3 @@ -15,12 +15,6 @@ Summary: Powerful and simple to use screenshot software URL: https://github.com/lupoDharkael/flameshot Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# https://github.com/lupoDharkael/flameshot/pull/69 -Patch100: %{name}-0.5.0-fix-desktop.patch - -# https://github.com/lupoDharkael/flameshot/pull/68 -Patch101: %{name}-0.5.0-add-appdata.patch - BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Multimedia) @@ -53,7 +47,7 @@ popd %find_lang Internationalization --with-qt %check -appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml" +appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml" desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %files -f Internationalization.lang @@ -63,15 +57,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %dir %{_datadir}/%{name}/translations %{_bindir}/%{name} %{_datadir}/applications/*.desktop -%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/metainfo/%{name}.appdata.xml %{_datadir}/bash-completion/completions/%{name} %{_datadir}/dbus-1/interfaces/*.xml %{_datadir}/dbus-1/services/*.service %{_datadir}/icons/%{name}.png %changelog -* Wed Feb 07 2018 Fedora Release Engineering - 0.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Sat Feb 24 2018 Vitaly Zaitsev - 0.5.1-1 +- Updated to version 0.5.1. * Mon Jan 08 2018 Vitaly Zaitsev - 0.5.0-2 - Minor SPEC fixes. diff --git a/sources b/sources index c01d1aa..6d5f8b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (flameshot-0.5.0.tar.gz) = 3e39eb6fcbd60ec541371356792e6f3b0f89766b58cf0e06e2aca358612041d0ee94d4b3675a44db003de749f73b6531febac32c98e649cb3fb1326f82b71dab +SHA512 (flameshot-0.5.1.tar.gz) = db82ad133b0a71f97d723933e82c896fd3fd3e44a81ef0fe81ad4098257c108f6b3055082840860e67db68bac2ec74dd169628c93638020978535bf4da56124a