SPECS (AC-branch): snort.spec - snort-pwd.patch removed, fixed __m...

[mguevara]

Author: mguevara                     Date: Wed Jun  6 19:03:15 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- snort-pwd.patch removed, fixed __make to -j1

---- Files affected:
SPECS:
   snort.spec (1.137.2.5 -> 1.137.2.6) 

---- Diffs:

================================================================
Index: SPECS/snort.spec
diff -u SPECS/snort.spec:1.137.2.5 SPECS/snort.spec:1.137.2.6
--- SPECS/snort.spec:1.137.2.5	Wed Jun  6 10:16:48 2007
+++ SPECS/snort.spec	Wed Jun  6 21:03:10 2007
@@ -42,7 +42,6 @@
 Patch1:		%{name}-lib64.patch
 # http://www.bleedingsnort.com/staticpages/index.php?page=snort-clamav
 Patch2:		%{name}-2.6.0.2-clamav.diff
-Patch3:		%{name}-pwd.patch
 URL:		http://www.snort.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -78,6 +77,9 @@
 %define		_sysconfdir	/etc/snort
 %define		_bindir		%{_sbindir}
 
+# 'make -jn' where n > 1 is broken for dynamic-preprocessors part of snort
+%define		__make		/usr/bin/make -j1
+
 %description
 Snort is an open source network intrusion detection system, capable of
 performing real-time traffic analysis and packet logging on IP
@@ -157,7 +159,6 @@
 %patch1 -p1
 %endif
 %{?with_clamav:%patch2 -p1}
-%patch3 -p1
 
 # some snort.conf tweaks for out of the box expirience
 #
@@ -202,8 +203,7 @@
 	%{?with_prelude:--enable-prelude } \
 	%{?with_clamav:--enable-clamav --with-clamav-defdir=/var/lib/clamav}
 
-%{__make} \
-	PWD_HACK="$RPM_BUILD_ROOT/usr/lib/snort_dynamicengine"
+%{__make} 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -216,8 +216,7 @@
 	$RPM_BUILD_ROOT/usr/src/snort_dynamicsrc
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	PWD_HACK="$RPM_BUILD_ROOT/usr/lib/snort_dynamicengine"
+	DESTDIR=$RPM_BUILD_ROOT 
 
 install etc/*.config	$RPM_BUILD_ROOT%{_sysconfdir}
 install etc/unicode.map	$RPM_BUILD_ROOT%{_sysconfdir}
@@ -298,6 +297,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.137.2.6  2007/06/06 19:03:10  mguevara
+- snort-pwd.patch removed, fixed __make to -j1
+
 Revision 1.137.2.5  2007/06/06 08:16:48  mguevara
 - 2.6.1.5-1
 - added snort-pwd.patch for builders which do not pass PWD to a build
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/snort.spec?r1=1.137.2.5&r2=1.137.2.6&f=u