From 805033f73a28c323cb888510e6ebecf78f4ceebd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 Nov 2013 21:53:59 +0000 Subject: [PATCH] Add META file (RHBZ#1026991). (cherry picked from commit f3d83b6f5847b166409eed711f1941b81060c015) --- META.camlidl.in | 6 ++++++ ocaml-camlidl.spec | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 META.camlidl.in diff --git a/META.camlidl.in b/META.camlidl.in new file mode 100644 index 0000000..477b59e --- /dev/null +++ b/META.camlidl.in @@ -0,0 +1,6 @@ +# Courtesy of GODI +description = "Stub generator" +version = "@VERSION@" +directory = "^" +archive(byte) = "com.cma" +archive(native) = "com.cmxa" diff --git a/ocaml-camlidl.spec b/ocaml-camlidl.spec index a94c597..9270b4b 100644 --- a/ocaml-camlidl.spec +++ b/ocaml-camlidl.spec @@ -3,7 +3,7 @@ Name: ocaml-camlidl Version: 1.05 -Release: 19%{?dist} +Release: 19%{?dist}.1 Summary: Stub code generator and COM binding for Objective Caml Group: Development/Libraries @@ -12,6 +12,10 @@ URL: http://caml.inria.fr/pub/old_caml_site/camlidl/ Source0: http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/camlidl-%{version}.tar.gz Source1: http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/camlidl-%{version}.doc.pdf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +# META file from Debian (RHBZ#1026991). +Source2: META.camlidl.in + ExcludeArch: sparc64 s390 s390x BuildRequires: ocaml @@ -69,6 +73,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ocaml/caml mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ocaml/stublibs mkdir -p $RPM_BUILD_ROOT/%{_bindir} +# Install META file (RHBZ#1026991). +sed 's/@VERSION@/%{version}/' < %{SOURCE2} > $RPM_BUILD_ROOT/%{_libdir}/ocaml/META.camlidl + make OCAMLLIB=$RPM_BUILD_ROOT/%{_libdir}/ocaml \ BINDIR=$RPM_BUILD_ROOT/%{_bindir} \ install @@ -100,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 5 2013 Richard W.M. Jones - 1.05-19.fc20.1 +- Add META file (RHBZ#1026991). + * Sat Aug 03 2013 Fedora Release Engineering - 1.05-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild