diff --git a/fuse.spec b/fuse.spec index c0644bf..2d5de84 100644 --- a/fuse.spec +++ b/fuse.spec @@ -2,15 +2,14 @@ %define gitver %(echo %version | tr . _) Name: fuse Version: 2.9.9 -Release: 3mamba +Release: 4mamba Summary: File System in Userspace (FUSE) utilities Group: System/Tools Vendor: openmamba Distribution: openmamba -Packager: Stefano Cotta Ramusino -URL: http://fuse.sourceforge.net +Packager: Silvan Calarco +URL: https://github.com/libfuse/libfuse Source: https://github.com/libfuse/libfuse.git/fuse-%{version}/libfuse-%{version}.tar.bz2 -#Source: http://downloads.sourceforge.net/fuse/fuse-%{version}.tar.gz Source1: %{name}-initscript Patch0: %{name}-2.8.7-fix_linking_issues_with_gold_linker.patch Patch1: fuse-2.9.9-aarch64.patch @@ -20,7 +19,6 @@ BuildRequires: glibc-devel ## AUTOBUILDREQ-END BuildRequires: libselinux-devel Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description With FUSE it is possible to implement a fully functional filesystem in a userspace program. @@ -48,8 +46,9 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release} %description -n %{libname}-devel Libraries for FUSE. +This package contains static libraries and header files needed for development. -This package contains static libraries and header files need for development. +%debug_package %prep %setup -q -n libfuse-%{version} @@ -62,42 +61,41 @@ sh ./makeconf.sh %build %configure \ - --disable-kernel-module \ - --exec-prefix=/ \ - --libdir=/%{_lib} \ - --bindir=/bin \ - --with-pkgconfigdir=%{_libdir}/pkgconfig + --sbindir=%{_prefix} -%make +%make \ + MOUNT_FUSE_PATH=%{_sbindir} %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} -%makeinstall INIT_D_PATH=%{_initrddir} +%makeinstall \ + INIT_D_PATH=%{_initrddir} \ + MOUNT_FUSE_PATH=%{_sbindir} # change permission to allow stripping -chmod 0755 %{buildroot}/bin/%{name}rmount +chmod 0755 %{buildroot}%{_bindir}/%{name}rmount #install -D -m 755 %{S:1} \ # %{buildroot}%{_initrddir}/%{name} rm -f %{buildroot}%{_initrddir}/%{name} -# create compatibility symlinks -install -d %{buildroot}%{_bindir} -ln -s /bin/%{name}rmount %{buildroot}%{_bindir}/%{name}rmount -ln -s /bin/ulockmgr_server %{buildroot}%{_bindir}/ulockmgr_server +## create compatibility symlinks +#install -d %{buildroot}%{_bindir} +#ln -s /bin/%{name}rmount %{buildroot}%{_bindir}/%{name}rmount +#ln -s /bin/ulockmgr_server %{buildroot}%{_bindir}/ulockmgr_server %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} -%post -n %{libname} -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig %files %defattr(-,root,root) %config %{_sysconfdir}/udev/rules.d/99-%{name}.rules -/sbin/mount.fuse -%attr(4754,root,users) /bin/fusermount -/bin/ulockmgr_server +%{_sbindir}/mount.fuse +%attr(4754,root,users) %{_bindir}/fusermount +%{_bindir}/ulockmgr_server %{_bindir}/fusermount %{_bindir}/ulockmgr_server #%{_initrddir}/fuse @@ -108,8 +106,8 @@ ln -s /bin/ulockmgr_server %{buildroot}%{_bindir}/ulockmgr_server %files -n %{libname} %defattr(-,root,root) -/%{_lib}/libfuse.so.* -/%{_lib}/libulockmgr.so.* +%{_libdir}/libfuse.so.* +%{_libdir}/libulockmgr.so.* %doc AUTHORS COPYING.LIB %files -n %{libname}-devel @@ -117,16 +115,19 @@ ln -s /bin/ulockmgr_server %{buildroot}%{_bindir}/ulockmgr_server %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_includedir}/*.h -/%{_lib}/libfuse.a -/%{_lib}/libfuse.la -/%{_lib}/libfuse.so -/%{_lib}/libulockmgr.a -/%{_lib}/libulockmgr.la -/%{_lib}/libulockmgr.so +%{_libdir}/libfuse.a +%{_libdir}/libfuse.la +%{_libdir}/libfuse.so +%{_libdir}/libulockmgr.a +%{_libdir}/libulockmgr.la +%{_libdir}/libulockmgr.so %{_libdir}/pkgconfig/*.pc %doc ChangeLog NEWS README.NFS %changelog +* Tue Apr 27 2021 Silvan Calarco 2.9.9-4mamba +- rebuilt in /usr instead of / + * Thu Dec 03 2020 Silvan Calarco 2.9.9-3mamba - added patch for aarch64; remove initscript