- adapter (kill dozen trailing spaces, people should stop copying stuff with mouse)

- fix scriptlets to work as expected (add config on initial install, remove on removal, not on each upgrade)
- use sed for in place replace, not perl

Changed files:
    emergingthreats.spec -> 1.2

diff --git a/emergingthreats.spec b/emergingthreats.spec
index 188cb174c9487155d46487a3a5298c166c0815e9..e6c3dd3381ae02f0b1074a360dcced7f74a2a3a2 100644 (file)
--- a/emergingthreats.spec
+++ b/emergingthreats.spec
@@ -1,4 +1,3 @@
-
 Summary:       Emerging Threats open rules for Snort IDS/IPS
 Name:          emergingthreats
 Version:       6947
@@ -8,45 +7,46 @@ Group:                Networking
 Source0:       http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz
 # Source0-md5: 38db422a5b87375c25b8714f42dc8670
 URL:           http://emergingthreats.net/
+Requires:      sed >= 4.0
 Requires:      snort >= 2.9.0
-Requires:      perl-base
 Provides:      snort-rules
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _sysconfdir     /etc/snort
+
 %description
 Emerging Threats open rules for Snort IDS/IPS.
 
 %prep
 %setup -qn rules
 
-%build
-
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/snort/rules
-install emerging.conf          $RPM_BUILD_ROOT%{_sysconfdir}/snort
-install emerging-*.rules       $RPM_BUILD_ROOT%{_sysconfdir}/snort/rules
-install classification.config  $RPM_BUILD_ROOT%{_sysconfdir}/snort/rules
-install reference.config       $RPM_BUILD_ROOT%{_sysconfdir}/snort/rules
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/rules
+cp -p emerging.conf            $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p emerging-*.rules $RPM_BUILD_ROOT%{_sysconfdir}/rules
+cp -p classification.config    $RPM_BUILD_ROOT%{_sysconfdir}/rules
+cp -p reference.config $RPM_BUILD_ROOT%{_sysconfdir}/rules
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-
 %post
-[ -f /etc/snort/snort.conf ] \
-       && /bin/echo "include emerging.conf" >> /etc/snort/snort.conf
-%service snortd start
-
-%preun
-/usr/bin/perl -i.et_orig -pe 's/^\s*include\s+emerging.conf.*$//' /etc/snort/snort.conf
+if [ "$1" = "1" ]; then
+       if [ -f %{_sysconfdir}/snort.conf ]; then
+               echo "include emerging.conf" >> %{_sysconfdir}/snort.conf
+       fi
+fi
+%service -q snortd restart
 
 %postun
-%service snortd start
+if [ "$1" = "0" ]; then
+       %{__sed} -i -re 's/^\s*include\s+emerging.conf.*$//' %{_sysconfdir}/snort.conf
+       %service -q snortd restart
+fi
 
 %files
 %defattr(644,root,root,755)
 %doc LICENSE BSD-License.txt snort-2.9.0-open.txt gpl-2.0.txt compromised-ips.txt rbn-ips.txt rbn-malvertisers-ips.txt
-%attr(640,root,snort) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/snort/emerging.conf
-%attr(640,root,snort) %{_sysconfdir}/snort/rules/*
+%attr(640,root,snort) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/emerging.conf
+%attr(640,root,snort) %{_sysconfdir}/rules/*