From e6c3147850d61db75e24c158870166240b8ed38d Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 8 May 2025 12:42:38 +0800 Subject: [PATCH] fix build with gettext 0.24.1 (cherry picked from commit 88e9211efb7488c3514a233685f1d2f459277680) --- fuse.spec | 45 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/fuse.spec b/fuse.spec index 20451e7..2f3f1a5 100644 --- a/fuse.spec +++ b/fuse.spec @@ -1,12 +1,10 @@ -%global fuse2ver 2.9.9 - Name: fuse -Version: %{fuse2ver} -Release: 11 +Version: 2.9.9 +Release: 12 Summary: User space File System of fuse2 -License: GPL+ and LGPLv2+ -URL: http://fuse.sf.net -Source0: https://github.com/libfuse/libfuse/archive/%{name}-%{fuse2ver}.tar.gz +License: GPL-1.0-or-later and LGPL-2.1-or-later +URL: https://fuse.sf.net +Source0: https://github.com/libfuse/libfuse/archive/%{name}-%{version}.tar.gz Patch0: 0000-fix-compile-error-because-of-ns-colliding.patch Patch1: 0001-libfuse-Assign-NULL-to-old-to-avoid-free-it-twice-52.patch @@ -18,8 +16,8 @@ BuildRequires: autoconf, automake, libtool, gettext-devel, ninja-build Requires: which, fuse-common Recommends: %{name}-help = %{version}-%{release} Conflicts: filesystem < 3 -Provides: %{name}-libs -Obsoletes: %{name}-libs +Provides: %{name}-libs = %{version}-%{release} +Obsoletes: %{name}-libs < %{version}-%{release} %description FUSE (Filesystem in Userspace) is an interface for userspace programs to export @@ -30,47 +28,34 @@ reference implementation for communicating with the FUSE kernel module. %package devel -Version: %{fuse2ver} Summary: User space File System of fuse2 devel files -Obsoletes: %{name}-libs -Requires: pkgconfig -License: LGPLv2+ +License: LGPL-2.1-or-later Conflicts: filesystem < 3 %description devel This package contains all include files, libraries and configuration files needed to develop programs that use the fuse2. -%package help -Summary: Including man files for fuse -Requires: man - -%description help -This contains man files for the using of fuse +%package_help %prep -%autosetup -n %{name}-%{fuse2ver} -p1 +%autosetup -p1 #if change configure.ac, should autoreconf -autoreconf -ivf +autoreconf -ivf -I%{_datadir}/gettext/m4 %build export MOUNT_FUSE_PATH="%{_sbindir}" export CFLAGS="%{optflags} -D_GNU_SOURCE" -%configure --enable-lib +%configure --enable-lib --disable-static %make_build %install %make_install +%delete_la -rm -f %{buildroot}/%{_libdir}/*.a rm -f %{buildroot}%{_sysconfdir}/init.d/fuse rm -f %{buildroot}%{_sysconfdir}/udev/rules.d/99-fuse.rules -find %{buildroot} -type f -name "*.la" -delete -print - - -%post -n fuse -p /sbin/ldconfig -%postun -n fuse -p /sbin/ldconfig %files %doc {AUTHORS,ChangeLog,NEWS,README*} @@ -95,6 +80,10 @@ find %{buildroot} -type f -name "*.la" -delete -print %changelog +* Thu May 08 2025 Funda Wang - 2.9.9-12 +- fix build with gettext 0.24.1 +- clenaup spec + * Thu Apr 28 2022 zhanchengbin -2.9.9-11 - fix can not print changelog messages -- Gitee