rpms/bro/devel bro-20080804-configure-opt-check.patch, NONE, 1.1 bro.spec, 1.1, 1.2

[Daniel Kopeček]

Author: mildew

Update of /cvs/pkgs/rpms/bro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10979

Modified Files:
	bro.spec 
Added Files:
	bro-20080804-configure-opt-check.patch 
Log Message:
Update to 1.4-0.2.20080804svn

bro-20080804-configure-opt-check.patch:

--- NEW FILE bro-20080804-configure-opt-check.patch ---
acinclude.m4 (AC_LBL_ENABLE_CHECK): Adapt for --enable-option-checking
introduced in 2.62.

--- bro-20080804/acinclude.m4.orig	2006-04-23 07:55:10.000000000 +0200
+++ bro-20080804/acinclude.m4	2008-08-26 16:19:45.000000000 +0200
@@ -190,9 +190,7 @@
 	sed -n -e 's/^enable_\([[^=]]*\)=[[^=]]*$/\1/p' |
 	while read var; do
 	    ok=0
-        dnl change '-' to '_' 
-        simplified=`echo $1| sed -e 's/-/_/g'`
-        for o in $simplified; do
+            for o in option_checking m4_translit([$1], -, _); do
 		    if test "${o}" = "${var}" ; then
 			    ok=1
 			    break


Index: bro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bro/devel/bro.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bro.spec	25 Aug 2008 15:59:24 -0000	1.1
+++ bro.spec	26 Aug 2008 12:48:42 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Open-source, Unix-based Network Intrusion Detection System
 Name: bro
 Version: 1.4
-Release: 0.1.%{snapshot}svn%{?dist}
+Release: 0.2.%{snapshot}svn%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://bro-ids.org
@@ -18,6 +18,7 @@
 Source2: bro-%{snapshot}.rc
 Patch0: bro-%{snapshot}-installpolicy.patch
 Patch1: bro-%{snapshot}-configurein.patch
+Patch2: bro-20080804-configure-opt-check.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libpcap-devel openssl-devel zlib-devel ncurses-devel automake autoconf libtool flex bison file-devel bind-devel
@@ -40,6 +41,7 @@
 %setup -q -n %{name}-%{snapshot}
 %patch0 -p1 -b .installpolicy
 %patch1 -p1 -b .configurein
+%patch2 -p1 -b .optcheck
 
 %build
 ./autogen.sh
@@ -113,5 +115,10 @@
 %{_localstatedir}/lib/bro
 
 %changelog
+
+* Tue Aug 26 2008 Daniel Kopecek <dkopecek at redhat.com> - 1.4-0.2.20080804svn
+- Added patch to prevent collision with the internal
+  variable in Autoconf 2.62. Thanks to skasal at redhat.com.
+
 * Wed May  7 2008 Daniel Kopecek <dkopecek at redhat.com> - 1.4-0.1.20080804svn
 - Initial build.