rpms/denyhosts/devel denyhosts-2.2-daemon-control.patch, 1.1, 1.2 denyhosts.spec, 1.30, 1.31

[Jason Tibbitts (tibbs)]

Author: tibbs

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

Modified Files:
	denyhosts-2.2-daemon-control.patch denyhosts.spec 
Log Message:
* Fri Mar 31 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-5
- Revert renaming of the denyhosts.py script


denyhosts-2.2-daemon-control.patch:

Index: denyhosts-2.2-daemon-control.patch
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts-2.2-daemon-control.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- denyhosts-2.2-daemon-control.patch	31 Mar 2006 02:59:32 -0000	1.1
+++ denyhosts-2.2-daemon-control.patch	31 Mar 2006 19:47:01 -0000	1.2
@@ -1,23 +1,11 @@
 --- daemon-control-dist.daemon-control	2006-02-07 21:37:51.000000000 -0600
-+++ daemon-control-dist	2006-03-30 19:49:23.200435174 -0600
-@@ -11,9 +11,9 @@
- #### Edit these to suit your configuration ####
- ###############################################
++++ daemon-control-dist	2006-03-31 11:14:51.816095607 -0600
+@@ -13,7 +13,7 @@
  
--DENYHOSTS_BIN   = "/usr/bin/denyhosts.py"
-+DENYHOSTS_BIN   = "/usr/bin/denyhosts"
+ DENYHOSTS_BIN   = "/usr/bin/denyhosts.py"
  DENYHOSTS_LOCK  = "/var/lock/subsys/denyhosts"
 -DENYHOSTS_CFG   = "/usr/share/denyhosts/denyhosts.cfg"
 +DENYHOSTS_CFG   = "/etc/denyhosts.conf"
  
  
  ###############################################
-@@ -35,7 +35,7 @@
-     print "Usage: %s {start [args...] | stop | restart [args...] | status | debug | condrestart [args...] }" % sys.argv[0]
-     print
-     print "For a list of valid 'args' refer to:"
--    print "$ denyhosts.py --help"
-+    print "$ denyhosts --help"
-     print
-     sys.exit(0) 
- 


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- denyhosts.spec	31 Mar 2006 16:28:27 -0000	1.30
+++ denyhosts.spec	31 Mar 2006 19:47:01 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        2.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -85,9 +85,11 @@
   touch %{buildroot}/%{_localstatedir}/lib/denyhosts/$i
 done
 
-# RPM will byte-compile this for us if we leave the .py extension.  It
-# looks cleaner without it, so we'll rename it.
-mv %{buildroot}/%{_bindir}/denyhosts.py %{buildroot}/%{_bindir}/denyhosts
+# FC-4 and earlier won't create these automatically; create them here
+# so that the %exclude below doesn't fail
+touch %{buildroot}/%{_bindir}/denyhosts.pyc
+touch %{buildroot}/%{_bindir}/denyhosts.pyo
+
 
 %clean
 rm -rf %{buildroot}
@@ -114,7 +116,8 @@
 %doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt
 %doc README.fedora README.txt setup.py README.contrib
 
-%{_bindir}/denyhosts
+%{_bindir}/denyhosts.py
+%exclude %{_bindir}/denyhosts.py[co]
 
 %{_bindir}/denyhosts-control
 %{_datadir}/denyhosts
@@ -147,6 +150,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-5
+- Revert renaming of the denyhosts.py script
+
 * Fri Mar 31 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-4
 - Fix permissions on plugins.