From d01c23f46ec38bf212d06363779ed346d4feda9a45f259338d0176c75909d053 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 13 Sep 2022 07:34:58 +0000 Subject: [PATCH] Accepting request 1002656 from GNOME:Next GNOME 43.rc - let's get this into Staging to see what we break (e.g meson:test seems to be an issue already) OBS-URL: https://build.opensuse.org/request/show/1002656 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-user-share?expand=0&rev=109 --- _service | 2 +- gnome-user-share-3.34.0+25.obscpio | 3 --- gnome-user-share-43.alpha+0.obscpio | 3 +++ gnome-user-share-fix-meson-0_61_0.patch | 10 ---------- gnome-user-share.changes | 13 +++++++++++++ gnome-user-share.obsinfo | 6 +++--- gnome-user-share.spec | 10 +++------- 7 files changed, 23 insertions(+), 24 deletions(-) delete mode 100644 gnome-user-share-3.34.0+25.obscpio create mode 100644 gnome-user-share-43.alpha+0.obscpio delete mode 100644 gnome-user-share-fix-meson-0_61_0.patch diff --git a/_service b/_service index b60740d..4e86e87 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git https://gitlab.gnome.org/GNOME/gnome-user-share.git - a89c973d + refs/tags/43.alpha @PARENT_TAG@+@TAG_OFFSET@ GNOME_USER_SHARE_(\d+)_(\d+)_(\d+) \1.\2.\3 diff --git a/gnome-user-share-3.34.0+25.obscpio b/gnome-user-share-3.34.0+25.obscpio deleted file mode 100644 index aade8c8..0000000 --- a/gnome-user-share-3.34.0+25.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33d273dd8d3ff6c600fc91fcc4e9098a2eee4c2eea1a52582d148ffed37b0653 -size 801292 diff --git a/gnome-user-share-43.alpha+0.obscpio b/gnome-user-share-43.alpha+0.obscpio new file mode 100644 index 0000000..5eb48a6 --- /dev/null +++ b/gnome-user-share-43.alpha+0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:685c39320074bc7a38956eb485d404cf2c64e00ed7c445fd25fc5af3351fc9e3 +size 787980 diff --git a/gnome-user-share-fix-meson-0_61_0.patch b/gnome-user-share-fix-meson-0_61_0.patch deleted file mode 100644 index e69f3d9..0000000 --- a/gnome-user-share-fix-meson-0_61_0.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 44c4f83..dd679f2 100644 --- a/gnome-user-share.changes +++ b/gnome-user-share.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sat Aug 6 18:27:22 UTC 2022 - Bjørn Lie + +- Update to version 43.alpha: + + Remove Nautilus extension. + + Fix build with meson 0.61 and newer. + + Updated translations. +- Drop gnome-user-share-fix-meson-0_61_0.patch fixed upstream. +- Drop pkgconfig(libnautilus-extension) and pkgconfig(gtk+-3.0) + BuildRequires: No longer needed as nautilus extension was removed + upstream. +- Drop obsolete glib2_gsettings_schema_requires macro. + ------------------------------------------------------------------- Tue Feb 1 21:30:03 UTC 2022 - Bjørn Lie diff --git a/gnome-user-share.obsinfo b/gnome-user-share.obsinfo index 21e3d8d..f0670ac 100644 --- a/gnome-user-share.obsinfo +++ b/gnome-user-share.obsinfo @@ -1,4 +1,4 @@ name: gnome-user-share -version: 3.34.0+25 -mtime: 1640234103 -commit: a89c973d7db36938542325f77d81b73c32968e49 +version: 43.alpha+0 +mtime: 1657879975 +commit: 73961a562688e6736359ab0f938c304436c2acaf diff --git a/gnome-user-share.spec b/gnome-user-share.spec index 15a7e3f..5dee5bb 100644 --- a/gnome-user-share.spec +++ b/gnome-user-share.spec @@ -17,7 +17,7 @@ Name: gnome-user-share -Version: 3.34.0+25 +Version: 43.alpha+0 Release: 0 Summary: GNOME user file sharing License: GPL-2.0-or-later @@ -26,23 +26,18 @@ URL: http://www.gnome.org/ # 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: yelp-tools BuildRequires: pkgconfig(glib-2.0) >= 2.58 -BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libcanberra-gtk3) -BuildRequires: pkgconfig(libnautilus-extension) >= 3.27.90 BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(systemd) Suggests: apache2-mod_dnssd Suggests: apache2-prefork Suggests: apache2-worker -%glib2_gsettings_schema_requires %description gnome-user-share is a small package that binds together various free @@ -83,7 +78,8 @@ up in the Network location in GNOME. %{_libexecdir}/gnome-user-share %{_datadir}/gnome-user-share %{_datadir}/applications/gnome-user-share-webdav.desktop -%{_libdir}/nautilus/extensions-3.0/libnautilus-share-extension.so +%dir %{_datadir}/GConf +%dir %{_datadir}/GConf/gsettings %{_datadir}/GConf/gsettings/gnome-user-share.convert %{_datadir}/glib-2.0/schemas/org.gnome.desktop.file-sharing.gschema.xml %{_userunitdir}/gnome-user-share-webdav.service