Author: tpg
Date: Tue Feb 13 12:32:52 2007
New Revision: 120338

Added:
   packages/cooker/fail2ban/current/SOURCES/fail2ban-0.7.7.tar.bz2   (contents, 
props changed)
Removed:
   packages/cooker/fail2ban/current/SOURCES/fail2ban-0.7.6.tar.bz2
   
packages/cooker/fail2ban/current/SOURCES/fail2ban-fix-client-module-path.patch
   packages/cooker/fail2ban/current/SOURCES/fail2ban-fix-regex-module-path.patch
   
packages/cooker/fail2ban/current/SOURCES/fail2ban-fix-server-module-path.patch
   
packages/cooker/fail2ban/current/SOURCES/fail2ban-fix-testcases-module-path.patch
   packages/cooker/fail2ban/current/SOURCES/fail2ban-setup-cfg.patch
Modified:
   packages/cooker/fail2ban/current/SPECS/fail2ban.spec

Log:
- new version
- provide better initscript
- drop patches
- spec file clean

Added: packages/cooker/fail2ban/current/SOURCES/fail2ban-0.7.7.tar.bz2
==============================================================================
Binary file. No diff available.

Modified: packages/cooker/fail2ban/current/SPECS/fail2ban.spec
==============================================================================
--- packages/cooker/fail2ban/current/SPECS/fail2ban.spec        (original)
+++ packages/cooker/fail2ban/current/SPECS/fail2ban.spec        Tue Feb 13 
12:32:52 2007
@@ -1,16 +1,12 @@
 Summary:       Ban IPs that make too many password failures
 Name:          fail2ban
-Version:       0.7.6
+Version:       0.7.7
 Release:       %mkrel 1
 License:       GPL
 Group:         System/Configuration/Networking
 URL:           http://fail2ban.sourceforge.net/
 Source0:       http://dl.sourceforge.net/fail2ban/%{name}-%{version}.tar.bz2
-Patch0:                %{name}-setup-cfg.patch
-Patch1:                %{name}-fix-client-module-path.patch
-Patch2:                %{name}-fix-regex-module-path.patch
-Patch3:                %{name}-fix-server-module-path.patch
-Patch4:                %{name}-fix-testcases-module-path.patch
+Source1:       %{name}-initscript
 Requires(pre): rpm-helper
 BuildRequires: python-devel
 Requires:      python          >= 2.5
@@ -28,27 +24,24 @@
 
 %prep
 
-%setup -q %{name}-%{version}
-%patch0 -p1 -b %{name}-setup-cfg.patch
-%patch1 -p1 -b %{name}-fix-client-module-path.patch
-%patch2 -p1 -b %{name}-fix-regex-module-path.patch
-%patch3 -p1 -b %{name}-fix-server-module-path.patch
-%patch4 -p1 -b %{name}-fix-testcases-module-path.patch
-
-cd man/
-sh generate-man
+%setup -q
 
 %build
 env CFLAGS="%{optflags}" python setup.py build 
 
+pushd man
+sh generate-man
+popd
+
 %install
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+
 python setup.py install --root=%{buildroot}
-install -d %{buildroot}/etc/rc.d/init.d
-install -d %{buildroot}/%{_mandir}
-install files/redhat-initd %{buildroot}/etc/rc.d/init.d/fail2ban
-install man/*.1 %{buildroot}%{_mandir}/
-mv %{buildroot}%{py_puresitedir}/%{name}/*-info %{buildroot}%{py_puresitedir}/
+
+install -d %{buildroot}/%{_mandir}/man1
+install man/*.1 %{buildroot}%{_mandir}/man1/
+install -D %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}
+
 %clean
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 
@@ -58,13 +51,10 @@
 %preun
 %_preun_service fail2ban
 
-%postun
-%_preun_service fail2ban
-
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG README TODO
-%attr(755,root,root) /etc/rc.d/init.d/%{name}
+%attr(744,root,root) %{_initrddir}/%{name}
 %attr(755,root,root) %{_bindir}/%{name}-*
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.conf
 %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/%{name}/action.d/*.conf
@@ -72,14 +62,12 @@
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/action.d
 %dir %{_sysconfdir}/%{name}/filter.d
-%dir %{py_puresitedir}/%{name}
-#%dir %{py_puresitedir}/%{name}/client
-#%dir %{py_puresitedir}/%{name}/server
-#%dir %{py_puresitedir}/%{name}/common
-%{py_puresitedir}/*-info
-%{py_puresitedir}/%{name}/*
-#client/*.py*
-#%{py_puresitedir}/%{name}/server/*.py*
-#%{py_puresitedir}/%{name}/common/*.py*
-#%{py_puresitedir}/%{name}/*-info
-%{_mandir}/%{name}*
\ No newline at end of file
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/client
+%dir %{_datadir}/%{name}/server
+%dir %{_datadir}/%{name}/common
+%{_datadir}/%{name}/client/*.py*
+%{_datadir}/%{name}/server/*.py*
+%{_datadir}/%{name}/common/*.py*
+%{_datadir}/%{name}/*-info
+%{_mandir}/man1/*

Reply via email to