From 14daf3a4d57085160a90fae0884aa6f454eba9e6 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Nov 24 2022 19:30:10 +0000 Subject: disable gupnp for sendto-plugin, rhbz (2145142) --- diff --git a/caja-extensions.spec b/caja-extensions.spec index cef7c00..93ed9b5 100644 --- a/caja-extensions.spec +++ b/caja-extensions.spec @@ -16,7 +16,7 @@ Name: caja-extensions Summary: Set of extensions for caja file manager Version: %{branch}.1 %if 0%{?rel_build} -Release: 1%{?dist} +Release: 2%{?dist} %else Release: 0.19%{?git_rel}%{?dist} %endif @@ -32,13 +32,16 @@ URL: http://mate-desktop.org Source1: caja-share-setup-instructions Source2: caja-share-smb.conf.example +# rhbz (2145142) +Patch1: caja-extensions_0001-build-without-gupnp.patch + BuildRequires: make BuildRequires: mate-common BuildRequires: caja-devel BuildRequires: mate-desktop-devel BuildRequires: dbus-glib-devel BuildRequires: gtk3-devel -BuildRequires: gupnp-devel +# BuildRequires: gupnp-devel BuildRequires: dbus-glib-devel %if 0%{?rhel} <= 7 || 0%{?fedora} @@ -138,6 +141,9 @@ cp %{SOURCE1} SETUP NOCONFIGURE=1 ./autogen.sh %endif # 0%{?rel_build} +# patch 1 +NOCONFIGURE=1 ./autogen.sh + %build %configure \ --disable-schemas-compile \ @@ -147,7 +153,7 @@ NOCONFIGURE=1 ./autogen.sh %if 0%{?rhel} > 7 --with-sendto-plugins=emailclient,caja-burn,pidgin,removable-devices,upnp \ %else - --with-sendto-plugins=all \ + --with-sendto-plugins=emailclient,gajim,caja-burn,pidgin,removable-devices \ %endif --enable-share \ --enable-gksu \ @@ -188,7 +194,7 @@ cp %{SOURCE2} %{buildroot}/%{_sysconfdir}/samba/ %{_libdir}/caja-sendto/plugins/libnstemailclient.so %{_libdir}/caja-sendto/plugins/libnstpidgin.so %{_libdir}/caja-sendto/plugins/libnstremovable_devices.so -%{_libdir}/caja-sendto/plugins/libnstupnp.so +#%{_libdir}/caja-sendto/plugins/libnstupnp.so %if 0%{?rhel} <= 7 || 0%{?fedora} %{_libdir}/caja-sendto/plugins/libnstgajim.so %endif @@ -224,6 +230,9 @@ cp %{SOURCE2} %{buildroot}/%{_sysconfdir}/samba/ %changelog +* Thu Nov 24 2022 Wolfgang Ulbrich - 1.26.1-2 +- disable gupnp for sendto-plugin + * Sat Aug 20 2022 Wolfgang Ulbrich - 1.26.1-1 - update to 1.26.1 diff --git a/caja-extensions_0001-build-without-gupnp.patch b/caja-extensions_0001-build-without-gupnp.patch new file mode 100644 index 0000000..2f00cb4 --- /dev/null +++ b/caja-extensions_0001-build-without-gupnp.patch @@ -0,0 +1,34 @@ +From d390cb9d6db7ffd97573ec7f0f90f2ac56d3c9a7 Mon Sep 17 00:00:00 2001 +From: raveit65 +Date: Wed, 23 Nov 2022 21:38:26 +0100 +Subject: [PATCH] build without gupnp + +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c8fb513..bdb4575 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -119,7 +119,7 @@ if test "x$enable_sendto" = "xyes"; then + GTHREAD_REQUIRED=2.6.0 + DBUS_REQUIRED=1.0 + DBUS_GLIB_REQUIRED=0.60 +- GUPNP_REQUIRED=0.13 ++# GUPNP_REQUIRED=0.13 + PKG_CHECK_MODULES(SENDTO, + glib-2.0 >= $GLIB_REQUIRED + gthread-2.0 >= $GTHREAD_REQUIRED +@@ -130,7 +130,7 @@ if test "x$enable_sendto" = "xyes"; then + AC_SUBST(SENDTO_LIBS) + + # The full list of plugins +- allowed_sendto_plugins="emailclient gajim caja-burn pidgin removable-devices upnp" ++ allowed_sendto_plugins="emailclient gajim caja-burn pidgin removable-devices" + + sendto_plugin_error_or_ignore() + { +-- +2.38.1 +