1
0

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
This commit is contained in:
Dominique Leuenberger 2022-09-13 07:34:58 +00:00 committed by Git OBS Bridge
parent 942c27d908
commit d01c23f46e
7 changed files with 23 additions and 24 deletions

View File

@ -3,7 +3,7 @@
<service name="obs_scm" mode="disabled"> <service name="obs_scm" mode="disabled">
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/gnome-user-share.git</param> <param name="url">https://gitlab.gnome.org/GNOME/gnome-user-share.git</param>
<param name="revision">a89c973d</param> <param name="revision">refs/tags/43.alpha</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">GNOME_USER_SHARE_(\d+)_(\d+)_(\d+)</param> <param name="versionrewrite-pattern">GNOME_USER_SHARE_(\d+)_(\d+)_(\d+)</param>
<param name="versionrewrite-replacement">\1.\2.\3</param> <param name="versionrewrite-replacement">\1.\2.\3</param>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:33d273dd8d3ff6c600fc91fcc4e9098a2eee4c2eea1a52582d148ffed37b0653
size 801292

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:685c39320074bc7a38956eb485d404cf2c64e00ed7c445fd25fc5af3351fc9e3
size 787980

View File

@ -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@',

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sat Aug 6 18:27:22 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- 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 <bjorn.lie@gmail.com> Tue Feb 1 21:30:03 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -1,4 +1,4 @@
name: gnome-user-share name: gnome-user-share
version: 3.34.0+25 version: 43.alpha+0
mtime: 1640234103 mtime: 1657879975
commit: a89c973d7db36938542325f77d81b73c32968e49 commit: 73961a562688e6736359ab0f938c304436c2acaf

View File

@ -17,7 +17,7 @@
Name: gnome-user-share Name: gnome-user-share
Version: 3.34.0+25 Version: 43.alpha+0
Release: 0 Release: 0
Summary: GNOME user file sharing Summary: GNOME user file sharing
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -26,23 +26,18 @@ URL: http://www.gnome.org/
# Disable Source URL, use git checkout via service # Disable Source URL, use git checkout via service
# Source0: https://download.gnome.org/sources/gnome-user-share/3.34/%%{name}-%%{version}.tar.xz # Source0: https://download.gnome.org/sources/gnome-user-share/3.34/%%{name}-%%{version}.tar.xz
Source0: %{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: fdupes
BuildRequires: meson >= 0.50.0 BuildRequires: meson >= 0.50.0
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: yelp-tools BuildRequires: yelp-tools
BuildRequires: pkgconfig(glib-2.0) >= 2.58 BuildRequires: pkgconfig(glib-2.0) >= 2.58
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libnautilus-extension) >= 3.27.90
BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
Suggests: apache2-mod_dnssd Suggests: apache2-mod_dnssd
Suggests: apache2-prefork Suggests: apache2-prefork
Suggests: apache2-worker Suggests: apache2-worker
%glib2_gsettings_schema_requires
%description %description
gnome-user-share is a small package that binds together various free 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 %{_libexecdir}/gnome-user-share
%{_datadir}/gnome-user-share %{_datadir}/gnome-user-share
%{_datadir}/applications/gnome-user-share-webdav.desktop %{_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}/GConf/gsettings/gnome-user-share.convert
%{_datadir}/glib-2.0/schemas/org.gnome.desktop.file-sharing.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.desktop.file-sharing.gschema.xml
%{_userunitdir}/gnome-user-share-webdav.service %{_userunitdir}/gnome-user-share-webdav.service