diff --git a/libnfsidmap.spec b/libnfsidmap.spec index 83d38f0..56e5f5c 100644 --- a/libnfsidmap.spec +++ b/libnfsidmap.spec @@ -1,5 +1,3 @@ -%define _root_libdir /%{_lib} - Summary: NFSv4 User and Group ID Mapping Library Name: libnfsidmap Version: 0.24 @@ -22,6 +20,7 @@ BuildRequires: automake, libtool Requires(postun): /sbin/ldconfig Requires(pre): /sbin/ldconfig Requires: openldap +Conflicts: filesystem < 3 %description Library that handles mapping between names and ids for NFSv4. @@ -43,13 +42,13 @@ developing programs which use the libnfsidmap library. %build ./autogen.sh -%configure --disable-static --with-pluginpath=%{_root_libdir}/%name +%configure --disable-static --with-pluginpath=%{_libdir}/%name make %{?_smp_mflags} all %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} \ - libdir=%{_root_libdir} pkgconfigdir=%{_libdir}/pkgconfig + libdir=%{_libdir} pkgconfigdir=%{_libdir}/pkgconfig mkdir -p %{buildroot}/%{_docdir} mkdir -p %{buildroot}%{_sysconfdir} @@ -58,8 +57,8 @@ mkdir -p %{buildroot}%{_mandir}/man5 install -m 644 idmapd.conf %{buildroot}%{_sysconfdir}/idmapd.conf # Delete unneeded libtool libs -rm -rf %{buildroot}%{_root_libdir}/*.{a,la} -rm -rf %{buildroot}%{_root_libdir}/%{name}/*.{a,la} +rm -rf %{buildroot}%{_libdir}/*.{a,la} +rm -rf %{buildroot}%{_libdir}/%{name}/*.{a,la} %post -p /sbin/ldconfig @@ -73,8 +72,8 @@ rm -rf %{buildroot} %dir %{_docdir} %config(noreplace) %{_sysconfdir}/idmapd.conf -%{_root_libdir}/*.so.* -%{_root_libdir}/%{name}/*.so +%{_libdir}/*.so.* +%{_libdir}/%{name}/*.so %{_mandir}/*/* %doc AUTHORS ChangeLog NEWS README COPYING @@ -82,7 +81,7 @@ rm -rf %{buildroot} %defattr(0644,root,root,755) %{_libdir}/pkgconfig/libnfsidmap.pc %{_includedir}/nfsidmap.h -%{_root_libdir}/*.so +%{_libdir}/*.so %changelog * Mon Nov 14 2011 Steve Dickson 0.24-7