- Fix Perl paths (rhbz#453759).

This commit is contained in:
Richard W.M. Jones 2008-07-07 10:46:55 +00:00
parent 12a247c449
commit fc53ab3d5a

View File

@ -3,7 +3,7 @@
Name: ocaml-cil Name: ocaml-cil
Version: 1.3.6 Version: 1.3.6
Release: 4%{?dist} Release: 5%{?dist}
Summary: CIL - Infrastructure for C Program Analysis and Transformation Summary: CIL - Infrastructure for C Program Analysis and Transformation
Group: Development/Libraries Group: Development/Libraries
@ -73,8 +73,8 @@ The %{name}-doc package contains documentation for users of %{name}.
Summary: Support programs for %{name} Summary: Support programs for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: perl >= 5.8
Provides: perl(CilConfig) = %{version} Provides: perl(CilConfig) = %{version}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description cilly %description cilly
@ -122,15 +122,12 @@ rm -rf $RPM_BUILD_ROOT
# This sets $archos to something like 'x86_LINUX': # This sets $archos to something like 'x86_LINUX':
archos=`ls obj` 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 DESTDIR=$RPM_BUILD_ROOT
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
# CIL's make install rule is totally borked. # CIL's make install rule is totally borked.
mkdir -p $DESTDIR$privlib mkdir -p $DESTDIR%{perl_vendorlib}
install -m 0644 lib/*.pm bin/CilConfig.pm $DESTDIR$privlib install -m 0644 lib/*.pm bin/CilConfig.pm $DESTDIR%{perl_vendorlib}
mkdir -p $OCAMLFIND_DESTDIR mkdir -p $OCAMLFIND_DESTDIR
ocamlfind install cil META obj/$archos/*.{ml,mli,cmi,cmo,cmx,cma,cmxa,o,a} ocamlfind install cil META obj/$archos/*.{ml,mli,cmi,cmo,cmx,cma,cmxa,o,a}
@ -169,21 +166,25 @@ rm -rf $RPM_BUILD_ROOT
%files doc %files doc
%defattr(-,root,root,-)
%doc README LICENSE doc/* %doc README LICENSE doc/*
%files cilly %files cilly
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README LICENSE %doc README LICENSE
/usr/lib/perl5/*/CilConfig.pm %{perl_vendorlib}/CilConfig.pm
/usr/lib/perl5/*/Cilly.pm %{perl_vendorlib}/Cilly.pm
/usr/lib/perl5/*/KeptFile.pm %{perl_vendorlib}/KeptFile.pm
/usr/lib/perl5/*/OutputFile.pm %{perl_vendorlib}/OutputFile.pm
/usr/lib/perl5/*/TempFile.pm %{perl_vendorlib}/TempFile.pm
%{_bindir}/cilly %{_bindir}/cilly
%{_libexecdir}/cil %{_libexecdir}/cil
%changelog %changelog
* Mon Jul 7 2008 Richard W.M. Jones <rjones@redhat.com> - 1.3.6-5
- Fix Perl paths (rhbz#453759).
* Wed Nov 7 2007 Richard W.M. Jones <rjones@redhat.com> - 1.3.6-4 * Wed Nov 7 2007 Richard W.M. Jones <rjones@redhat.com> - 1.3.6-4
- ExcludeArch ppc - CIL doesn't build on PPC as it turns out. - ExcludeArch ppc - CIL doesn't build on PPC as it turns out.