diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index bf279c8..9f8862f 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -17,26 +17,6 @@ # -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation files -# (the "Software"), to deal in the Software without restriction, -# including without limitation the rights to use, copy, modify, merge, -# publish, distribute, sublicense, and/or sell copies of the Software, -# and to permit persons to whom the Software is furnished to do so, -# subject to the following conditions: - -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) Name: ocaml-findlib @@ -50,7 +30,7 @@ Url: http://projects.camlcity.org/projects/findlib.html Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz Patch0: findlib-1.3.3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if "%{_ignore_exclusive_arch}" != "" +%if "%{?_ignore_exclusive_arch}" != "" %else ExclusiveArch: %ix86 x86_64 %endif @@ -74,24 +54,24 @@ libraries in programs and scripts. %package devel -Summary: Development files for %{name} +Summary: Development files for ocaml-findlib Group: Development/Libraries/Other Requires: %{name} = %{version} %description devel -The %{name}-devel package contains libraries and signature files for -developing applications that use %{name}. +The ocaml-findlib-devel package contains libraries and signature files +for developing applications that use ocaml-findlib. %prep -: _ignore_exclusive_arch '%{_ignore_exclusive_arch}' +: _ignore_exclusive_arch '%{?_ignore_exclusive_arch}' %setup -q -n findlib-%{version} %patch0 -p1 %build (cd tools/extract_args && make) tools/extract_args/extract_args -o src/findlib/ocaml_args.ml ocamlc ocamlcp ocamlmktop ocamlopt ocamldep ocamldoc ||: -cat src/findlib/ocaml_args.ml +#cat src/findlib/ocaml_args.ml ./configure -config %{_sysconfdir}/ocamlfind.conf \ -bindir %{_bindir} \ -sitelib `ocamlc -where` \