pool/ocaml-findlib
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 404353 from devel:languages:ocaml

Browse Source 
-  Update to upstream version 1.6.2 (fate#320836)
   Adding an "ocamldoc" library, providing the cmi's for ocamldoc plugins
   Support for OCaml-4.03: recognize that the new -color option has an argument
   Adding support for dynamically loading  packages
   new "plugin" variable, new  Fl_dynload module.
   New command "ocamlfind lint" for checking META files
   Allow to query the location of the META file of a package:
   "ocamlfind query -format '%m'"
   Get the install path for the META file of packages:
   "ocamlfind printconf metapath"
   The switch -only-show did not work as described.

- Add hardcoded Provides for pre 12.1 repos

OBS-URL: https://build.opensuse.org/request/show/404353
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocaml-findlib?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2016-07-15 10:46:11 +00:00 committed by Git OBS Bridge
commit a98dfd7f12
5 changed files with 121 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
findlib-1.3.3.patch
View File

@ -30,36 +30,36 @@ Index: findlib-1.5.5/Makefile
.PHONY: install-doc
install-doc:
- mkdir -p $(prefix)$(OCAMLFIND_MAN)/man1 $(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5
- -cp doc/ref-man/ocamlfind.1 $(prefix)$(OCAMLFIND_MAN)/man1
- -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(prefix)$(OCAMLFIND_MAN)/man5
+ mkdir -p $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
+ -cp doc/ref-man/ocamlfind.1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1
+ -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
- mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5"
- -cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
- -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
+ -cp doc/ref-man/ocamlfind.1 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1"
+ -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
.PHONY: uninstall-doc
uninstall-doc:
- rm -f $(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1
- rm -f $(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3
- rm -f $(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3
- rm -f $(prefix)$(OCAMLFIND_MAN)/man5/META.5
- rm -f $(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/META.5
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5
- rm -f "$(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1"
- rm -f "$(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3"
- rm -f "$(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3"
- rm -f "$(prefix)$(OCAMLFIND_MAN)/man5/META.5"
- rm -f "$(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5"
+ rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1"
+ rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3"
+ rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3"
+ rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/META.5"
+ rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5"
.PHONY: install-meta
install-meta:
- for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
+ for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
- for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
+ for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
.PHONY: uninstall-meta
uninstall-meta:
- for x in `ls site-lib-src`; do if [ "$$x" != "CVS" ]; then rm -rf "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
+ for x in `ls site-lib-src`; do if [ "$$x" != "CVS" ]; then rm -rf "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
- for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then rm -rf "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
+ for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then rm -rf "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
.PHONY: install-config
install-config:
@ -99,7 +99,7 @@ Index: findlib-1.5.5/src/findlib/Makefile
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs META` && \
files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \

3
findlib-1.5.5.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:19b17d1c09e51f891974b462ed81f1ff78ea53ade78646fad90c46b69dc55c5a
size 150476

3
findlib-1.6.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eb979f1c85f037614f357ddf0889ef66a79745e24ef3df02507f283aec0ed1c8
size 156780

20
ocaml-findlib.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Wed May 18 21:34:23 UTC 2016 - ohering@suse.de
- Update to upstream version 1.6.2 (fate#320836)
Adding an "ocamldoc" library, providing the cmi's for ocamldoc plugins
Support for OCaml-4.03: recognize that the new -color option has an argument
Adding support for dynamically loading packages
new "plugin" variable, new Fl_dynload module.
New command "ocamlfind lint" for checking META files
Allow to query the location of the META file of a package:
"ocamlfind query -format '%m'"
Get the install path for the META file of packages:
"ocamlfind printconf metapath"
The switch -only-show did not work as described.
-------------------------------------------------------------------
Tue Nov 10 10:18:47 UTC 2015 - ohering@suse.de
- Add hardcoded Provides for pre 12.1 repos
-------------------------------------------------------------------
Thu Oct 23 17:01:25 UTC 2014 - ohering@suse.de

104
ocaml-findlib.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ocaml-findlib
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2010-2011 Andrew Psaltis <ampsaltis at gmail dot com>
#
# All modifications and additions to the file contributed by third parties
@ -17,10 +17,10 @@
#
Version: 1.5.5
Name: ocaml-findlib
Version: 1.6.2
Release: 0
%{ocaml_preserve_bytecode}
Name: ocaml-findlib
Summary: Objective CAML package manager and build helper
License: MIT
Group: Development/Libraries/Other
@ -29,7 +29,18 @@ Url: http://projects.camlcity.org/projects/findlib.html
Source0: findlib-%{version}.tar.xz
Patch0: findlib-1.3.3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# ocaml autodep start for pkg: ocaml-findlib
# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires
%if 0%{?suse_version} < 1210
Requires: ocaml-findlib-devel
%endif
# ocaml autodep end for pkg: ocaml-findlib
#
Recommends: ocaml-findlib-camlp4
#
Requires: ocaml-compiler-libs
Requires: ocaml-runtime
#
Provides: ocamlfind = %{version}
BuildRequires: gawk
@ -37,6 +48,7 @@ BuildRequires: m4
BuildRequires: ncurses-devel
BuildRequires: ocaml >= 4.02.0
BuildRequires: ocaml-camlp4-devel >= 4.02.0
BuildRequires: ocaml-ocamlbuild
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-rpm-macros >= 4.02.1
@ -58,6 +70,21 @@ The ocaml-findlib-devel package contains libraries and signature files
for developing applications that use ocaml-findlib.
%package camlp4
# ocaml autodep start for pkg: ocaml-findlib-camlp4
# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires
%if 0%{?suse_version} < 1210
Requires: ocaml-findlib
%endif
# ocaml autodep end for pkg: ocaml-findlib-camlp4
Summary: Development files for ocaml-findlib
Group: Development/Libraries/Other
Requires: ocaml-camlp4-devel
%description camlp4
The ocaml-findlib-camlp4 contains signature files for developing applications that use camlp4
%prep
%setup -q -n findlib-%{version}
%patch0 -p1
@ -65,7 +92,6 @@ for developing applications that use ocaml-findlib.
%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
./configure -config %{_sysconfdir}/ocamlfind.conf \
-bindir %{_bindir} \
-sitelib `ocamlc -where` \
@ -79,6 +105,7 @@ rm doc/guide-html/TIMESTAMP
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild
%files
%defattr(-,root,root,-)
@ -86,36 +113,59 @@ make install DESTDIR=$RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/ocamlfind.conf
%{_bindir}/*
%{_mandir}/man?/*
%{_libdir}/ocaml/bigarray
%{_libdir}/ocaml/camlp4
%{_libdir}/ocaml/compiler-libs
%{_libdir}/ocaml/dynlink
%{_libdir}/ocaml/findlib
%{_libdir}/ocaml/graphics
%{_libdir}/ocaml/num
%{_libdir}/ocaml/ocamlbuild
%{_libdir}/ocaml/stdlib
%{_libdir}/ocaml/str
%{_libdir}/ocaml/threads
#
%dir %{_libdir}/ocaml
%dir %{_libdir}/ocaml/bigarray
%{_libdir}/ocaml/bigarray/META
%dir %{_libdir}/ocaml/bytes
%{_libdir}/ocaml/bytes/META
%dir %{_libdir}/ocaml/compiler-libs
%{_libdir}/ocaml/compiler-libs/META
%dir %{_libdir}/ocaml/dynlink
%{_libdir}/ocaml/dynlink/META
%dir %{_libdir}/ocaml/graphics
%{_libdir}/ocaml/graphics/META
%dir %{_libdir}/ocaml/num
%{_libdir}/ocaml/num/META
%dir %{_libdir}/ocaml/ocamldoc
%{_libdir}/ocaml/ocamldoc/META
%dir %{_libdir}/ocaml/stdlib
%{_libdir}/ocaml/stdlib/META
%dir %{_libdir}/ocaml/str
%{_libdir}/ocaml/str/META
%dir %{_libdir}/ocaml/threads
%{_libdir}/ocaml/threads/META
%dir %{_libdir}/ocaml/unix
%{_libdir}/ocaml/unix/META
#
%{_libdir}/ocaml/topfind
%{_libdir}/ocaml/unix
%dir %{_libdir}/ocaml/findlib
%if %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/findlib/*.a
%exclude %{_libdir}/ocaml/findlib/*.cmxa
%{_libdir}/ocaml/*/*.cmxs
%endif
%exclude %{_libdir}/ocaml/findlib/*.mli
%exclude %{_libdir}/ocaml/findlib/Makefile.config
%{_libdir}/ocaml/num-top
%files devel
%defattr(-,root,root,-)
%doc LICENSE doc/README doc/guide-html
%{_libdir}/ocaml/*/Makefile.config
#
%dir %{_libdir}/ocaml
%dir %{_libdir}/ocaml/findlib
%dir %{_libdir}/ocaml/num-top
%{_libdir}/ocaml/findlib/META
%{_libdir}/ocaml/num-top/META
%if %{ocaml_native_compiler}
%{_libdir}/ocaml/findlib/*.a
%{_libdir}/ocaml/findlib/*.cmxa
%{_libdir}/ocaml/*/*.a
%{_libdir}/ocaml/*/*.cmxa
%endif
%{_libdir}/ocaml/findlib/*.mli
%{_libdir}/ocaml/findlib/Makefile.config
%{_libdir}/ocaml/bytes
%{_libdir}/ocaml/*/*.cma
%{_libdir}/ocaml/*/*.cmi
%{_libdir}/ocaml/*/*.mli
%files camlp4
%defattr(-,root,root,-)
%dir %{_libdir}/ocaml
%dir %{_libdir}/ocaml/camlp4
%{_libdir}/ocaml/camlp4/META
%changelog