diff --git a/tcp_wrappers.spec b/tcp_wrappers.spec index 5a08434..3a33804 100644 --- a/tcp_wrappers.spec +++ b/tcp_wrappers.spec @@ -44,6 +44,7 @@ Patch28: tcp_wrappers-7.6-warnings.patch BuildRequires: glibc-devel >= 2.2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tcp_wrappers-libs = %{version}-%{release} +Conflicts: filesystem < 3 %description The tcp_wrappers package provides small daemon programs which can @@ -110,7 +111,7 @@ make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -D_REENTRANT -DHAVE_STRERROR" LDF %install rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}%{_includedir} -mkdir -p ${RPM_BUILD_ROOT}/%{_lib} +mkdir -p ${RPM_BUILD_ROOT}%{_libdir} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{3,5,8} mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} @@ -120,8 +121,8 @@ install -p -m644 tcpd.8 tcpdchk.8 tcpdmatch.8 safe_finger.8 try-from.8 ${RPM_BUI ln -sf hosts_access.5 ${RPM_BUILD_ROOT}%{_mandir}/man5/hosts.allow.5 ln -sf hosts_access.5 ${RPM_BUILD_ROOT}%{_mandir}/man5/hosts.deny.5 #cp -a libwrap.a ${RPM_BUILD_ROOT}%{_libdir} -cp -a libwrap.so* ${RPM_BUILD_ROOT}/%{_lib} -#install -p -m644 libwrap.so.0.7.6 ${RPM_BUILD_ROOT}/%{_lib} +cp -a libwrap.so* ${RPM_BUILD_ROOT}%{_libdir} +#install -p -m644 libwrap.so.0.7.6 ${RPM_BUILD_ROOT}%{_libdir} install -p -m644 tcpd.h ${RPM_BUILD_ROOT}%{_includedir} install -m755 safe_finger ${RPM_BUILD_ROOT}%{_sbindir} install -m755 tcpd ${RPM_BUILD_ROOT}%{_sbindir} @@ -148,14 +149,14 @@ rm -rf ${RPM_BUILD_ROOT} %files libs %defattr(-,root,root,-) %doc BLURB CHANGES README* DISCLAIMER Banners.Makefile -/%{_lib}/*.so.* +%{_libdir}/*.so.* %{_mandir}/man5/* %files devel %defattr(-,root,root,-) %{_includedir}/* #%{_libdir}/*.a -/%{_lib}/*.so +%{_libdir}/*.so %{_mandir}/man3/* %changelog