- updated to 1.1.2

- bogus pl replaced by real ones
- package ocamlbuild-cppo plugin

diff --git a/cppo.spec b/cppo.spec
index fb12730cf2c78606d0a0d261d023d7916ea1541f..a78d24d97c11b873d750d2b9925a9639a3d87470 100644 (file)
--- a/cppo.spec
+++ b/cppo.spec
@@ -2,21 +2,21 @@
 # Conditional build:
 %bcond_without ocaml_opt       # skip building native optimized binaries (bytecode is always built)
 
-# not yet available on x32 (ocaml 4.02.1), remove when upstream will support it
+# not yet available on x32 (ocaml 4.02.1), update when upstream will support it
 %ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9
 %undefine      with_ocaml_opt
 %endif
 
 %define                debug_package   %{nil}
-Summary:       cpp for OCaml
-Summary(pl.UTF-8):     Wiązania cppo dla OCamla
+Summary:       Preprocessor (cpp equivalent) for OCaml
+Summary(pl.UTF-8):     Preprocesor (odpowiednik cpp) dla OCamla
 Name:          cppo
-Version:       0.9.3
-Release:       3
+Version:       1.1.2
+Release:       1
 License:       BSD
-Group:         Applications
+Group:         Development/Tools
 Source0:       http://mjambon.com/releases/cppo/%{name}-%{version}.tar.gz
-# Source0-md5: cfea4211ab9a7c1276537ce4fc3669b5
+# Source0-md5: f1a551639c0c667ee8840d95ea5b2ab7
 URL:           http://mjambon.com/cppo.html
 BuildRequires: ocaml >= 3.04-7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -27,25 +27,88 @@ It can replace camlp4 for preprocessing OCaml files, using cpp style
 and syntax. It allows defining simple macros and file inclusion.
 
 %description -l pl.UTF-8
-Pakiet ten zawiera binaria potrzebne do uruchamiania programów
-używających tej biblioteki.
+Cppo to przyjazna dla OCamla implementacja cpp - preprocesora języka
+C. Może zastąpić preprocesor camlp4 przy przetwarzaniu plików OCamla
+z wykorzystaniem stylu oraz składni cpp. Pozwala na definiowanie
+prostych makr oraz włączanie plików.
+
+%package -n ocamlbuild-cppo
+Summary:       Cppo plugin for ocamlbuild
+Summary(pl.UTF-8):     Wtyczka cppo dla ocamlbuilda
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+# ocamlbuild resides in ocaml package, so don't require just ocaml-runtime
+%requires_eq   ocaml
+
+%description -n ocamlbuild-cppo
+Cppo plugin for ocamlbuild.
+
+%description -n ocamlbuild-cppo -l pl.UTF-8
+Wtyczka cppo dla ocamlbuilda.
+
+%package -n ocamlbuild-cppo-devel
+Summary:       Development files for ocamlbuild_cppo library
+Summary(pl.UTF-8):     Pliki programistyczne biblioteki ocamlbuild_cppo
+Group:         Development/Libraries
+Requires:      ocamlbuild-cppo = %{version}-%{release}
+%requires_eq   ocaml
+
+%description -n ocamlbuild-cppo-devel
+Development files for ocamlbuild_cppo library.
+
+%description -n ocamlbuild-cppo-devel -l pl.UTF-8
+Pliki programistyczne biblioteki ocamlbuild_cppo.
 
 %prep
 %setup -q
 
 %build
-%{__make} -j1 all %{?with_ocaml_opt:opt} \
+# "all" makes bytecode-based cppo, "opt" makes native
+%{__make} -j1 %{!?with_ocaml_opt:all} %{?with_ocaml_opt:opt} ocamlbuild \
+       %{!?with_ocaml_opt:BEST=byte} \
        CC="%{__cc} %{rpmcflags} -fPIC"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/ocaml/site-lib/cppo_ocamlbuild,%{_examplesdir}}
+
+# make install-bin is broken outside Win*
 install -p cppo $RPM_BUILD_ROOT%{_bindir}
 
+%{__make} install-lib \
+       %{!?with_ocaml_opt:BEST=byte} \
+       OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+
+cp -pr examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/ocaml/cppo_ocamlbuild/META \
+       $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/cppo_ocamlbuild
+cat >>$RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/cppo_ocamlbuild/META <<EOF
+directory="+cppo_ocamlbuild"
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README Changes LICENSE examples
+%doc Changes LICENSE README.md
 %attr(755,root,root) %{_bindir}/cppo
+%{_examplesdir}/%{name}-%{version}
+
+%files -n ocamlbuild-cppo
+%defattr(644,root,root,755)
+%dir %{_libdir}/ocaml/cppo_ocamlbuild
+%{_libdir}/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cma
+%if %{with ocaml_opt}
+%attr(755,root,root) %{_libdir}/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmxs
+%endif
+%{_libdir}/ocaml/site-lib/cppo_ocamlbuild
+
+%files -n ocamlbuild-cppo-devel
+%defattr(644,root,root,755)
+%{_libdir}/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmi
+%if %{with ocaml_opt}
+%{_libdir}/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmxa
+%{_libdir}/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.a
+%endif