diff --git a/.cvsignore b/.cvsignore index 21baf80..d5afd40 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fuse-2.6.5.tar.gz +fuse-2.7.0.tar.gz diff --git a/fuse.spec b/fuse.spec index 419c188..8de2fde 100644 --- a/fuse.spec +++ b/fuse.spec @@ -1,5 +1,5 @@ Name: fuse -Version: 2.6.5 +Version: 2.7.0 Release: 2%{?dist} Summary: File System in Userspace (FUSE) utilities @@ -60,9 +60,12 @@ sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in cp %{SOURCE3} README.fedora %build +# Can't pass --disable-static here, or else the utils don't build %configure \ - --disable-static \ - --disable-kernel-module + --disable-kernel-module \ + --libdir=/%{_lib} \ + --bindir=/bin \ + --exec-prefix=/ make %{?_smp_mflags} @@ -74,8 +77,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99-fuse.nodes install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse # change from 4755 to 0755 to allow stripping -- fixed later in files -chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount +chmod 0755 $RPM_BUILD_ROOT/bin/fusermount +# Get rid of static libs +rm -f $RPM_BUILD_ROOT/%{_lib}/*.a %clean rm -rf $RPM_BUILD_ROOT @@ -102,8 +107,8 @@ fi %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora /sbin/mount.fuse -%attr(4754,root,fuse) %{_bindir}/fusermount -%{_bindir}/ulockmgr_server +%attr(4754,root,fuse) /bin/fusermount +/bin/ulockmgr_server %{_sysconfdir}/init.d/fuse %{_sysconfdir}/makedev.d/z-fuse %config %{_sysconfdir}/udev/rules.d/99-fuse.rules @@ -112,19 +117,29 @@ fi %files libs %defattr(-,root,root,-) %doc COPYING.LIB -%{_libdir}/libfuse.so.* -%{_libdir}/libulockmgr.so.* +/%{_lib}/libfuse.so.* +/%{_lib}/libulockmgr.so.* %files devel %defattr(-,root,root,-) -%{_libdir}/libfuse.so -%{_libdir}/libulockmgr.so -%{_libdir}/pkgconfig/*.pc +/%{_lib}/libfuse.so +/%{_lib}/libulockmgr.so +/%{_lib}/pkgconfig/*.pc %{_includedir}/fuse.h %{_includedir}/ulockmgr.h %{_includedir}/fuse %changelog +* Sat Jul 21 2007 Tom "spot" Callaway 2.7.0-2 +- redefine exec_prefix to / +- redefine bindir to /bin +- redefine libdir to %%{_lib} +- don't pass --disable-static to configure +- manually rm generated static libs + +* Wed Jul 18 2007 Peter Lemenkov 2.7.0-1 +- Version 2.7.0 +- Redefined exec_prefix due to demands from NTFS-3G * Wed Jun 6 2007 Peter Lemenkov 2.6.5-2 - Add BR libselinux-devel (bug #235145) diff --git a/sources b/sources index ba39e6f..b588272 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -66bd30503df55a87b9868835ca5a45bc fuse-2.6.5.tar.gz +7c3d52f81816e3a8e0cc2b5822a37e86 fuse-2.7.0.tar.gz