Author: rjones
Update of /cvs/pkgs/rpms/ocaml-fileutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9773
Modified Files:
ocaml-fileutils.spec
Log Message:
Backport fileutils 0.4.0 from Rawhide to Fedora 12.
Index: ocaml-fileutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-fileutils/F-12/ocaml-fileutils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocaml-fileutils.spec 25 Jul 2009 19:56:44 -0000 1.9
+++ ocaml-fileutils.spec 30 Dec 2009 17:38:31 -0000 1.10
@@ -2,14 +2,14 @@
%define debug_package %{nil}
Name: ocaml-fileutils
-Version: 0.3.0
-Release: 11%{?dist}
+Version: 0.4.0
+Release: 1%{?dist}.1
Summary: OCaml library for common file and filename operations
Group: Development/Libraries
License: LGPLv2 with exceptions
URL: http://www.gallu.homelinux.org/download/
-Source0: http://www.gallu.homelinux.org/download/ocaml-fileutils-0.3.0.tar.gz
+Source0: http://www.gallu.homelinux.org/download/ocaml-fileutils-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x
@@ -17,6 +17,7 @@ BuildRequires: ocaml
BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-camlp4-devel
+BuildRequires: ocaml-ounit-devel
%define _use_internal_dependency_generator 0
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
@@ -46,29 +47,26 @@ developing applications that use %{name}
%prep
%setup -q
-# The whole build system for this package is totally broken.
-# We build into a temporary directory then copy the files
-# to the right place.
-./configure --prefix=%{_prefix} --libdir=%{_libdir} \
- --enable-ocamlfind \
- --with-builddir=`pwd`/tmp
+%configure
%build
-# Nothing: 'make' builds and installs. Stupid!
+make
%install
-# Go and do your broken stuff now ...
-rm -rf tmp
-make
-# make doc (borked)
-
-# ... and copy the files to the right places.
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml
-cp -r tmp/lib/fileutils $RPM_BUILD_ROOT%{_libdir}/ocaml
-rm -rf tmp
+export DESTDIR=$RPM_BUILD_ROOT
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
+
+# Set htmldir to current directory, then copy the docs (in api/)
+# as a %doc rule.
+make htmldir=. install
+
+
+%check
+make test
%clean
@@ -81,20 +79,29 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/ocaml/fileutils
%if %opt
%exclude %{_libdir}/ocaml/fileutils/*.a
+%exclude %{_libdir}/ocaml/fileutils/*.cmx
%exclude %{_libdir}/ocaml/fileutils/*.cmxa
%endif
+%exclude %{_libdir}/ocaml/fileutils/*.ml
+%exclude %{_libdir}/ocaml/fileutils/*.mli
%files devel
%defattr(-,root,root,-)
-%doc COPYING AUTHOR CHANGELOG README TODO
+%doc COPYING AUTHOR CHANGELOG README TODO api
%if %opt
%{_libdir}/ocaml/fileutils/*.a
+%{_libdir}/ocaml/fileutils/*.cmx
%{_libdir}/ocaml/fileutils/*.cmxa
%endif
+%{_libdir}/ocaml/fileutils/*.ml
+%{_libdir}/ocaml/fileutils/*.mli
%changelog
+* Wed Dec 30 2009 Richard W.M. Jones <rjones@xxxxxxxxxx> - 0.4.0-1.fc12.1
+- Backport fileutils 0.4.0 from Rawhide to Fedora 12.
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.3.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
_______________________________________________
Fedora-ocaml-list mailing list
Fedora-ocaml-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-ocaml-list
