New upstream version 2.2.1

- Remove patches:
  poedit-2.0.8-configure_ppc64_ppc64le.patch
  poedit-2.2-fix_dark_mode_assert.patch
  poedit-2.2-fix_wayland_incompatibility.patch
- Remove obsolete pixmaps/* from files

.gitignore

@@ -28,3 +28,4 @@ poedit-1.4.6.1.tar.gz
 /poedit-2.1.tar.gz
 /poedit-2.1.1.tar.gz
 /poedit-2.2.tar.gz
+/poedit-2.2.1.tar.gz

poedit-2.0.8-configure_ppc64_ppc64le.patch

@@ -1,11 +0,0 @@
---- a/configure	2018-06-03 18:41:18.000000000 +0200
-+++ b/configure_powerpc64_powerpc64le	2018-06-08 18:04:13.528220986 +0200
-@@ -6274,7 +6274,7 @@
-                         case ${host_cpu} in #(
-   x86_64) :
-     libsubdirs="lib64 libx32 lib lib64" ;; #(
--  ppc64|s390x|sparc64|aarch64|ppc64le) :
-+  ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le) :
-     libsubdirs="lib64 lib lib64" ;; #(
-   *) :
-     libsubdirs="lib"

poedit-2.2-fix_dark_mode_assert.patch

@@ -1,34 +0,0 @@
-From 2a5bf325a8f34ada801dca661ecb174d7dc0eb3e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav@slavik.io>
-Date: Wed, 9 Jan 2019 20:20:55 +0100
-Subject: [PATCH] Fix dark mode assert with wxGTK 3.0
-
-wx 3.0 didn't support alpha channel in HTML exports, so just tweak the
-dark mode color to not require it. It's not worth doing complicated
-fixes for the old wx version.
-
-Fixes #524.
----
- src/colorscheme.cpp | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/colorscheme.cpp b/src/colorscheme.cpp
-index 25e9cfa54a..393c8cbea7 100644
---- a/src/colorscheme.cpp
-+++ b/src/colorscheme.cpp
-@@ -106,7 +106,14 @@ wxColour ColorScheme::DoGet(Color color, Mode mode)
-         case Color::ItemContextFg:
-             return mode == Dark ? sRGB(180, 222, 254) : sRGB(70, 109, 137);
-         case Color::ItemContextBg:
--            return mode == Dark ? sRGB(67, 94, 147, 0.6) : sRGB(217, 232, 242);
-+            if (mode == Dark)
-+                #if wxCHECK_VERSION(3,1,0)
-+                return sRGB(67, 94, 147, 0.6);
-+                #else  // see https://github.com/vslavik/poedit/issues/524
-+                return sRGB(67, 94, 147);
-+                #endif
-+            else
-+                return sRGB(217, 232, 242);
-         case Color::ItemContextBgHighlighted:
-             #if defined(__WXMSW__)
-             return sRGB(255, 255, 255, 0.50);

poedit-2.2-fix_wayland_incompatibility.patch

@@ -1,42 +0,0 @@
-From 11f4e0da464d9f261f0d237220e08525a20465fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav@slavik.io>
-Date: Wed, 9 Jan 2019 20:22:16 +0100
-Subject: [PATCH] Fix Wayland incompatibility
-
-Set prgname to match the .desktop file, otherwise app icon is not shown
-correctly and other things probably break as well.
-
-See https://wiki.gnome.org/Projects/GnomeShell/ApplicationBased
-
-Fixes #538.
----
- src/edapp.cpp | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/edapp.cpp b/src/edapp.cpp
-index e345b7ecbd..1a9af1c33b 100644
---- a/src/edapp.cpp
-+++ b/src/edapp.cpp
-@@ -56,6 +56,10 @@
- #include <winsparkle.h>
- #endif
- 
-+#ifdef __WXGTK3__
-+#include <glib.h>
-+#endif
-+
- #include <unicode/uclean.h>
- #include <unicode/putil.h>
- 
-@@ -334,6 +338,11 @@ bool PoeditApp::OnInit()
-     SetDllDirectory(L"");
- #endif
- 
-+#ifdef __WXGTK3__
-+    // Wayland compatibility, see https://wiki.gnome.org/Projects/GnomeShell/ApplicationBased
-+    g_set_prgname("net.poedit.Poedit");
-+#endif
-+
-     SetVendorName("Vaclav Slavik");
-     SetAppName("Poedit");
- 

poedit.spec

@@ -1,6 +1,6 @@
 Name:           poedit
-Version:        2.2
-Release:        2%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 Summary(de):    Grafischer Editor für GNU Gettext-Dateien
 
@@ -9,19 +9,10 @@ License:        MIT
 URL:            https://poedit.net/
 Source0:        https://github.com/vslavik/%{name}/releases/download/v%{version}-oss/%{name}-%{version}.tar.gz
 Source1:        http://pkgs.fedoraproject.org/cgit/rpms/%{name}.git/plain/%{name}.1.de.po
-# Fix builds for ppc64 and ppc64le
-# Add powerpc64 and powerpc64le to checked AC_CANONICAL_HOST, host_cpu values
-Patch0:         poedit-2.0.8-configure_ppc64_ppc64le.patch
 # Workaround until a new version of pugixml is released. See also:
 # https://github.com/vslavik/poedit/pull/499
 # https://src.fedoraproject.org/rpms/pugixml/pull-request/1
 Patch1:         poedit-2.1-update_configure_check_for_pugixml.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1639361
-# Fixed upstream: https://github.com/vslavik/poedit/issues/524
-Patch2:         poedit-2.2-fix_dark_mode_assert.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1659253
-# Fixed upstream: https://github.com/vslavik/poedit/issues/538
-Patch3:         poedit-2.2-fix_wayland_incompatibility.patch
 
 BuildRequires:  wxGTK3-devel >= 3.0.3
 BuildRequires:  gtkspell3-devel
@@ -113,11 +104,18 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/net.%{name
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/poedit
-%{_datadir}/pixmaps/*
 %{_mandir}/man?/*
 
 
 %changelog
+* Tue Jan 15 2019 Wolfgang Stöggl <c72578@yahoo.de> - 2.2.1-1
+- New upstream version
+- Remove patches:
+  poedit-2.0.8-configure_ppc64_ppc64le.patch
+  poedit-2.2-fix_dark_mode_assert.patch
+  poedit-2.2-fix_wayland_incompatibility.patch
+- Remove obsolete pixmaps/* from files
+
 * Fri Jan 11 2019 Wolfgang Stöggl <c72578@yahoo.de> - 2.2-2
 - Add patches:
   poedit-2.2-fix_dark_mode_assert.patch, fixes #1639361

sources

@@ -1 +1 @@
-SHA512 (poedit-2.2.tar.gz) = 14a5cc997e6cdc0d1fc14b05ea293a010537d71f846537270296e2a14bdfd7a352b6d0a88a3d4f60193192a918b276509e31926715e69725e595423adfac5fbc
+SHA512 (poedit-2.2.1.tar.gz) = a75888aad9d13f2728d7de56bbe5f91c093ad4154c723b6d0066d382b40dff32e67314f30081bdb31502ed5936f3110d4f57e789bf2d47c572cbae8376f3749f