rpms/ocaml-cil/devel ocaml-cil.spec,1.2,1.3

[Richard W.M. Jones (rjones)]

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29030

Modified Files:
	ocaml-cil.spec 
Log Message:
* Mon Jul  7 2008 Richard W.M. Jones <rjones at redhat.com> - 1.3.6-6
- Fix Perl paths (rhbz#453759).



Index: ocaml-cil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cil/devel/ocaml-cil.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-cil.spec	23 Apr 2008 11:10:37 -0000	1.2
+++ ocaml-cil.spec	7 Jul 2008 10:51:25 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           ocaml-cil
 Version:        1.3.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        CIL - Infrastructure for C Program Analysis and Transformation
 
 Group:          Development/Libraries
@@ -73,8 +73,8 @@
 Summary:        Support programs for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       perl >= 5.8
 Provides:       perl(CilConfig) = %{version}
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 
 %description    cilly
@@ -122,15 +122,12 @@
 # This sets $archos to something like 'x86_LINUX':
 archos=`ls obj`
 
-# This sets $privlib to something like '/usr/lib/perl5/5.8.8':
-eval `perl -V:privlib`
-
 export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 
 # CIL's make install rule is totally borked.
-mkdir -p $DESTDIR$privlib
-install -m 0644 lib/*.pm bin/CilConfig.pm $DESTDIR$privlib
+mkdir -p $DESTDIR%{perl_vendorlib}
+install -m 0644 lib/*.pm bin/CilConfig.pm $DESTDIR%{perl_vendorlib}
 mkdir -p $OCAMLFIND_DESTDIR
 ocamlfind install cil META obj/$archos/*.{ml,mli,cmi,cmo,cmx,cma,cmxa,o,a}
 
@@ -169,21 +166,25 @@
 
 
 %files doc
+%defattr(-,root,root,-)
 %doc README LICENSE doc/*
 
 %files cilly
 %defattr(-,root,root,-)
 %doc README LICENSE
-/usr/lib/perl5/*/CilConfig.pm
-/usr/lib/perl5/*/Cilly.pm
-/usr/lib/perl5/*/KeptFile.pm
-/usr/lib/perl5/*/OutputFile.pm
-/usr/lib/perl5/*/TempFile.pm
+%{perl_vendorlib}/CilConfig.pm
+%{perl_vendorlib}/Cilly.pm
+%{perl_vendorlib}/KeptFile.pm
+%{perl_vendorlib}/OutputFile.pm
+%{perl_vendorlib}/TempFile.pm
 %{_bindir}/cilly
 %{_libexecdir}/cil
 
 
 %changelog
+* Mon Jul  7 2008 Richard W.M. Jones <rjones at redhat.com> - 1.3.6-6
+- Fix Perl paths (rhbz#453759).
+
 * Wed Apr 23 2008 Richard W.M. Jones <rjones at redhat.com> - 1.3.6-5
 - Rebuild for OCaml 3.10.2