[tcp_wrappers] fixed file placement errors

Viktor Hercinger herczy at fedoraproject.org
Fri Feb 8 14:21:21 UTC 2013


commit 6126a2421573d2e6a317d7b8da00eb2b8e76db97
Author: Viktor Hercinger <vhercing at redhat.com>
Date:   Fri Feb 8 15:09:30 2013 +0100

    fixed file placement errors

 tcp_wrappers.spec |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/tcp_wrappers.spec b/tcp_wrappers.spec
index 65a5862..23ec4db 100644
--- a/tcp_wrappers.spec
+++ b/tcp_wrappers.spec
@@ -1,7 +1,7 @@
 Summary: A security tool which acts as a wrapper for TCP daemons
 Name: tcp_wrappers
 Version: 7.6
-Release: 71%{?dist}
+Release: 72%{?dist}
 
 %define LIB_MAJOR 0
 %define LIB_MINOR 7
@@ -108,7 +108,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}
 
@@ -117,9 +117,9 @@ install -p -m644 hosts_access.5 hosts_options.5 ${RPM_BUILD_ROOT}%{_mandir}/man5
 install -p -m644 tcpd.8 tcpdchk.8 tcpdmatch.8 safe_finger.8 try-from.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 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.a ${RPM_BUILD_ROOT}%{_libdirdir}
+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}
@@ -146,17 +146,20 @@ 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
+#%{_libdirdir}/*.a
+%{_libdir}/*.so
 %{_mandir}/man3/*
 
 %changelog
+* Mon Feb  8 2013 Viktor Hercinger <vhercing at redhat.com> - 7.6-72
+- Put binaries and libraries under /usr instead of root
+
 * Mon Jan 28 2013 Viktor Hercinger <vhercing at redhat.com> - 7.6-71
 - Updated to version with upstream IPv6 support
 


More information about the scm-commits mailing list