Disable on arm (not supported by upstream ./configure).

- Modernize the spec file.

ocaml-cil.spec

@@ -6,14 +6,14 @@
 
 Name:           ocaml-cil
 Version:        1.4.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        CIL - Infrastructure for C Program Analysis and Transformation
 
-Group:          Development/Libraries
 License:        BSD
 URL:            http://cil.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/cil/cil-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+ExcludeArch:    armv7hl
 ExcludeArch:    ppc64
 ExcludeArch:    ppc
 ExcludeArch:    sparc64
@@ -21,9 +21,6 @@ ExcludeArch:    s390 s390x
 
 BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-ocamldoc
 
-%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
@@ -55,7 +52,6 @@ pointers.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 
@@ -66,7 +62,6 @@ developing applications that use %{name}.
 
 %package        doc
 Summary:        Documentation for %{name}
-Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 
@@ -76,7 +71,6 @@ The %{name}-doc package contains documentation for users of %{name}.
 
 %package        cilly
 Summary:        Support programs for %{name}
-Group:          Development/Libraries
 # Run-time for tests
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Data::Dumper)
@@ -126,8 +120,6 @@ strip obj/$archos/cilly.asm.exe
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # This sets $archos to something like 'x86_LINUX':
 archos=`ls obj`
 
@@ -155,7 +147,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
 %doc README.md LICENSE
 %{_libdir}/ocaml/cil
 %if %opt
@@ -168,7 +159,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files devel
-%defattr(-,root,root,-)
 %doc README.md LICENSE
 %if %opt
 %{_libdir}/ocaml/cil/*.a
@@ -180,11 +170,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files doc
-%defattr(-,root,root,-)
 %doc README.md LICENSE doc/*
 
 %files cilly
-%defattr(-,root,root,-)
 %doc README.md LICENSE
 %{perl_vendorlib}/CilConfig.pm
 %{perl_vendorlib}/Cilly.pm
@@ -197,6 +185,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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