From fe1be50d667aba156c3beca4a85c7ae8c1c3f8eb Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Mon, 29 Jul 2024 12:44:39 +0200
Subject: [PATCH] Drop the gphoto2 and mtp subpackages on s390(x) architectures

The gphoto2 and mtp support is not needed for s390(x) architectures.
The mobile phones, players or cameras can't be connected to those
devices.

Resolves: RHEL-51129
---
 gvfs.spec | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/gvfs.spec b/gvfs.spec
index 6fb232a..58b9525 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -22,7 +22,7 @@
 
 Name:    gvfs
 Version: 1.54.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Backends for the gio framework in GLib
 
 License: LGPL-2.0-or-later AND GPL-3.0-only AND MPL-2.0 AND BSD-3-Clause-Sun
@@ -68,6 +68,10 @@ Obsoletes: gnome-mount-nautilus-properties <= 0.8
 Obsoletes: gvfs-obexftp < 1.17.91-2
 Obsoletes: gvfs-devel < 1.54.2-1
 Obsoletes: gvfs-tests < 1.54.2-2
+%ifarch s390 s390x
+Obsoletes: gvfs-gphoto2 < 1.54.2-3
+Obsoletes: gvfs-mtp < 1.54.2-3
+%endif
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -120,6 +124,7 @@ as well as ISO images, to applications using gvfs.
 %endif
 
 
+%ifnarch s390 s390x
 %package gphoto2
 Summary: gphoto2 support for gvfs
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -133,7 +138,6 @@ PTP based cameras (Picture Transfer Protocol) and MTP based
 media players (Media Transfer Protocol) to applications using gvfs.
 
 
-%ifnarch s390 s390x
 %if ! 0%{?rhel}
 %package afc
 Summary: AFC support for gvfs
@@ -166,6 +170,7 @@ to applications using gvfs.
 %endif
 
 
+%ifnarch s390 s390x
 %package mtp
 Summary: MTP support for gvfs
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -176,6 +181,7 @@ BuildRequires: pkgconfig(libusb-1.0) >= %{libusb_version}
 %description mtp
 This package provides support for reading and writing files on
 MTP based devices (Media Transfer Protocol) to applications using gvfs.
+%endif
 
 
 %if ! 0%{?rhel}
@@ -215,6 +221,9 @@ file services.
        -Dman=true \
 %ifarch s390 s390x
        -Dafc=false \
+       -Dgphoto2=false \
+       -Dlibusb=false \
+       -Dmtp=false \
 %endif
 %if 0%{?rhel}
        -Dnfs=false \
@@ -250,10 +259,12 @@ killall -USR1 gvfsd >&/dev/null || :
 # Reload .mount files when single subpackage is installed:
 %post smb
 killall -USR1 gvfsd >&/dev/null || :
+%ifnarch s390 s390x
 %post gphoto2
 killall -USR1 gvfsd >&/dev/null || :
 %post mtp
 killall -USR1 gvfsd >&/dev/null || :
+%endif
 %post goa
 killall -USR1 gvfsd >&/dev/null || :
 %ifnarch s390 s390x
@@ -359,7 +370,7 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/mounts/archive.mount
 %endif
 
-
+%ifnarch s390 s390x
 %files gphoto2
 %{_libexecdir}/gvfsd-gphoto2
 %{_datadir}/gvfs/mounts/gphoto2.mount
@@ -368,7 +379,6 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/remote-volume-monitors/gphoto2.monitor
 %{_userunitdir}/gvfs-gphoto2-volume-monitor.service
 
-%ifnarch s390 s390x
 %if ! 0%{?rhel}
 %files afc
 %{_libexecdir}/gvfsd-afc
@@ -388,6 +398,7 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/mounts/afp-browse.mount
 %endif
 
+%ifnarch s390 s390x
 %files mtp
 %{_libexecdir}/gvfsd-mtp
 %{_datadir}/gvfs/mounts/mtp.mount
@@ -395,6 +406,7 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/dbus-1/services/org.gtk.vfs.MTPVolumeMonitor.service
 %{_datadir}/gvfs/remote-volume-monitors/mtp.monitor
 %{_userunitdir}/gvfs-mtp-volume-monitor.service
+%endif
 
 %if ! 0%{?rhel}
 %files nfs
@@ -419,6 +431,9 @@ killall -USR1 gvfsd >&/dev/null || :
 
 
 %changelog
+* Mon Jul 29 2024 Ondrej Holy <oholy@redhat.com> - 1.54.2-3
+- Drop the gphoto2 and mtp subpackages on s390(x) architectures
+
 * Mon Jul 29 2024 Ondrej Holy <oholy@redhat.com> - 1.54.2-2
 - Drop the gvfs-tests subpackage