- fix building with bison 3.0

diff --git a/apparmor-parser.spec b/apparmor-parser.spec
index dc456ecf04913784a7fd3f2ee9aee6855a81381a..947df3233ca05ff6979bd05aa884434eeddf5a75 100644 (file)
--- a/apparmor-parser.spec
+++ b/apparmor-parser.spec
@@ -15,6 +15,7 @@ Source0:      http://launchpad.net/apparmor/2.8/%{version}/+download/apparmor-%{versi
 # Source0-md5: bcc6bb56630b007d4ea5c9affe9d750d
 Source1:       %{name}.init
 Patch0:                %{name}-pld.patch
+Patch1:                bison3.patch
 URL:           http://apparmor.wiki.kernel.org/
 BuildRequires: bison
 BuildRequires: flex
@@ -45,6 +46,7 @@ SubDomain.
 %prep
 %setup -q -n apparmor-%{version}
 %patch0 -p0
+%patch1 -p1
 
 %build
 %{__make} -j1 -C parser \

diff --git a/bison3.patch b/bison3.patch
new file mode 100644 (file)
index 0000000..54cfb3b
--- /dev/null
+++ b/bison3.patch
@@ -0,0 +1,10 @@
+--- apparmor-2.8.2/parser/libapparmor_re/parse.y~      2012-02-24 13:20:46.000000000 +0100
++++ apparmor-2.8.2/parser/libapparmor_re/parse.y       2013-11-04 21:52:32.975269560 +0100
+@@ -57,6 +56,7 @@
+ 
+ %pure-parser
+ /* %error-verbose */
++%lex-param {YYLEX_PARAM}
+ %parse-param {Node **root}
+ %parse-param {const char *text}
+ %name-prefix = "regex_"