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

@@ -23,3 +23,9 @@ poedit-1.4.6.1.tar.gz
 /poedit-2.0.4.tar.gz
 /poedit-2.0.6.tar.gz
 /poedit-2.0.7.tar.gz
+/poedit-2.0.8.tar.gz
+/poedit-2.0.9.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.1-update_configure_check_for_pugixml.patch

@@ -0,0 +1,124 @@
+--- a/configure	2018-07-23 12:48:05.000000000 +0200
++++ b/configure	2018-07-23 12:52:12.000000000 +0200
+@@ -8782,6 +8782,18 @@
+ fi
+ 
+ 
++if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pugixml\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "pugixml") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pugixml_found=yes
++else
++  pugixml_found=no
++fi
++
++if test x"$pugixml_found" = xyes; then
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PUGIXML" >&5
+@@ -8841,22 +8853,97 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$PUGIXML_PKG_ERRORS" >&5
+ 
+-
+-
++	pugixml_found=no
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-
+-
++	pugixml_found=no
+ else
+ 	PUGIXML_CFLAGS=$pkg_cv_PUGIXML_CFLAGS
+ 	PUGIXML_LIBS=$pkg_cv_PUGIXML_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
++	pugixml_found=yes
++fi
++fi
+ 
+-            CXXFLAGS="$CXXFLAGS $PUGIXML_CFLAGS -DHAVE_PUGIXML"
++if test x"$pugixml_found" = xno; then
++    ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++
++    for ac_header in pugixml.hpp
++do :
++  ac_fn_cxx_check_header_mongrel "$LINENO" "pugixml.hpp" "ac_cv_header_pugixml_hpp" "$ac_includes_default"
++if test "x$ac_cv_header_pugixml_hpp" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_PUGIXML_HPP 1
++_ACEOF
++
++fi
+ 
++done
+ 
++
++    if test x"$ac_cv_header_pugixml_hpp" = xyes; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpugixml" >&5
++$as_echo_n "checking for main in -lpugixml... " >&6; }
++if ${ac_cv_lib_pugixml_main+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lpugixml  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++
++int
++main ()
++{
++return main ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_link "$LINENO"; then :
++  ac_cv_lib_pugixml_main=yes
++else
++  ac_cv_lib_pugixml_main=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pugixml_main" >&5
++$as_echo "$ac_cv_lib_pugixml_main" >&6; }
++if test "x$ac_cv_lib_pugixml_main" = xyes; then :
++
++            PUGIXML_LIBS=-lpugixml
++            pugixml_found=yes
++
++fi
++
++    fi
++
++    ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++fi
++
++if test $pugixml_found = yes; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: Using the system version of the pugixml library" >&5
++$as_echo "$as_me: Using the system version of the pugixml library" >&6;}
++    CXXFLAGS="$CXXFLAGS $PUGIXML_CFLAGS -DHAVE_PUGIXML"
++
++else
++        { $as_echo "$as_me:${as_lineno-$LINENO}: Using bundled copy of pugixml library" >&5
++$as_echo "$as_me: Using bundled copy of pugixml library" >&6;}
+ fi
+ 
+ 

poedit.spec

@@ -1,14 +1,18 @@
 Name:           poedit
-Version:        2.0.7
+Version:        2.2.1
 Release:        1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 Summary(de):    Grafischer Editor für GNU Gettext-Dateien
 
 Group:          Development/Tools
 License:        MIT
-URL:            http://www.poedit.net/
+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
+# 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
 
 BuildRequires:  wxGTK3-devel >= 3.0.3
 BuildRequires:  gtkspell3-devel
@@ -27,6 +31,9 @@ BuildRequires:  cld2-devel
 %endif
 # Use json.hpp from Fedora and not the version bundled with Poedit
 BuildRequires:  json-devel
+# Disable pkgconfig for now until pugixml.pc is available in the Fedora rpm
+# BuildRequires:  pkgconfig(pugixml) >= 1.9
+BuildRequires:  pugixml-devel >= 1.9
 
 Requires:       gettext
 
@@ -42,13 +49,9 @@ Dienstprogramme aus GNU Gettext bereit, sowie einen Katalogeditor und einen
 Quellcode-Parser. Es hilft beim Übersetzen von Anwendungen in andere Sprachen.
 
 %prep
-%autosetup
-# Make sure docs are utf-8
-for FILE in `find docs/en -name '*.hhp'`; do
-    iconv -f iso-8859-15 -t utf-8 $FILE > $FILE.tmp && \
-    touch -r $FILE $FILE.tmp && \
-    mv -f $FILE.tmp $FILE
-done
+%autosetup -p1
+# Remove bundled sources
+rm -rf deps/
 
 
 %build
@@ -77,7 +80,7 @@ desktop-file-install \
     --delete-original \
     --add-category=GTK \
     --dir %{buildroot}%{_datadir}/applications \
-    %{buildroot}%{_datadir}/applications/poedit.desktop
+    %{buildroot}%{_datadir}/applications/net.%{name}.Poedit.desktop
 
 # Generate and install localized man pages
 mkdir -p man/de
@@ -89,7 +92,7 @@ po4a-translate -M utf-8 -f man \
 mkdir -p %{buildroot}%{_mandir}/de/man1
 install -p -m 644 man/de/%{name}.1 %{buildroot}%{_mandir}/de/man1
 
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml ||:
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/net.%{name}.Poedit.appdata.xml ||:
 
 %{find_lang} poedit --with-man
 
@@ -97,15 +100,54 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.ap
 %doc NEWS README AUTHORS docs/*.txt
 %license COPYING
 %{_bindir}/*
-%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/appdata/net.%{name}.Poedit.appdata.xml
 %{_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
+  poedit-2.2-fix_wayland_incompatibility.patch, fixes #1659253
+
+* Mon Oct 08 2018 Wolfgang Stöggl <c72578@yahoo.de> - 2.2-1
+- New upstream version
+- Use reverse DNS names for appdata and desktop:
+  net.poedit.Poedit.desktop, net.poedit.Poedit.appdata.xml
+
+* Tue Aug 07 2018 Wolfgang Stöggl <c72578@yahoo.de> - 2.1.1-1
+- New upstream version
+
+* Tue Jul 24 2018 Wolfgang Stöggl <c72578@yahoo.de> - 2.1-1
+- New upstream version
+- Add BR pugixml-devel
+- Add poedit-2.1-update_configure_check_for_pugixml.patch
+
+* Mon Jul 23 2018 Wolfgang Stöggl <c72578@yahoo.de> - 2.0.9-2
+- Remove bundled sources after autosetup
+- Removed from spec file: Make sure docs are utf-8
+  This was obsolete as there were no more *.hpp files since Poedit v1.5
+
+* Thu Jul 12 2018 Wolfgang Stöggl <c72578@yahoo.de> - 2.0.9-1
+- New upstream version
+- Update URL
+
+* Sun Jun 10 2018 Wolfgang Stöggl <c72578@yahoo.de> - 2.0.8-1
+- New upstream version
+- Add poedit-2.0.8-configure_ppc64_ppc64le.patch
+  Fixes build errors on ppc64 and ppc64le (boost library not found)
+
 * Mon Apr 23 2018 Wolfgang Stöggl <c72578@yahoo.de> - 2.0.7-1
 - New upstream version
 

sources

@@ -1 +1 @@
-SHA512 (poedit-2.0.7.tar.gz) = 7b8b41b5f55252b1845c452edbdad56dc841c507c4fb7a24267bd2af8490610f5f3eb72f31ed4d062fdaef939ef4ecd9c30ddc85a5dad3a792ac5857567dac71
+SHA512 (poedit-2.2.1.tar.gz) = a75888aad9d13f2728d7de56bbe5f91c093ad4154c723b6d0066d382b40dff32e67314f30081bdb31502ed5936f3110d4f57e789bf2d47c572cbae8376f3749f