[packages/meld] - updated to 3.22.0 - added distutils patch for compatibility with current distutils providers (pyth

[qboosh]

commit 9827646f7ebc86ff215025adb6b347253312a987
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Sep 7 16:40:43 2022 +0200

    - updated to 3.22.0
    - added distutils patch for compatibility with current distutils providers (python 3.10+ or setuptools 60+)

 meld-desktop.patch   | 11 +++++------
 meld-distutils.patch | 11 +++++++++++
 meld.spec            | 24 ++++++++++++++----------
 3 files changed, 30 insertions(+), 16 deletions(-)
---
diff --git a/meld.spec b/meld.spec
index d426ce6..ad8101d 100644
--- a/meld.spec
+++ b/meld.spec
@@ -1,18 +1,21 @@
 Summary:	Visual diff and merge tool
 Summary(pl.UTF-8):	Wizualne narzędzie do oglądania i włączania zmian (diff)
 Name:		meld
-Version:	3.20.4
-Release:	3
+Version:	3.22.0
+Release:	1
 License:	GPL v2+
 Group:		Applications/Text
-Source0:	https://download.gnome.org/sources/meld/3.20/%{name}-%{version}.tar.xz
-# Source0-md5:	318b98861d546526fc122dea9dc90257
+Source0:	https://download.gnome.org/sources/meld/3.22/%{name}-%{version}.tar.xz
+# Source0-md5:	c32fa8675137e0d0c7334c4fc2de6114
 Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-distutils.patch
 Patch2:		%{name}-install.patch
-URL:		http://meld.sourceforge.net/
+URL:		http://meldmerge.org/
 BuildRequires:	intltool
 BuildRequires:	itstool
 BuildRequires:	python3-modules >= 1:3.3
+# ensure distutils.command.build.{Build -> build} rename (see distutils patch)
+BuildRequires:	python3-setuptools >= 1:60
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.714
@@ -53,6 +56,7 @@ zakładkami, pozwalający na otwieranie wielu plików diff naraz.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 
 cp -p meld/vc/COPYING COPYING.vc
@@ -68,7 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 	--no-compile-schemas \
 	--no-update-icon-cache
 
+# packaged as %doc
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%{__rm} -r $RPM_BUILD_ROOT%{py3_sitescriptdir}/%{name}/vc/{COPYING,README}
 
 %find_lang %{name} --with-gnome
 
@@ -102,11 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py3_sitescriptdir}/%{name}/vc
 %{py3_sitescriptdir}/%{name}/vc/*.py
 %{py3_sitescriptdir}/%{name}/vc/__pycache__
-%{_iconsdir}/hicolor/16x16/actions/meld-change-*.png
-%{_iconsdir}/hicolor/*x*/apps/meld-version-control.png
-%{_iconsdir}/hicolor/*x*/apps/org.gnome.meld.png
-%{_iconsdir}/hicolor/scalable/apps/org.gnome.meld.svg
-%{_iconsdir}/HighContrast/scalable/apps/org.gnome.meld.svg
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Meld.svg
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.MeldDevel.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.gnome.Meld-symbolic.svg
 %{_datadir}/%{name}
 %{_datadir}/glib-2.0/schemas/org.gnome.meld.gschema.xml
 %{_datadir}/metainfo/org.gnome.meld.appdata.xml
diff --git a/meld-desktop.patch b/meld-desktop.patch
index 4fb8108..5c57be1 100644
--- a/meld-desktop.patch
+++ b/meld-desktop.patch
@@ -1,10 +1,9 @@
-diff -urN meld-3.20.0.orig/data/org.gnome.meld.desktop.in meld-3.20.0/data/org.gnome.meld.desktop.in
---- meld-3.20.0.orig/data/org.gnome.meld.desktop.in	2019-01-20 22:21:14.767559143 +0100
-+++ meld-3.20.0/data/org.gnome.meld.desktop.in	2019-01-20 22:21:50.094006006 +0100
-@@ -9,6 +9,6 @@
- Terminal=false
+--- meld-3.22.0/data/org.gnome.meld.desktop.in.in.orig	2022-09-04 06:26:14.000000000 +0200
++++ meld-3.22.0/data/org.gnome.meld.desktop.in.in	2022-09-06 16:40:05.629916772 +0200
+@@ -9,6 +9,6 @@ Terminal=false
  Type=Application
- Icon=org.gnome.meld
+ # TRANSLATORS: Do NOT translate or transliterate this text (this is an icon file name)!
+ Icon=@icon@
 -MimeType=application/x-meld-comparison;
 +MimeType=application/x-meld-comparison;text/x-patch;
  StartupNotify=true
diff --git a/meld-distutils.patch b/meld-distutils.patch
new file mode 100644
index 0000000..60732a3
--- /dev/null
+++ b/meld-distutils.patch
@@ -0,0 +1,11 @@
+--- meld-3.22.0/meld/build_helpers.py.orig	2022-09-06 21:30:17.648921101 +0200
++++ meld-3.22.0/meld/build_helpers.py	2022-09-07 06:20:41.447497325 +0200
+@@ -64,7 +64,7 @@ def has_data(self):
+     return "build_data" in self.distribution.cmdclass
+ 
+ 
+-command_base.command.build.Build.sub_commands.extend([
++command_base.command.build.build.sub_commands.extend([
+     ("build_i18n", has_i18n),
+     ("build_icons", has_icons),
+     ("build_help", has_help),
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/meld.git/commitdiff/9827646f7ebc86ff215025adb6b347253312a987