commit 7daadaa55759fe7bd355c54094b89fef847e3426
Author: Jakub Bogusz <[email protected]>
Date: Fri Jul 17 22:21:51 2015 +0200
- unify ocaml_opt bcond name
- release 9 (ocaml rebuild)
ocaml-findlib.spec | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index 7ab247e..505f5b4 100644
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -1,15 +1,9 @@
#
# Conditional build:
-%bcond_without opt # build opt
+%bcond_without ocaml_opt # build opt
-%ifarch x32
-%undefine with_opt
-%endif
-
-%if !%{with opt}
-%define no_install_post_strip 1
-# debug package strips binaries which renders ocamlfind broken
-%define _enable_debug_packages 0
+%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9
+%undefine with_ocaml_opt
%endif
%define ocaml_ver 1:4.02
@@ -17,7 +11,7 @@ Summary: OCaml module manager
Summary(pl.UTF-8): Zarządca modułów OCamla
Name: ocaml-findlib
Version: 1.5.5
-Release: 8
+Release: 9
License: distributable
Group: Development/Tools
Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz
@@ -33,6 +27,12 @@ BuildRequires: sed >= 4.0
%requires_eq ocaml
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%if %{without ocaml_opt}
+%define no_install_post_strip 1
+# debug package strips binaries which renders ocamlfind broken
+%define _enable_debug_packages 0
+%endif
+
%description
The "findlib" library provides a scheme to manage reusable software
components (packages), and includes tools that support this scheme.
@@ -80,7 +80,7 @@ Ten pakiet zawiera biblioteki i skompilowane interfejsy
findliba.
sed -i -e 's/-g//' Makefile
-%{__make} -j1 all %{?with_opt:opt}
+%{__make} -j1 all %{?with_ocaml_opt:opt}
%install
rm -rf $RPM_BUILD_ROOT
@@ -157,7 +157,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/ocaml/findlib/Makefile.config
%{_libdir}/ocaml/findlib/*.cm[xi]
%{_libdir}/ocaml/findlib/*.cma
-%if %{with opt}
+%if %{with ocaml_opt}
%{_libdir}/ocaml/findlib/*.[ao]
%{_libdir}/ocaml/findlib/*.cmxa
%{_libdir}/ocaml/findlib/*.cmxs
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ocaml-findlib.git/commitdiff/7daadaa55759fe7bd355c54094b89fef847e3426
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
