From 1afc2eee2b361362f40b69e73d21e0584c601570 Mon Sep 17 00:00:00 2001
From: Steve Beattie <steve@nxnw.org>
Date: Fri, 23 Mar 2007 20:48:29 +0000
Subject: [PATCH] Add build dependency on g++ compiler Pass on extra warning
 flags to pcre lib. No need for recursive delete on the libstdc++ line.

---
 parser/Makefile                | 4 ++--
 parser/apparmor-parser.spec.in | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/parser/Makefile b/parser/Makefile
index 290326a9d..17c652ee5 100644
--- a/parser/Makefile
+++ b/parser/Makefile
@@ -186,7 +186,7 @@ $(AAREOBJECTS):
 
 .SILENT: $(PCREOBJECTS)
 $(PCREOBJECTS):
-	make -C $(PCREDIR) "CFLAGS=$(CFLAGS)"
+	make -C $(PCREDIR) "CFLAGS=$(EXTRA_CFLAGS)"
 
 .PHONY: install-rhel4
 install-rhel4: install-redhat
@@ -239,7 +239,7 @@ clean:
 	rm -f $(YACC_C_FILES)
 	rm -f parser_version.h
 	rm -f $(NAME)*.tar.gz $(NAME)*.tgz
-	rm -rf libstdc++.a
+	rm -f libstdc++.a
 	make -s -C $(PCREDIR) clean
 	make -s -C $(AAREDIR) clean
 	make -s -C po clean
diff --git a/parser/apparmor-parser.spec.in b/parser/apparmor-parser.spec.in
index 5a3963e24..40104d400 100644
--- a/parser/apparmor-parser.spec.in
+++ b/parser/apparmor-parser.spec.in
@@ -44,6 +44,7 @@ Prereq: sed
 %if %{distro} == "suse"
 Prereq: %{insserv_prereq} aaa_base
 %endif
+BuildRequires: gcc-c++
 Obsoletes: subdomain_parser subdomain-parser
 Obsoletes: subdomain-parser-demo subdomain-parser-common subdomain-leaf-cert
 Obsoletes: libimnxcert
@@ -148,6 +149,9 @@ fi
 %endif
 
 %changelog
+* Fri Mar 23 2007 - sbeattie@suse.de
+- Added dfa matching code
+- add build dep on c++ compiler
 * Thu Jan 18 2007 - sbeattie@suse.de
 - Remove long obsolete editing of fstab
 * Tue Dec 12 2006 - sbeattie@suse.de