dist-git conversion

.gitignore

@@ -1 +1 @@
-/cil-*.tar.gz
+cil-1.3.7.tar.gz

0001-Fix-testsuite-on-32-bit-machines.patch

@@ -1,33 +0,0 @@
-From: Gabriel Kerneis <gabriel@kerneis.info>
-Date: Thu, 29 Aug 2013 09:30:23 +0100
-Subject: Fix testsuite on 32-bit machines
-
----
- test/small1/arrsize.c |    2 +-
- test/testcil.pl       |    1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/test/small1/arrsize.c b/test/small1/arrsize.c
-index 6da8d0a..718b948 100755
---- a/test/small1/arrsize.c
-+++ b/test/small1/arrsize.c
-@@ -1,6 +1,6 @@
- #include "testharness.h"
- 
--#define MAXINT (1ull << ((8 * sizeof(int)) - 1))
-+#define MAXINT (1ull << ((8 * sizeof(int)) - 2))
- 
- int g1[ MAXINT / sizeof(int)  ];
- char g2[ MAXINT / sizeof(char) ];
-diff --git a/test/testcil.pl b/test/testcil.pl
-index 778dfa7..dd814ed 100644
---- a/test/testcil.pl
-+++ b/test/testcil.pl
-@@ -569,6 +569,7 @@ addTest("merge-ar ");
- addTest("testrun/sizeof1");
- addTest("testrun/sizeof2");
- addTest("test/sizeof3");
-+addBadComment("test/sizeof3", "Bug. Constant-folding of very large arrays does not work on 32-bit machines.");
- addTest("test/outofmem ");
- addTest("testrun/builtin ");
- addTest("test/builtin2 ");

0002-Do-not-fail-testsuite-on-new-gcc-behaviour.patch

@@ -1,27 +0,0 @@
-From: Gabriel Kerneis <gabriel@kerneis.info>
-Date: Thu, 29 Aug 2013 10:36:20 +0100
-Subject: Do not fail testsuite on new gcc behaviour
-
-Sometime between gcc 4.4 and gcc 4.7, the behaviour
-of function attributes has changed such that
-test/small2/regparm0.c does not compile anymore on 32-bit.
-This is actually a good thing, since the previous behaviour
-was quite confusing (although supported by CIL).
----
- test/testcil.pl |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/test/testcil.pl b/test/testcil.pl
-index dd814ed..560430a 100644
---- a/test/testcil.pl
-+++ b/test/testcil.pl
-@@ -620,7 +620,8 @@ addTest("scott/open $gcc");
- addTest("scott/constfold");
- addTest("scott/mode_sizes $gcc");       # mode(__QI__) stuff
- addTest("scott-nolink/brlock $gcc");
--addTest("scott/regparm0 $gcc");         # this works, unfortunately... but the bug has been fixed nonetheless
-+addTest("scott/regparm0 $gcc");         # this used to work, unfortunately...  but the bug has been fixed in CIL (and now gcc)
-+addBadComment("scott/regparm0", "Notbug. Not a bug if fails with gcc >= 4.7 on i386");
- addTest("scott/unscomp");               # kernel/fs/buffer.c
- addTest("scott/thing");
- 

cil-1.3.7-output-obj.patch

@@ -0,0 +1,14 @@
+diff -ur cil-1.3.7.orig/Makefile.in cil-1.3.7/Makefile.in
+--- cil-1.3.7.orig/Makefile.in	2009-04-24 19:50:33.000000000 +0100
++++ cil-1.3.7/Makefile.in	2009-05-26 15:46:02.932947721 +0100
+@@ -287,7 +287,9 @@
+ ifeq ($(NATIVECAML),1)
+ $(OBJDIR)/libcil.o: $(OCAML_CIL_LIB_CMODULES:%=$(OBJDIR)/lib%.a) \
+                     $(OCAML_CIL_LIB_MODULES:%=$(OBJDIR)/%.$(CMO))
+-	ocamlopt -output-obj -o $@ $(CILLY_LIBS:%=%.cmxa) $^
++	ocamlopt -output-obj -o tmpcil.o $(CILLY_LIBS:%=%.cmxa) $^
++	ar rcs $@ tmpcil.o
++	rm -f tmpcil.o
+ else
+ $(OBJDIR)/libcil.o:
+ 	@echo "Can only build $@ when NATIVECAML is 1."

cil-1.7.3-Fix-unescaped-left-brace-in-regex.patch

@@ -1,21 +0,0 @@
-diff -up cil-1.7.3/doc/cilcode.pl.orig cil-1.7.3/doc/cilcode.pl
---- cil-1.7.3/doc/cilcode.pl.orig	2017-05-22 15:52:31.539144084 +0200
-+++ cil-1.7.3/doc/cilcode.pl	2017-05-22 15:53:22.750818950 +0200
-@@ -45,7 +45,7 @@ binmode STDOUT;
- my $lineno = 0;
- while(<>) {
-     $lineno ++;
--    if(! $incode && $_ =~ m|^\\begin{cilcode}\[(.*)\](.*)$|) {
-+    if(! $incode && $_ =~ m|^\\begin\{cilcode}\[(.*)\](.*)$|) {
-         $opt = $1;
-         $cil_options = $2;
-         $incode = 1;
-@@ -60,7 +60,7 @@ while(<>) {
-         print "\\begin{code}\n";
-         next;
-     }
--    if($incode && $_ =~ m|^\\end{cilcode}$|) {
-+    if($incode && $_ =~ m|^\\end\{cilcode}$|) {
-         $incode = 0;
-         if($opt eq 'local') {
-             print TSTSRC $postambleLocal;

cil-1.7.3-add-package-cilconfig.patch

@@ -1,8 +0,0 @@
---- 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@";

cil-1.7.3-bytecode-compilation.patch

@@ -1,11 +0,0 @@
---- cil-1.7.3/myocamlbuild.ml.orig	2015-07-20 12:56:57.224597528 +0100
-+++ cil-1.7.3/myocamlbuild.ml	2015-07-20 12:57:04.742605963 +0100
-@@ -8,7 +8,7 @@
-   let dirs = include_dirs_of (dirname mllib) in
-   let modules = string_list_of_file mllib in
-   let make_candidates m =
--    List.map (expand_module dirs m) [["cmi"]; ["cmx"]; ["mli"; "inferred.mli"]] in
-+    List.map (expand_module dirs m) [["cmi"]; ["cmo"]; ["mli"; "inferred.mli"]] in
-   let dependencies = List.flatten (List.map make_candidates modules) in
-   let build_result = builder dependencies in
-   let built_files = List.filter_opt

cil-1.7.3-enable-ocamlopt-g.patch

@@ -1,7 +0,0 @@
---- cil-1.7.3/_tags~	2013-07-24 16:07:11.000000000 +0100
-+++ cil-1.7.3/_tags	2013-09-14 16:23:32.520889558 +0100
-@@ -4,3 +4,4 @@
- "test": not_hygienic
- # build every cmo in debug mode (for cil.cma)
- <**/*.cmo>: debug
-+true: debug

cil-1.7.3-gcc-7.patch

@@ -1,11 +0,0 @@
---- cil-1.7.3/lib/App/Cilly.pm.in	2013-07-24 16:07:11.000000000 +0100
-+++ cil-1.7.3.new/lib/App/Cilly.pm.in	2017-02-14 13:02:52.517194526 +0000
-@@ -2220,7 +2220,7 @@
-          . join(' ', @{$self->{PPARGS}}) ." |") 
-         || die "Cannot start GNUCC";
-     while(<VER>) {
--        if($_ =~ m|^(\d+\S+)| || $_ =~ m|^(egcs-\d+\S+)|) {
-+        if($_ =~ m|^(\d+\S+)| || $_ =~ m|^(\d+)$| || $_ =~ m|^(egcs-\d+\S+)|) {
-             $cversion = "gcc_$1";
-             close(VER) || die "Cannot start GNUCC\n";
-             $self->{CVERSION} = $cversion;

cil-1.7.3-safe-string.patch

@@ -1,120 +0,0 @@
-diff -ur cil-1.7.3.old/ocamlutil/errormsg.ml cil-1.7.3/ocamlutil/errormsg.ml
---- cil-1.7.3.old/ocamlutil/errormsg.ml	2013-07-24 16:07:11.000000000 +0100
-+++ cil-1.7.3/ocamlutil/errormsg.ml	2017-11-22 14:55:09.549734942 +0000
-@@ -210,23 +210,24 @@
-   let str1 = 
-     if str <> "" && String.get str 0 = '"' (* '"' ( *) 
-     then rem_quotes str else str in
--  let l = String.length str1 in
-+  let str1 = Bytes.of_string str1 in
-+  let l = Bytes.length str1 in
-   let rec loop (copyto: int) (i: int) = 
-     if i >= l then 
--      String.sub str1 0 copyto
-+      Bytes.sub str1 0 copyto
-      else 
--       let c = String.get str1 i in
-+       let c = Bytes.get str1 i in
-        if c <> '\\' then begin
--          String.set str1 copyto c; loop (copyto + 1) (i + 1)
-+          Bytes.set str1 copyto c; loop (copyto + 1) (i + 1)
-        end else begin
--          String.set str1 copyto '/';
--          if i < l - 2 && String.get str1 (i + 1) = '\\' then
-+          Bytes.set str1 copyto '/';
-+          if i < l - 2 && Bytes.get str1 (i + 1) = '\\' then
-               loop (copyto + 1) (i + 2)
-           else 
-               loop (copyto + 1) (i + 1)
-        end
-   in
--  loop 0 0
-+  Bytes.to_string (loop 0 0)
- 
- let readingFromStdin = ref false
- 
-diff -ur cil-1.7.3.old/ocamlutil/pretty.ml cil-1.7.3/ocamlutil/pretty.ml
---- cil-1.7.3.old/ocamlutil/pretty.ml	2017-11-22 13:17:54.112327112 +0000
-+++ cil-1.7.3/ocamlutil/pretty.ml	2017-11-22 14:56:24.658729757 +0000
-@@ -725,8 +725,9 @@
-               invalid_arg ("dprintf: unimplemented format " 
- 			   ^ (String.sub format i (j-i+1)));
- 	    let j' = succ j in (* eat the d,i,x etc. *)
--	    let format_spec = "% " in
--	    String.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *)
-+	    let format_spec = Bytes.of_string "% " in
-+	    Bytes.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *)
-+            let format_spec = Bytes.to_string format_spec in
-             Obj.magic(fun n ->
-               collect (dctext1 acc
-                          (Int64.format format_spec n))
-@@ -735,8 +736,9 @@
- 	    if j != i + 1 then invalid_arg ("dprintf: unimplemented format " 
- 					    ^ (String.sub format i (j-i+1)));
- 	    let j' = succ j in (* eat the d,i,x etc. *)
--	    let format_spec = "% " in
--	    String.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *)
-+	    let format_spec = Bytes.of_string "% " in
-+	    Bytes.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *)
-+            let format_spec = Bytes.to_string format_spec in
-             Obj.magic(fun n ->
-               collect (dctext1 acc
-                          (Int32.format format_spec n))
-@@ -745,8 +747,9 @@
- 	    if j != i + 1 then invalid_arg ("dprintf: unimplemented format " 
- 					    ^ (String.sub format i (j-i+1)));
- 	    let j' = succ j in (* eat the d,i,x etc. *)
--	    let format_spec = "% " in
--	    String.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *)
-+	    let format_spec = Bytes.of_string "% " in
-+	    Bytes.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *)
-+            let format_spec = Bytes.to_string format_spec in
-             Obj.magic(fun n ->
-               collect (dctext1 acc
-                          (Nativeint.format format_spec n))
-diff -ur cil-1.7.3.old/src/cil.ml cil-1.7.3/src/cil.ml
---- cil-1.7.3.old/src/cil.ml	2013-07-24 16:07:11.000000000 +0100
-+++ cil-1.7.3/src/cil.ml	2017-11-22 14:53:42.922740924 +0000
-@@ -5033,19 +5033,19 @@
- (* Take the name of a file and make a valid symbol name out of it. There are 
-  * a few characters that are not valid in symbols *)
- let makeValidSymbolName (s: string) = 
--  let s = String.copy s in (* So that we can update in place *)
--  let l = String.length s in
-+  let s = Bytes.of_string s in (* So that we can update in place *)
-+  let l = Bytes.length s in
-   for i = 0 to l - 1 do
--    let c = String.get s i in
-+    let c = Bytes.get s i in
-     let isinvalid = 
-       match c with
-         '-' | '.' -> true
-       | _ -> false
-     in
-     if isinvalid then 
--      String.set s i '_';
-+      Bytes.set s i '_';
-   done;
--  s
-+  Bytes.to_string s
- 
- let rec addOffset (toadd: offset) (off: offset) : offset =
-   match off with
-diff -ur cil-1.7.3.old/src/formatlex.mll cil-1.7.3/src/formatlex.mll
---- cil-1.7.3.old/src/formatlex.mll	2013-07-24 16:07:11.000000000 +0100
-+++ cil-1.7.3/src/formatlex.mll	2017-11-22 14:52:59.217743941 +0000
-@@ -145,11 +145,11 @@
-  * We convert L"Hi" to "H\000i\000" *)
- let wbtowc wstr =
-   let len = String.length wstr in 
--  let dest = String.make (len * 2) '\000' in 
-+  let dest = Bytes.make (len * 2) '\000' in 
-   for i = 0 to len-1 do 
--    dest.[i*2] <- wstr.[i] ;
-+    Bytes.set dest (i*2) wstr.[i] ;
-   done ;
--  dest
-+  Bytes.to_string dest
- 
- (* This function converst the "Hi" in L"Hi" to { L'H', L'i', L'\0' } *)
- let wstr_to_warray wstr =

ocaml-4.02.0.patch

@@ -1,11 +0,0 @@
---- a/ocamlutil/pretty.ml	
-+++ a/ocamlutil/pretty.ml	
-@@ -640,7 +640,7 @@ external format_float: string -> float -> string = "caml_format_float"
-     
- let gprintf (finish : doc -> 'b)  
-             (format : ('a, unit, doc, 'b) format4) : 'a =
--  let format = (Obj.magic format : string) in
-+  let format = string_of_format format in
- 
-   (* Record the starting align depth *)
-   let startAlignDepth = !alignDepth in

ocaml-cil.spec

@@ -1,48 +1,31 @@
-# Disable debuginfo because I cannot get -g passed to ocamlopt -a
-%global debug_package %{nil}
+%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%define debug_package %{nil}
+
+# Prevent unwanted bytecode stripping by RPM.
+%define __strip /bin/true
 
 Name:           ocaml-cil
-Version:        1.7.3
-Release:        67%{?dist}
+Version:        1.3.7
+Release:        5%{?dist}
 Summary:        CIL - Infrastructure for C Program Analysis and Transformation
+
+Group:          Development/Libraries
 License:        BSD
+URL:            http://cil.sourceforge.net/
+Source0:        http://hal.cs.berkeley.edu/cil/distrib/cil-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    ppc64
+ExcludeArch:    ppc
+ExcludeArch:    sparc64
+ExcludeArch:    s390 s390x
 
-URL:            https://github.com/cil-project/cil
-Source0:        https://github.com/cil-project/cil/archive/cil-%{version}.tar.gz
+Patch0:         cil-1.3.7-output-obj.patch
 
-BuildRequires: make
-BuildRequires:  ocaml
-BuildRequires:  ocaml-ocamlbuild
-BuildRequires:  ocaml-findlib-devel
-BuildRequires:  ocaml-ocamldoc
-BuildRequires:  ocaml-num-devel
+BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-ocamldoc
 
-Patch0:         0001-Fix-testsuite-on-32-bit-machines.patch
-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
-
-# Fix unsafe use of Obj.magic (upstream in > 1.7.3).
-# https://bugzilla.redhat.com/show_bug.cgi?id=1120273
-Patch4:         ocaml-4.02.0.patch
-
-# Fix for bytecode compilation (only apply this when !opt).
-Patch5:         cil-1.7.3-bytecode-compilation.patch
-
-# Fix compilation with GCC 7.
-# gcc -dumpversion prints just "7", adjust the regex accordingly.
-Patch6:         cil-1.7.3-gcc-7.patch
-
-# Fix unescaped left brace in regex
-Patch7:         cil-1.7.3-Fix-unescaped-left-brace-in-regex.patch
-
-# Fixes for -safe-string in OCaml 4.06.
-Patch8:         cil-1.7.3-safe-string.patch
+%define _use_internal_dependency_generator 0
+%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
+%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 %description
 CIL (C Intermediate Language) is a high-level representation along
@@ -74,6 +57,7 @@ pointers.
 
 %package        devel
 Summary:        Development files for %{name}
+Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 
@@ -84,8 +68,8 @@ developing applications that use %{name}.
 
 %package        doc
 Summary:        Documentation for %{name}
+Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  tex(latex), hevea
 
 
 %description    doc
@@ -94,25 +78,11 @@ The %{name}-doc package contains documentation for users of %{name}.
 
 %package        cilly
 Summary:        Support programs for %{name}
+Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Provides:       perl(CilConfig) = %{version}
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-# test and doc use cilly: Requires must also be BuildRequires
-BuildRequires:  perl-generators
-BuildRequires:  perl(Carp)
-BuildRequires:  perl(Data::Dumper)
-BuildRequires:  perl(File::Basename)
-BuildRequires:  perl(File::Copy)
-BuildRequires:  perl(File::Spec)
-BuildRequires:  perl(File::Temp)
-BuildRequires:  perl(FindBin)
-BuildRequires:  perl(lib)
-BuildRequires:  perl(strict)
-BuildRequires:  perl(Text::ParseWords)
-# Some more dependencies used only for build and test
-BuildRequires:  perl(Getopt::Long)
-BuildRequires:  perl(ExtUtils::MakeMaker)
-# Filter out wrong Provides (automatically generated)
-%global __provides_exclude perl\\(AR|GNUCC|MSLIB|MSLINK|MSVC\\)
+
 
 %description    cilly
 The %{name}-cilly package contains the 'cilly' wrapper/replacement
@@ -121,346 +91,111 @@ for gcc.
 
 %prep
 %setup -q -n cil-%{version}
-
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%ifnarch %{ocaml_native_compiler}
-%patch5 -p1
-%endif
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+./configure --libdir=%{_libdir}
+
 
 %build
+make RELEASE=1
+make quicktest
 
-export PERL_MM_OPT=INSTALLDIRS=vendor
+cat > META <<EOF
+version="%{version}"
+description="%{summary}"
+archive(byte)="cil.cma"
+archive(native)="cil.cmxa"
+requires=""
+EOF
 
-%configure
-# make -j is broken, do not use it
-unset MAKEFLAGS
-make all doc
-# Force build of bytecode version even if ocamlopt is available
-make OCAMLBEST= bin/cilly.byte
+archos=`ls obj`
+
+rm -f bin/CilConfig.pm
+cat > bin/CilConfig.pm <<EOF
+\$::archos    = "$archos";
+\$::cc        = "gcc";
+\$::cilhome   = "%{_libexecdir}/cil";
+\$::default_mode = "GNUCC";
+EOF
+
+strip obj/$archos/libcil.o
+#strip obj/$archos/cilly.byte.exe - NO! It removes the bytecode :-(
+%if %opt
+strip obj/$archos/cilly.asm.exe
+%endif
 
-%check
-# Test suite is advisory.  Even upstream it does not work fully.
-make test ||:
 
 %install
+rm -rf $RPM_BUILD_ROOT
+
+# This sets $archos to something like 'x86_LINUX':
+archos=`ls obj`
 
 export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 
+# CIL's make install rule is totally borked.
+mkdir -p $DESTDIR%{perl_vendorlib}
+install -m 0644 lib/*.pm bin/CilConfig.pm $DESTDIR%{perl_vendorlib}
 mkdir -p $OCAMLFIND_DESTDIR
-make DESTDIR=$DESTDIR install
+ocamlfind install cil META obj/$archos/*.{ml,mli,cmi,cmo,cmx,cma,cmxa,o,a} \
+  src/*.mli
 
-# clean up .packlist
-find $DESTDIR -name .packlist -type f -exec rm -f {} \;
+mkdir -p $DESTDIR%{_bindir}
+install -m 0755 bin/cilly $DESTDIR%{_bindir}
 
-# make install does not install documentation
-# Copy documentation in doc/ocaml-cil, avoiding spurious files not cleaned up by
-# CIL
-mkdir -p doc/ocaml-cil/html
-cp -r doc/html/cil/api doc/ocaml-cil/html
-cp -r doc/html/cil/examples doc/ocaml-cil/html
-cp doc/html/cil/*.html doc/ocaml-cil/html/
-cp doc/html/cil/*.css doc/ocaml-cil/html/
-cp doc/html/cil/*.svg doc/ocaml-cil/html/
-cp doc/html/cil/CIL.pdf doc/ocaml-cil/cil-manual.pdf
+mkdir -p $DESTDIR%{_libexecdir}/cil/obj/$archos
+install -m 0755 obj/$archos/cilly.*.exe $DESTDIR%{_libexecdir}/cil/obj/$archos
+
+mkdir -p $DESTDIR/etc/prelink.conf.d
+echo '-b /usr/libexec/cil' > $DESTDIR/etc/prelink.conf.d/ocaml-cil-cilly.conf
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%doc README.md LICENSE
+%defattr(-,root,root,-)
+%doc README LICENSE
 %{_libdir}/ocaml/cil
-%ifarch %{ocaml_native_compiler}
+%if %opt
 %exclude %{_libdir}/ocaml/cil/*.a
 %exclude %{_libdir}/ocaml/cil/*.cmxa
 %exclude %{_libdir}/ocaml/cil/*.cmx
 %endif
 %exclude %{_libdir}/ocaml/cil/*.mli
+%exclude %{_libdir}/ocaml/cil/*.ml
 
 
 %files devel
-%doc README.md LICENSE
-%ifarch %{ocaml_native_compiler}
+%defattr(-,root,root,-)
+%doc README LICENSE
+%if %opt
 %{_libdir}/ocaml/cil/*.a
 %{_libdir}/ocaml/cil/*.cmxa
 %{_libdir}/ocaml/cil/*.cmx
 %endif
 %{_libdir}/ocaml/cil/*.mli
+%{_libdir}/ocaml/cil/*.ml
 
 
 %files doc
-%doc README.md LICENSE doc/ocaml-cil/*
+%defattr(-,root,root,-)
+%doc README LICENSE doc/*
 
 %files cilly
-%doc README.md LICENSE
-%dir %{perl_vendorlib}/App
-%{perl_vendorlib}/App/Cilly
-%{perl_vendorlib}/App/Cilly.pm
-%{_bindir}/cilly*
+%defattr(-,root,root,-)
+%doc README LICENSE
+%{perl_vendorlib}/CilConfig.pm
+%{perl_vendorlib}/Cilly.pm
+%{perl_vendorlib}/KeptFile.pm
+%{perl_vendorlib}/OutputFile.pm
+%{perl_vendorlib}/TempFile.pm
+%{_bindir}/cilly
+%{_libexecdir}/cil
+%config(noreplace) /etc/prelink.conf.d/ocaml-cil-cilly.conf
 
 
 %changelog
-* Mon Mar  1 17:26:07 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-67
-- OCaml 4.12.0 build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-66
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-65
-- OCaml 4.11.1 rebuild
-
-* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-64
-- OCaml 4.11.0 rebuild
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-63
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-62
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jun 25 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-61
-- Perl 5.32 rebuild
-
-* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-60
-- OCaml 4.11.0+dev2-2020-04-22 rebuild
-
-* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-59
-- OCaml 4.11.0 pre-release attempt 2
-
-* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-58
-- OCaml 4.11.0 pre-release
-
-* Fri Apr 03 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-57
-- Update all OCaml dependencies for RPM 4.16.
-
-* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-56
-- OCaml 4.10.0 final.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-55
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-54
-- OCaml 4.10.0+beta1 rebuild.
-
-* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-53
-- OCaml 4.09.0 (final) rebuild.
-
-* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-52
-- OCaml 4.08.1 (final) rebuild.
-
-* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-51
-- OCaml 4.08.1 (rc2) rebuild.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-50
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-49
-- OCaml 4.08.0 (final) rebuild.
-
-* Sat Jun 01 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-48
-- Perl 5.30 rebuild
-
-* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-47
-- OCaml 4.08.0 (beta 3) rebuild.
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-46
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 08 2019 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-45
-- hevea now generates *.svg instead of *.gif (RHBZ#1664307).
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-44
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-43
-- OCaml 4.07.0 (final) rebuild.
-
-* Fri Jun 29 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-42
-- Perl 5.28 rebuild
-
-* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-41
-- OCaml 4.07.0-rc1 rebuild.
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-40
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Nov 22 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-39
-- OCaml 4.06.0 rebuild.
-- Fixes for -safe-string.
-- Stop using opt macro.
-- Enable debuginfo on all architectures.
-
-* Tue Aug 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-38
-- OCaml 4.05.0 rebuild.
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-37
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-36
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Jun 27 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-35
-- OCaml 4.04.2 rebuild.
-
-* Wed Jun 07 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-34
-- Perl 5.26 re-rebuild of bootstrapped packages
-
-* Wed Jun 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-33
-- Rebuild against ocamlfind 1.7.3.
-
-* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-32
-- Perl 5.26 rebuild
-
-* Mon May 22 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-31
-- Fix unescaped left brace in regex
-
-* Sat May 13 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-30
-- OCaml 4.04.1 rebuild.
-
-* Tue Feb 14 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-29
-- Fix compilation with GCC 7.
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Nov 07 2016 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-27
-- Rebuild for OCaml 4.04.0.
-- Add explicit dependency on ocamlbuild.
-
-* Wed Oct 19 2016 Dan Horák <dan[at]danny.cz> - 1.7.3-26
-- disable debuginfo subpackage on interpreted builds
-
-* Tue May 17 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-25
-- Perl 5.24 rebuild
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-23
-- OCaml 4.02.3 rebuild.
-
-* Mon Jul 20 2015 Richard W.M. Jones <rjones@redhat.com> 1.7.3-22
-- Add patch for bytecode compilation, and enable on all arches.
-
-* Mon Jun 29 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.7.3-21
-- Build on ARMv7 (rhbz 994968) as it seems to now be fixed
-
-* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-20
-- ocaml-4.02.2 final rebuild.
-
-* Thu Jun 18 2015 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-19
-- ocaml-4.02.2 rebuild.
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.3-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Jun 06 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-17
-- Perl 5.22 rebuild
-
-* Tue Feb 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-16
-- ocaml-4.02.1 rebuild.
-- Make test suite advisory.  Even upstream it does not work fully.
-
-* Wed Sep 03 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-14
-- Perl 5.20 rebuild
-
-* Sun Aug 31 2014 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-13
-- ocaml-4.02.0 final rebuild.
-
-* Thu Aug 28 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-12
-- Perl 5.20 rebuild
-
-* Sat Aug 23 2014 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-11
-- ocaml-4.02.0+rc1 rebuild.
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.3-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Aug 02 2014 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-9
-- ocaml-4.02.0-0.8.git10e45753.fc22 rebuild.
-
-* Mon Jul 21 2014 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-8
-- OCaml 4.02.0 beta rebuild.
-- Add patch from upstream to fix hang during build on 4.02.0.
-
-* Thu Jun 19 2014 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-6
-- Fix Perl broken dependencies.
-
-* Thu Jun 12 2014 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-5
-- Bump and rebuild to attempt to fix broken dependencies.
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Sep 14 2013 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-3
-- Rebuild for OCaml 4.01.0.
-- Enable debuginfo.
-
-* Tue Sep  3 2013 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-2
-- ExcludeArch armv7hl (RHBZ#994968).
-
-* Fri Aug 30 2013 Gabriel Kerneis <gabriel@kerneis.info> - 1.7.3-1
-- New upstream version 1.7.3.
-- Use upstream make install target.
-- Build and install documentation.
-- Run test suite.
-- Fix perl-related Provides and Requires for -cilly.
-- Enable on arm and ppc (fixed by upstream ./configure).
-- Apply two upstream patches to test suite.
-
-* Sun Aug  4 2013 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-10
-- Disable on arm (not supported by upstream ./configure).
-- Modernize the spec file.
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 1.4.0-8
-- Perl 5.18 rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Dec 02 2012 Bruno Wolff III <bruno@wolff.to> - 1.4.0-6
-- Rebuild for ocaml 4.0.1.
-
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu Jun 28 2012 Petr Pisar <ppisar@redhat.com> - 1.4.0-4
-- Perl 5.16 rebuild
-
-* Sun Jun 10 2012 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-3
-- Rebuild for OCaml 4.00.0.
-
-* Thu Jun 07 2012 Petr Pisar <ppisar@redhat.com> - 1.4.0-2
-- Perl 5.16 rebuild
-- Specify all Perl dependencies
-
-* Fri Jan  6 2012 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-1
-- New upstream version 1.4.0.
-- Rebuild for OCaml 3.12.1.
-
-* Mon Jun 20 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1.3.7-10
-- Perl mass rebuild
-
-* Thu Jun 09 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1.3.7-9
-- Perl 5.14 mass rebuild
-
-* Fri Jan 07 2011 Richard W.M. Jones <rjones@redhat.com> - 1.3.7-8
-- Rebuild for OCaml 3.12 (http://fedoraproject.org/wiki/Features/OCaml3.12).
-- Patch: Remove '-lstr' option.
-- Move configure into %%build section.
-
-* Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.3.7-6
-- Mass rebuild with perl-5.12.0
-
 * Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 1.3.7-5
 - Rebuild for OCaml 3.11.2.
 

sources

@@ -1 +1 @@
-dffd5ee8f812b86b5352583c223ef6e6  cil-1.7.3.tar.gz
+e0e3ce3b04c0d9cccf98381feb6d89de  cil-1.3.7.tar.gz