#2 Version 0.9.2
Merged 2 years ago by rjones. Opened 2 years ago by jjames.
rpms/ jjames/ocaml-curl rawhide  into  rawhide

file modified
+26 -36
@@ -1,24 +1,20 @@ 

  %undefine _package_note_flags

  Name:           ocaml-curl

- Version:        0.9.1

- Release:        18%{?dist}

+ Version:        0.9.2

+ Release:        1%{?dist}

  Summary:        OCaml Curl library (ocurl)

  License:        MIT

  

- URL:            http://ocurl.forge.ocamlcore.org/

+ URL:            https://ygrek.org/p/ocurl/

  Source0:        https://github.com/ygrek/ocurl/archive/%{version}/ocurl-%{version}.tar.gz

  

- BuildRequires: make

- BuildRequires:  ocaml >= 4.02.0

+ BuildRequires:  make

+ BuildRequires:  ocaml >= 4.03.0

  BuildRequires:  ocaml-ocamldoc

- BuildRequires:  ocaml-findlib-devel

- BuildRequires:  curl-devel >= 7.28.0

+ BuildRequires:  ocaml-findlib

+ BuildRequires:  libcurl-devel >= 7.28.0

  BuildRequires:  ocaml-lwt-ppx-devel

- BuildRequires:  gawk

- 

- # Explicitly require Curl (fixes #711261). Since ocaml-curl uses

- # -custom rather than ocamlmklib, automatic detection is infeasible.

- Requires: curl-devel >= 7.28.0

+ BuildRequires:  python3

  

  

  %description
@@ -28,7 +24,9 @@ 

  

  %package        devel

  Summary:        Development files for %{name}

- Requires:       %{name} = %{version}-%{release}

+ Requires:       %{name}%{?_isa} = %{version}-%{release}

+ Requires:       ocaml-lwt-devel%{?_isa}

+ Requires:       libcurl-devel%{?_isa} >= 7.28.0

  

  

  %description    devel
@@ -40,7 +38,7 @@ 

  %autosetup -p1 -n ocurl-%{version}

  

  # Files in the archive have spurious +x mode.

- find -type f | xargs chmod 0644

+ find . -type f -perm /0111 -exec chmod 0644 {} +

  chmod 0755 configure install-sh

  

  # Link with debuginfo and RPM_LD_FLAGS
@@ -63,39 +61,31 @@ 

  

  

  %install

- export DESTDIR=%buildroot

- export OCAMLFIND_DESTDIR=%buildroot%{_libdir}/ocaml

+ export OCAMLFIND_DESTDIR=%buildroot%{ocamldir}

  mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs

- make install

+ %make_install

+ cp -p opam %{buildroot}%{ocamldir}/curl

  

  # Make clean in the examples dir so our docs don't contain binaries.

  make -C examples clean

  

+ %ocaml_files

+ 

  

- %files

+ %files -f .ofiles

  %license COPYING

- %{_libdir}/ocaml/curl

- %ifarch %{ocaml_native_compiler}

- %exclude %{_libdir}/ocaml/curl/*.a

- %exclude %{_libdir}/ocaml/curl/*.cmx

- %exclude %{_libdir}/ocaml/curl/*.cmxa

- %endif

- %exclude %{_libdir}/ocaml/curl/*.mli

- %{_libdir}/ocaml/stublibs/*.so

- %{_libdir}/ocaml/stublibs/*.so.owner

- 

- 

- %files devel

+ 

+ 

+ %files devel -f .ofiles-devel

  %doc doc examples

- %ifarch %{ocaml_native_compiler}

- %{_libdir}/ocaml/curl/*.a

- %{_libdir}/ocaml/curl/*.cmx

- %{_libdir}/ocaml/curl/*.cmxa

- %endif

- %{_libdir}/ocaml/curl/*.mli

  

  

  %changelog

+ * Mon Aug  8 2022 Jerry James <loganjerry@gmail.com> - 0.9.2-1

+ - Version 0.9.2

+ - New project URL

+ - Use new OCaml macros

+ 

  * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-18

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (ocurl-0.9.1.tar.gz) = f4acb596f213ce57e749c9805225330b532e17718f3b228745b438cd1fe6d89b37e56d401a11c329107729dd0e6bdd4a425d547f9a83dabe32edbf18aca585b5

+ SHA512 (ocurl-0.9.2.tar.gz) = de9b06a2a4cbf804b6c947ef1011a75f45e3effbc29db054a9b72453920a0f554baa06d06b2a36eeee33090df7f9eb35280404237e2e3be219fb2dc98fe2bc82

See the message to ocaml-devel dated 9 Aug 2022 with subject "ocaml-ppxlib upgrade". Please merge this PR if it looks good to you, but don't build yet. I will take care of the builds (in the correct order!) once all of the PRs have been merged.

Comments, in no particular order:
- The explicit Requires on curl-devel that I removed appears to have been targeted at some older release of ocaml-curl. With the current version, the automatic Requires on libcurl is generated.
- The python3 BR is to make the %ocaml_files macro work.
- The additional Requires in ocaml-curl-devel are because the META file lists those packages as required, therefore consumers of this package can expect them to be available to build against.
- The change to the find invocation is just me being pedantic. I can revert that if you want.

Pull-Request has been merged by rjones

2 years ago
Metadata