diff --git a/cil-1.7.3-add-package-cilconfig.patch b/cil-1.7.3-add-package-cilconfig.patch new file mode 100644 index 0000000..f054e0b --- /dev/null +++ b/cil-1.7.3-add-package-cilconfig.patch @@ -0,0 +1,8 @@ +--- cil-1.7.3/lib/App/Cilly/CilConfig.pm.in.old 2014-06-19 10:41:10.532839228 +0100 ++++ cil-1.7.3/lib/App/Cilly/CilConfig.pm.in 2014-06-19 10:41:23.988830828 +0100 +@@ -1,3 +1,5 @@ ++package App::Cilly::CilConfig; ++ + $::cc = "@CC@"; + $::exeext = "@EXEEXT@"; + $::default_mode = "@DEFAULT_CIL_MODE@"; diff --git a/ocaml-cil.spec b/ocaml-cil.spec index 9decb83..010d916 100644 --- a/ocaml-cil.spec +++ b/ocaml-cil.spec @@ -2,7 +2,7 @@ Name: ocaml-cil Version: 1.7.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: CIL - Infrastructure for C Program Analysis and Transformation License: BSD @@ -22,6 +22,10 @@ Patch1: 0002-Do-not-fail-testsuite-on-new-gcc-behaviour.patch # Enable ocamlopt -g. Patch2: cil-1.7.3-enable-ocamlopt-g.patch +# Add package directive to App::Cilly::CilConfig so that perl +# dependencies are calculated properly. +Patch3: cil-1.7.3-add-package-cilconfig.patch + %description CIL (C Intermediate Language) is a high-level representation along with a set of tools that permit easy analysis and source-to-source @@ -102,6 +106,7 @@ for gcc. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build @@ -176,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jun 19 2014 Richard W.M. Jones - 1.7.3-6 +- Fix Perl broken dependencies. + * Thu Jun 12 2014 Richard W.M. Jones - 1.7.3-5 - Bump and rebuild to attempt to fix broken dependencies.