diff --git a/glusterfs.spec b/glusterfs.spec index e5b9d66..b4a6ad0 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -106,6 +106,7 @@ Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-client < 3.1.0 Provides: %{name}-client = %{version}-%{release} +Conflicts: filesystem < 3 %description fuse GlusterFS is a clustered file-system capable of scaling to several @@ -171,7 +172,8 @@ This package provides the development libraries. %setup -q %build -%configure %{?_without_rdma} %{?_without_epoll} %{?_with_fusermount} +%configure %{?_without_rdma} %{?_without_epoll} %{?_with_fusermount} \ + --with-mountutildir=%{_sbindir} # Remove rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -250,7 +252,7 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha # Install wrapper umount script %{__install} -D -p -m 0755 %{SOURCE3} \ - %{buildroot}/sbin/umount.glusterfs + %{buildroot}/%{_sbindir}/umount.glusterfs # Client logrotate entry %{__install} -D -p -m 0644 %{SOURCE4} \ %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs-fuse @@ -298,8 +300,8 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs-fuse %{_libdir}/glusterfs/%{version}/xlator/mount/fuse* %{_mandir}/man8/mount.glusterfs.8* -/sbin/mount.glusterfs -/sbin/umount.glusterfs +%{_sbindir}/mount.glusterfs +%{_sbindir}/umount.glusterfs %if 0%{?_with_fusermount:1} %{_bindir}/fusermount-glusterfs %endif @@ -357,7 +359,7 @@ if [ $1 -ge 1 ]; then fi %changelog -* Web Nov 2 2011 Kaleb S. KEITHLEY - 3.2.4-2 +* Wed Nov 2 2011 Kaleb S. KEITHLEY - 3.2.4-2 - Convert init.d to systemd for f17 and later * Fri Sep 30 2011 Kaleb S. KEITHLEY - 3.2.4-1