- fix building with meson 0.60+ nad fix python packaging

diff --git a/d-feet.spec b/d-feet.spec
index 3f63a339cffc744558a5a817c37d07421f8ab660..c16de5648cd3e88519f7e6f7ec9f6273be94fe82 100644 (file)
--- a/d-feet.spec
+++ b/d-feet.spec
@@ -12,6 +12,7 @@ Group:                X11/Applications
 Source0:       https://download.gnome.org/sources/d-feet/0.3/%{name}-%{version}.tar.xz
 # Source0-md5: c5cc09323c725210b0c420e40fb81e4c
 Patch0:                %{name}-cleanup.patch
+Patch1:                meson0.60.patch
 URL:           https://wiki.gnome.org/Apps/DFeet
 BuildRequires: gobject-introspection-devel >= 0.9.6
 BuildRequires: gtk+3-devel >= 3.10
@@ -45,6 +46,7 @@ D-Feet to debugger dla magistrali D-Bus.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %meson build \
@@ -57,9 +59,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %ninja_install -C build
 
-# meson is so great, "pure: true" for python.install_sources doesn't work
-install -d $RPM_BUILD_ROOT%{py3_sitescriptdir}
-%{__mv} $RPM_BUILD_ROOT%{py3_sitedir}/dfeet $RPM_BUILD_ROOT%{py3_sitescriptdir}
 %py3_comp $RPM_BUILD_ROOT%{py3_sitescriptdir}
 %py3_ocomp $RPM_BUILD_ROOT%{py3_sitescriptdir}
 

diff --git a/meson0.60.patch b/meson0.60.patch
new file mode 100644 (file)
index 0000000..ae8eb20
--- /dev/null
+++ b/meson0.60.patch
@@ -0,0 +1,18 @@
+--- d-feet-0.3.16/data/meson.build~    2021-05-07 10:46:33.000000000 +0200
++++ d-feet-0.3.16/data/meson.build     2022-04-03 14:00:33.233166665 +0200
+@@ -13,7 +13,6 @@
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
+@@ -25,7 +24,6 @@
+ appdata = df_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,