diff --git a/.gitignore b/.gitignore
index 7b01b8f..f0ed2e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/flameshot-0.10.0.tar.gz
/flameshot-0.10.1.tar.gz
/flameshot-0.10.2.tar.gz
+/flameshot-11.0.0.tar.gz
diff --git a/flameshot-kde-wayland-hotkeys-fix.patch b/flameshot-kde-wayland-hotkeys-fix.patch
deleted file mode 100644
index 0de410c..0000000
--- a/flameshot-kde-wayland-hotkeys-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -49,8 +49,7 @@ void wayland_hacks()
- {
- // Workaround to https://github.com/ksnip/ksnip/issues/416
- DesktopInfo info;
-- if ((info.windowManager() == DesktopInfo::GNOME) ||
-- (info.windowManager() == DesktopInfo::KDE)) {
-+ if (info.windowManager() == DesktopInfo::GNOME) {
- qputenv("QT_QPA_PLATFORM", "xcb");
- }
- }
-
diff --git a/flameshot-version-fix.patch b/flameshot-version-fix.patch
deleted file mode 100644
index 9015580..0000000
--- a/flameshot-version-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required(VERSION 3.13)
- # cmake_policy(SET CMP0076 OLD)
-
--set(FLAMESHOT_VERSION 0.10.1)
-+set(FLAMESHOT_VERSION 0.10.2)
-
- # Flameshot-org
- set(GIT_API_URL "https://api.github.com/repos/flameshot-org/flameshot/releases/latest")
---- a/data/appdata/org.flameshot.Flameshot.metainfo.xml
-+++ b/data/appdata/org.flameshot.Flameshot.metainfo.xml
-@@ -9,6 +9,7 @@ SPDX-License-Identifier: CC0-1.0
- GPL-3.0-or-later
- Flameshot
-
-+
-
-
-
diff --git a/flameshot.spec b/flameshot.spec
index 225593d..cccef1f 100644
--- a/flameshot.spec
+++ b/flameshot.spec
@@ -1,8 +1,8 @@
%undefine __cmake_in_source_build
Name: flameshot
-Version: 0.10.2
-Release: 3%{?dist}
+Version: 11.0.0
+Release: 1%{?dist}
# Main code: GPLv3
# Logo: Free Art License v1.3
@@ -10,19 +10,12 @@ Release: 3%{?dist}
# capture/capturewidget.cpp and capture/capturewidget.h: GPLv2
# regiongrabber.cpp: LGPL
# Qt-Color-Widgets: LGPL/GPL
-# More information: https://github.com/lupoDharkael/flameshot#license
+# More information: https://github.com/flameshot-org/flameshot#license
License: GPLv3+ and ASL 2.0 and GPLv2 and LGPLv3 and Free Art
Summary: Powerful and simple to use screenshot software
-URL: https://github.com/lupoDharkael/flameshot
+URL: https://github.com/flameshot-org/%{name}
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
-# https://github.com/flameshot-org/flameshot/issues/2119
-# https://bugzilla.redhat.com/show_bug.cgi?id=2027082
-Patch100: %{name}-version-fix.patch
-
-# https://github.com/flameshot-org/flameshot/issues/2077
-Patch101: %{name}-kde-wayland-hotkeys-fix.patch
-
BuildRequires: cmake(Qt5Concurrent)
BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5DBus)
@@ -32,7 +25,6 @@ BuildRequires: cmake(Qt5Multimedia)
BuildRequires: cmake(Qt5Network)
BuildRequires: cmake(Qt5Svg)
BuildRequires: cmake(Qt5Widgets)
-BuildRequires: cmake(spdlog)
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -46,18 +38,25 @@ BuildRequires: qtsingleapplication-qt5-devel
Requires: hicolor-icon-theme
Requires: qt5-qtsvg%{?_isa}
+# https://github.com/flameshot-org/flameshot/issues/1910
+Recommends: xdg-desktop-portal%{?_isa}
+Recommends: (xdg-desktop-portal-gnome%{?_isa} if gnome-shell%{?_isa})
+Recommends: (xdg-desktop-portal-kde%{?_isa} if plasma-workspace-wayland%{?_isa})
+Recommends: (xdg-desktop-portal-wlr%{?_isa} if wlroots%{?_isa})
+
+Provides: bundled(qt-color-widgets) = 2.2.0
+
%description
Powerful and simple to use screenshot software with built-in
editor with advanced features.
%prep
%autosetup -p1
-rm -rf external/{singleapplication,spdlog}
+rm -rf external/{QHotkey,singleapplication}
%build
%cmake -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
- -DUSE_EXTERNAL_SPDLOG:BOOL=ON \
-DUSE_EXTERNAL_SINGLEAPPLICATION:BOOL=ON \
-DUSE_LAUNCHER_ABSOLUTE_PATH:BOOL=OFF
%cmake_build
@@ -77,11 +76,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/translations
%dir %{_datadir}/bash-completion/completions
+%dir %{_datadir}/fish/vendor_completions.d
%dir %{_datadir}/zsh/site-functions
%{_bindir}/%{name}
%{_datadir}/applications/*.desktop
%{_metainfodir}/*.metainfo.xml
%{_datadir}/bash-completion/completions/%{name}
+%{_datadir}/fish/vendor_completions.d/%{name}.fish
%{_datadir}/zsh/site-functions/_%{name}
%{_datadir}/dbus-1/interfaces/*.xml
%{_datadir}/dbus-1/services/*.service
@@ -89,6 +90,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_mandir}/man1/%{name}.1*
%changelog
+* Sat Jan 15 2022 Vitaly Zaitsev - 11.0.0-1
+- Updated to version 11.0.0.
+
* Sun Nov 28 2021 Vitaly Zaitsev - 0.10.2-3
- Fixed issues with hotkeys on KDE Wayland.
diff --git a/sources b/sources
index 19d32c3..26c0e41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (flameshot-0.10.2.tar.gz) = b0eb1decd87dab1d4a375708448dd4c6f85c101d33814b76edbb328150d0e9ee7a588be698fddcb24e70e39cd4331f9aa2ff082525ff6975d52303a6d9c1ab12
+SHA512 (flameshot-11.0.0.tar.gz) = de13f3c5bc18f164c6e37c0b3f42c8693d3ebfaba5f3d54360899df6479390e2a0c38970fa2595c9293304b4e52ca2198477f4f317abcb11df4c30a24ab1909f