From 942c27d908daf3759fd08b2eb8a0976824657b9602691a811c98aa10d87173a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 3 Feb 2022 21:50:25 +0000 Subject: [PATCH] Accepting request 950563 from GNOME:Next Mesonfix and other tweaks OBS-URL: https://build.opensuse.org/request/show/950563 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-user-share?expand=0&rev=108 --- _service | 21 +++++++++++++++++++++ gnome-user-share-3.34.0+25.obscpio | 3 +++ gnome-user-share-3.34.0.tar.xz | 3 --- gnome-user-share-fix-meson-0_61_0.patch | 10 ++++++++++ gnome-user-share.changes | 15 +++++++++++++++ gnome-user-share.obsinfo | 4 ++++ gnome-user-share.spec | 16 ++++++++++------ 7 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 _service create mode 100644 gnome-user-share-3.34.0+25.obscpio delete mode 100644 gnome-user-share-3.34.0.tar.xz create mode 100644 gnome-user-share-fix-meson-0_61_0.patch create mode 100644 gnome-user-share.obsinfo diff --git a/_service b/_service new file mode 100644 index 0000000..b60740d --- /dev/null +++ b/_service @@ -0,0 +1,21 @@ + + + + git + https://gitlab.gnome.org/GNOME/gnome-user-share.git + a89c973d + @PARENT_TAG@+@TAG_OFFSET@ + GNOME_USER_SHARE_(\d+)_(\d+)_(\d+) + \1.\2.\3 + + + + + *.tar + xz + + + + diff --git a/gnome-user-share-3.34.0+25.obscpio b/gnome-user-share-3.34.0+25.obscpio new file mode 100644 index 0000000..aade8c8 --- /dev/null +++ b/gnome-user-share-3.34.0+25.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33d273dd8d3ff6c600fc91fcc4e9098a2eee4c2eea1a52582d148ffed37b0653 +size 801292 diff --git a/gnome-user-share-3.34.0.tar.xz b/gnome-user-share-3.34.0.tar.xz deleted file mode 100644 index 4e7a109..0000000 --- a/gnome-user-share-3.34.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d0c2a8eb4fcc4bff85c5edde9346ba6094e356921d2955f180d44b2d3642913 -size 109560 diff --git a/gnome-user-share-fix-meson-0_61_0.patch b/gnome-user-share-fix-meson-0_61_0.patch new file mode 100644 index 0000000..e69f3d9 --- /dev/null +++ b/gnome-user-share-fix-meson-0_61_0.patch @@ -0,0 +1,10 @@ +--- orig-gnome-user-share-3.34.0/data/meson.build 2019-09-06 11:39:10.000000000 +0200 ++++ gnome-user-share-3.34.0/data/meson.build 2022-02-01 22:27:25.258136738 +0100 +@@ -7,7 +7,6 @@ + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: '@BASENAME@', diff --git a/gnome-user-share.changes b/gnome-user-share.changes index d35c242..44c4f83 100644 --- a/gnome-user-share.changes +++ b/gnome-user-share.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Feb 1 21:30:03 UTC 2022 - Bjørn Lie + +- Update to version 3.34.0+25: + + build: correct gio_unix_dep use. + + Updated translations. +- Switch to gitcheckout via source service, upstream is not making + releases, and we want the translations. +- Add gnome-user-share-fix-meson-0_61_0.patch: Fix build with meson + 0.61.0 and newer. +- Drop update-desktop-files BuildRequires and its macro, no longer + needed. +- Stop removing non-existant la files, not built since the switch + to meson buildsystem. + ------------------------------------------------------------------- Mon Sep 20 19:52:43 UTC 2021 - Stanislav Brabec diff --git a/gnome-user-share.obsinfo b/gnome-user-share.obsinfo new file mode 100644 index 0000000..21e3d8d --- /dev/null +++ b/gnome-user-share.obsinfo @@ -0,0 +1,4 @@ +name: gnome-user-share +version: 3.34.0+25 +mtime: 1640234103 +commit: a89c973d7db36938542325f77d81b73c32968e49 diff --git a/gnome-user-share.spec b/gnome-user-share.spec index 7f303c5..15a7e3f 100644 --- a/gnome-user-share.spec +++ b/gnome-user-share.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-user-share # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,21 @@ Name: gnome-user-share -Version: 3.34.0 +Version: 3.34.0+25 Release: 0 Summary: GNOME user file sharing License: GPL-2.0-or-later Group: Productivity/Networking/File-Sharing URL: http://www.gnome.org/ -Source0: https://download.gnome.org/sources/gnome-user-share/3.34/%{name}-%{version}.tar.xz +# Disable Source URL, use git checkout via service +# Source0: https://download.gnome.org/sources/gnome-user-share/3.34/%%{name}-%%{version}.tar.xz +Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gnome-user-share-fix-meson-0_61_0.patch bjorn.lie@gmail.com -- Fix build with meson 0.61.0 and newer +Patch0: gnome-user-share-fix-meson-0_61_0.patch BuildRequires: fdupes BuildRequires: meson >= 0.50.0 BuildRequires: pkgconfig -BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(glib-2.0) >= 2.58 BuildRequires: pkgconfig(gtk+-3.0) @@ -68,11 +71,12 @@ up in the Network location in GNOME. %install %meson_install -find %{buildroot} -type f -name "*.la" -delete -print -%suse_update_desktop_file gnome-user-share-webdav Network FileTransfer %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}%{_prefix} +%check +%meson_test + %files %license COPYING %doc README NEWS