!3 fix build when Meson >= 0.61.5

From: @zhang__3125 
Reviewed-by: @dwl301 
Signed-off-by: @dwl301
This commit is contained in:
openeuler-ci-bot 2022-06-22 11:07:12 +00:00 committed by Gitee
commit a6f12757cf
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 23 additions and 8 deletions

11
fix-i18n-merge-file.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up gnome-user-share-3.34.0/data/meson.build.orig gnome-user-share-3.34.0/data/meson.build
--- gnome-user-share-3.34.0/data/meson.build.orig 2022-06-22 10:06:57.184000000 +0000
+++ gnome-user-share-3.34.0/data/meson.build 2022-06-22 10:07:16.824000000 +0000
@@ -7,7 +7,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: '@BASENAME@',

View File

@ -1,11 +1,11 @@
Name: gnome-user-share
Version: 3.34.0
Release: 2
Summary: Gnome user file sharing
License: GPLv2+
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-user-share/3.34/%{name}-%{version}.tar.xz
Name: gnome-user-share
Version: 3.34.0
Release: 3
Summary: Gnome user file sharing
License: GPLv2+
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-user-share/3.34/%{name}-%{version}.tar.xz
Patch0: fix-i18n-merge-file.patch
BuildRequires: gcc gtk3-devel httpd itstool libcanberra-devel meson desktop-file-utils
BuildRequires: libselinux-devel dbus-glib-devel libnotify-devel nautilus-devel gettext
@ -54,6 +54,10 @@ up in the Network location in GNOME.
%{_userunitdir}/gnome-user-share-webdav.service
%changelog
* Mon Jun 20 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 3.34.0-3
- fix build when Meson >= 0.61.5
- add patch fix-i18n-merge-file.patch
* Mon Apr 18 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 3.34.0-2
- Add gnome-user-share.yaml