commit 56573ec91436388ff7fe15d179a37821d8b07c89
Author: Elan Ruusamäe <[email protected]>
Date: Sat Nov 23 20:52:27 2013 +0200
up to 0.6.0, new upstream
ocaml-ocurl.spec | 29 ++++++++++++-----------------
ocurl-0.5.3-include-o-cmx.patch | 12 ------------
2 files changed, 12 insertions(+), 29 deletions(-)
---
diff --git a/ocaml-ocurl.spec b/ocaml-ocurl.spec
index d456493..7a55c80 100644
--- a/ocaml-ocurl.spec
+++ b/ocaml-ocurl.spec
@@ -1,18 +1,18 @@
#
# Conditional build:
-%bcond_without opt # build opt
+%bcond_with opt # build opt
%define debug_package %{nil}
%define pkgname ocurl
Summary: OCaml Curl library (ocurl)
Name: ocaml-%{pkgname}
-Version: 0.5.3
+Version: 0.6.0
Release: 1
License: MIT
Group: Libraries
-Source0: http://downloads.sourceforge.net/ocurl/%{pkgname}-%{version}.tgz
-Patch1: ocurl-0.5.3-include-o-cmx.patch
-URL: http://sourceforge.net/projects/ocurl
+Source0:
https://forge.ocamlcore.org/frs/download.php/1238/%{pkgname}-%{version}.tar.gz
+# Source0-md5: 21575e86b390c6c182a8dee42e8db1f3
+URL: http://ocurl.forge.ocamlcore.org/
BuildRequires: curl-devel >= 7.12.0
BuildRequires: gawk
BuildRequires: ocaml >= 3.10.0-7
@@ -27,28 +27,20 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
The Ocaml Curl Library (Ocurl) is an interface library for the
programming language Ocaml to the networking library libcurl.
-%package devel
+%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-%description devel
+%description devel
The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}.
%prep
-%setup -qc
-mv ocurl/* .
-%patch1 -p1
-
-# Files in the archive have spurious +x mode.
-find -type f | xargs chmod 0644
-chmod 0755 configure install-sh
+%setup -q -n %{pkgname}-%{version}
%build
-%configure \
- --with-findlib
-
+%configure
%{__make} -j1 all \
%if %{with opt}
OCBYTE="ocamlc.opt -g" \
@@ -75,6 +67,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc COPYING
%{_libdir}/ocaml/curl
+%attr(755,root,root) %{_libdir}/ocaml/stublibs/dllcurl-helper.so
+%{_libdir}/ocaml/stublibs/dllcurl-helper.so.owner
%if %{with opt}
%exclude %{_libdir}/ocaml/curl/*.a
%exclude %{_libdir}/ocaml/curl/*.o
@@ -93,3 +87,4 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/ocaml/curl/*.cmxa
%endif
%{_libdir}/ocaml/curl/*.mli
+
diff --git a/ocurl-0.5.3-include-o-cmx.patch b/ocurl-0.5.3-include-o-cmx.patch
deleted file mode 100644
index b638104..0000000
--- a/ocurl-0.5.3-include-o-cmx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ocurl.old/Makefile.in 2009-11-07 21:05:52.000000000 +0000
-+++ ocurl/Makefile.in 2013-09-14 17:52:00.063133507 +0100
-@@ -70,7 +70,8 @@
- install:
- ifeq ($(FINDLIB),ocamlfind)
- ocamlfind install curl META $(wildcard *.cmi) \
-- $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
-+ $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa) \
-+ $(wildcard *.o) $(wildcard *.cmx)
- else
- mkdir -p $(INSTALLDIR)
- $(INSTALLDATA) curl.cma $(INSTALLDIR)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ocaml-ocurl.git/commitdiff/56573ec91436388ff7fe15d179a37821d8b07c89
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
