diff --git a/nilfs-utils.spec b/nilfs-utils.spec index 6b98133..08f7652 100644 --- a/nilfs-utils.spec +++ b/nilfs-utils.spec @@ -1,6 +1,3 @@ -%global _root_libdir /%{_lib} -%global _root_sbindir /sbin - Name: nilfs-utils Version: 2.0.23 Release: 1%{?dist} @@ -9,6 +6,7 @@ Summary: Utilities for managing NILFS v2 filesystems Group: System Environment/Base License: GPLv2+ URL: http://www.nilfs.org +Conflicts: filesystem < 3 Source0: http://www.nilfs.org/download/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libuuid-devel @@ -34,7 +32,7 @@ also want to install nilfs-utils. %build # geez, make install is trying to run ldconfig on the system -%configure LDCONFIG=/bin/true --disable-static --libdir %{_root_libdir} +%configure LDCONFIG=/bin/true --disable-static sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} @@ -42,7 +40,11 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT/%{_root_libdir}/libnilfs.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/libnilfs.la + +# configure is broken and has a static: AC_SUBST([sbindir], [/sbin]) +mkdir -p %{buildroot}%{_sbindir} +mv -f %{buildroot}/sbin/* %{buildroot}%{_sbindir}/ || : %clean rm -rf $RPM_BUILD_ROOT @@ -55,11 +57,11 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING ChangeLog %config(noreplace) /etc/nilfs_cleanerd.conf -%{_root_sbindir}/mkfs.nilfs2 -%{_root_sbindir}/mount.nilfs2 -%{_root_sbindir}/nilfs_cleanerd -%{_root_sbindir}/umount.nilfs2 -%{_root_sbindir}/nilfs-tune +%{_sbindir}/mkfs.nilfs2 +%{_sbindir}/mount.nilfs2 +%{_sbindir}/nilfs_cleanerd +%{_sbindir}/umount.nilfs2 +%{_sbindir}/nilfs-tune %{_bindir}/chcp %{_bindir}/dumpseg %{_bindir}/lscp @@ -79,11 +81,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/rmcp.8.gz %{_mandir}/man8/umount.nilfs2.8.gz %{_mandir}/man8/nilfs-tune.8.gz -%{_root_libdir}/libnilfs.so.* +%{_libdir}/libnilfs.so.* %files devel %defattr(-,root,root,-) -%{_root_libdir}/libnilfs.so +%{_libdir}/libnilfs.so %{_includedir}/nilfs.h %{_includedir}/nilfs2_fs.h