rpms/denyhosts/devel denyhosts.spec,1.22,1.23

[Jason Tibbitts (tibbs)]

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6874

Modified Files:
	denyhosts.spec 
Log Message:
* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-5
- Redo installation to match current Python packaging guidelines.



Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- denyhosts.spec	30 Jan 2006 22:15:56 -0000	1.22
+++ denyhosts.spec	30 Jan 2006 23:22:30 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        1.1.4
-release:	4%{?dist}
+release:	5%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -22,6 +22,9 @@
 BuildRequires:  python-devel
 Requires:       openssh-server
 
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+
 %description
 DenyHosts is a Python script that analyzes the sshd server log
 messages to determine which hosts are attempting to hack into your
@@ -41,15 +44,14 @@
 
 
 %build
-python ./setup.py build
+%{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install --root=$RPM_BUILD_ROOT --record=%{name}.files
+%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_bindir}
-
 install -d $RPM_BUILD_ROOT%{_initrddir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
@@ -73,7 +75,6 @@
   touch $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/$i
 done
 
-find $RPM_BUILD_ROOT -name \*.pyo -exec rm {} \;
 rm -f $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc
 
 
@@ -97,10 +98,17 @@
 exit 0
 
 
-%files -f %{name}.files
+%files
 %defattr(-,root,root,-)
 %doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt
 %doc README.fedora README.txt setup.py
+
+%{_bindir}/denyhosts.py
+%{_bindir}/denyhosts-control
+%{python_sitelib}/DenyHosts/*.py
+%{python_sitelib}/DenyHosts/*.pyc
+%ghost %{python_sitelib}/DenyHosts/*.pyo
+
 %config(noreplace) %{_sysconfdir}/denyhosts.conf
 %config(noreplace) %{_sysconfdir}/cron.d/denyhosts
 %config(noreplace) %{_sysconfdir}/logrotate.d/denyhosts
@@ -119,9 +127,13 @@
 %dir %{_localstatedir}/lib/denyhosts
 
 %{_initrddir}/denyhosts
-%{_bindir}/denyhosts-control
+
+
 
 %changelog
+* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-5
+- Redo installation to match current Python packaging guidelines.
+
 * Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-4
 - Simplify "[ -f ... ] && rm" to "rm -f".