From 55b2d520043a7a0b297d095903181c8b39b52c19 Mon Sep 17 00:00:00 2001 From: panchenbo Date: Fri, 29 Mar 2024 14:33:16 +0800 Subject: [PATCH] fix build error with gupnp-1.6 and del unused info --- caja-extensions.spec | 189 +-------------------------- fix-build-error-with-gupnp-1.6.patch | 13 ++ 2 files changed, 20 insertions(+), 182 deletions(-) create mode 100644 fix-build-error-with-gupnp-1.6.patch diff --git a/caja-extensions.spec b/caja-extensions.spec index 75273ea..e41144b 100644 --- a/caja-extensions.spec +++ b/caja-extensions.spec @@ -1,33 +1,14 @@ -# Conditional for release and snapshot builds. Uncomment for release-builds. -%global rel_build 1 - # This is needed, because src-url contains branched part of versioning-scheme. %global branch 1.22 -# Settings used for build from snapshots. -%{!?rel_build:%global commit 298c7255b82986eeba72fff06f59479deae0b9d0} -%{!?rel_build:%global commit_date 20131201} -%{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})} -%{!?rel_build:%global git_ver git%{commit_date}-%{shortcommit}} -%{!?rel_build:%global git_rel .git%{commit_date}.%{shortcommit}} -%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} - Name: caja-extensions Summary: Set of extensions for caja file manager Version: %{branch}.1 -%if 0%{?rel_build} -Release: 2 -%else -Release: 0.12%{?git_rel} -%endif +Release: 3 License: GPLv2+ URL: http://mate-desktop.org -# for downloading the tarball use 'spectool -g -R caja.spec' -# Source for release-builds. -%{?rel_build:Source0: http://pub.mate-desktop.org/releases/%{branch}/%%{name}-%%{version}.tar.xz} -# Source for snapshot-builds. -%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} +Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz Source1: caja-share-setup-instructions Source2: caja-share-smb.conf.example @@ -35,6 +16,7 @@ Source2: caja-share-smb.conf.example Patch0: caja-extensions_use-beesu-command-for-gksu.patch Patch1001: 0001-remove-sendto-option-in-computer-trash-and-root-fold.patch +Patch1002: fix-build-error-with-gupnp-1.6.patch BuildRequires: mate-common BuildRequires: caja-devel @@ -122,23 +104,12 @@ Caja xattr-tags extension, allows to quickly set xattr-tags. %prep -%if 0%{?rel_build} %autosetup -p1 -%else -%autosetup -n %{name}-%{commit} -p1 -%endif cp %{SOURCE1} SETUP -%if 0%{?rel_build} -#NOCONFIGURE=1 ./autogen.sh -%else # 0%{?rel_build} -# for snapshots -# needed for git snapshots -NOCONFIGURE=1 ./autogen.sh -%endif # 0%{?rel_build} - %build +autoreconf -vif %configure \ --disable-schemas-compile \ --enable-image-converter \ @@ -221,6 +192,9 @@ cp %{SOURCE2} %{buildroot}/%{_sysconfdir}/samba/ %changelog +* Fri Mar 29 2024 panchenbo - 1.22.1-3 +- fix build error with gupnp-1.6 + * Fri Jul 29 2022 longcheng - 1.22.1-2 - remove %{?dist} - remove Requires: beesu for caja-beesu @@ -228,152 +202,3 @@ cp %{SOURCE2} %{buildroot}/%{_sysconfdir}/samba/ * Wed Sep 18 2019 Wolfgang Ulbrich - 1.22.1-1 - update to 1.22.1 - -* Wed Jul 24 2019 Fedora Release Engineering - 1.22.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Mar 04 2019 Wolfgang Ulbrich - 1.22.0-1 -- update to 1.22.0 - -* Thu Jan 31 2019 Fedora Release Engineering - 1.20.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Dec 11 2018 Wolfgang Ulbrich - 1.20.2-2 -- bump version to fix conflicts with previous extenstion package from caja - -* Tue Dec 11 2018 Wolfgang Ulbrich - 1.20.2-1 -- update to 1.20.2 - -* Thu Jul 12 2018 Fedora Release Engineering - 1.20.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 12 2018 Wolfgang Ulbrich - 1.20.1-2 -- bumb version to avoid conflict with debuginfo package from caja - -* Tue Jun 12 2018 Wolfgang Ulbrich - 1.20.1-1 -- update to 1.20.1 release - -* Sun Feb 11 2018 Wolfgang Ulbrich - 1.20.0-1 -- update to 1.20.0 release -- drop GSettings Schema rpm scriptlet -- switch to using autosetup - -* Wed Feb 07 2018 Fedora Release Engineering - 1.19.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Oct 13 2017 Wolfgang Ulbrich - 1.19.0-1 -- update to 1.19.0 release - -* Wed Aug 09 2017 Wolfgang Ulbrich - 1.18.1-4 -- remove virtual provides - -* Wed Aug 02 2017 Fedora Release Engineering - 1.18.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.18.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sun Apr 16 2017 Wolfgang Ulbrich - 1.18.1-1 -- update to 1.18.1 release - -* Tue Mar 14 2017 Wolfgang Ulbrich - 1.18.0-1 -- update to 1.18.0 release -- add caja-xattr-tags subpackage - -* Fri Feb 10 2017 Fedora Release Engineering - 1.17.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Dec 03 2016 Wolfgang Ulbrich - 1.17.0-1 -- update to 1.17.0 release - -* Thu Sep 22 2016 Wolfgang Ulbrich - 1.16.0-1 -- update to 1.16.0 release - -* Thu Jun 09 2016 Wolfgang Ulbrich - 1.15.0-1 -- update to 1.15.0 release -- switch to gtk+3 - -* Tue Apr 05 2016 Wolfgang Ulbrich - 1.14.0-1 -- update to 1.14.0 release - -* Sun Feb 07 2016 Wolfgang Ulbrich - 1.13.0-1 -- update to 1.13.0 release - -* Wed Feb 03 2016 Fedora Release Engineering - 1.12.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Nov 06 2015 Wolfgang Ulbrich - 1.12.0-1 -- update to 1.12.0 release - -* Thu Oct 22 2015 Wolfgang Ulbrich - 1.11.0-1 -- update to 1.11.0 release - -* Thu Jul 16 2015 Wolfgang Ulbrich - 1.10.1-1 -- update to 1.10.1 release -- enable gajim sendto plugin - -* Wed Jul 01 2015 Wolfgang Ulbrich - 1.10.0-3 -- disable gajim sendto plugin - -* Wed Jun 17 2015 Fedora Release Engineering - 1.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue May 05 2015 Wolfgang Ulbrich - 1.10.0-1 -- update to 1.10.0 release - -* Sun Apr 05 2015 Wolfgang Ulbrich - 1.9.90-1 -- update to 1.9.90 release - -* Thu Jan 22 2015 Wolfgang Ulbrich - 1.9.1-1 -- update to 1.9.1 release -- add caja-wallpaper subpackage -- cleanup build requires -- update configure flags -- update file section - -* Fri Aug 15 2014 Fedora Release Engineering - 1.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jul 12 2014 Wolfgang Ulbrich - 1.9.0-1 -- update to 1.9.0 release - -* Sat Jun 07 2014 Fedora Release Engineering - 1.8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Apr 30 2014 Wolfgang Ulbrich - 1.8.0-2 -- rebuild for libgtop2 soname bump - -* Wed Mar 05 2014 Dan Mashal - 1.8.0-1 -- Update to 1.8.0 - -* Wed Feb 19 2014 Wolfgang Ulbrich - 1.7.90-1 -- update to 1.7.90 - -* Mon Feb 10 2014 Wolfgang Ulbrich - 1.7.2-1 -- update to 1.7.2 release - -* Fri Jan 24 2014 Wolfgang Ulbrich - 1.7.1-1 -- update to 1.7.1 -- add --with-gnome --all-name for find language -- fix bogus date in %%changelog - -* Wed Dec 18 2013 Wolfgang Ulbrich - 1.7.0-0.4.git20131201.298c725 -- make Maintainers life easier and use better git snapshot usage, Thanks to Björn Esser -- fix provides/obsoletes - -* Sat Dec 14 2013 Wolfgang Ulbrich - 1.7.0-0.3.git298c725 -- remove isa tags from obsoletes/provides - -* Fri Dec 06 2013 Wolfgang Ulbrich - 1.7.1-0.2.git298c725 -- fix all the macro-in-comment warnings -- add versioned provides for the obsoleted packages -- remove NEWS, zero-length -- fix spelling-errors - -* Thu Dec 05 2013 Wolfgang Ulbrich - 1.7.1-0.1.git298c725 -- initial build for fedora rawhide (f21) -- this package obsoletes mate-file-manager-image-converter, -- mate-file-manager-open-terminal, mate-file-manager-sendto, -- mate-file-manager-share -- add new extension caja-beesu - diff --git a/fix-build-error-with-gupnp-1.6.patch b/fix-build-error-with-gupnp-1.6.patch new file mode 100644 index 0000000..42e0e19 --- /dev/null +++ b/fix-build-error-with-gupnp-1.6.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 4bf7d08..3c5a89e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -196,6 +196,8 @@ if test "x$enable_sendto" = "xyes"; then + fi + ;; + upnp) ++ PKG_CHECK_MODULES(UPNP, gupnp-1.6 >= $GUPNP_REQUIRED, ++ enable_upnp=yes AC_DEFINE([HAS_GUPNP_VERSION_1_6], 1, ["Version is at least 1.6"]), enable_upnp=no) + PKG_CHECK_MODULES(UPNP, gupnp-1.2 >= $GUPNP_REQUIRED, + enable_upnp=yes AC_DEFINE([HAS_GUPNP_VERSION_1_2], 1, ["Version is at least 1.2"]), enable_upnp=no) + PKG_CHECK_MODULES(UPNP, gupnp-1.0 >= $GUPNP_REQUIRED, -- Gitee