- New upstream version 1.1.0.

.gitignore

@@ -1 +1,2 @@
 ounit-1.0.3.tar.gz
+/ounit-1.1.0.tar.gz

ocaml-ounit.spec

@@ -2,14 +2,14 @@
 %define debug_package %{nil}
 
 Name:           ocaml-ounit
-Version:        1.0.3
-Release:        7%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 Summary:        Unit test framework for OCaml
 
 Group:          Development/Libraries
 License:        MIT
-URL:            http://www.xs4all.nl/~mmzeeman/ocaml/
-Source0:        http://www.xs4all.nl/~mmzeeman/ocaml/ounit-%{version}.tar.gz
+URL:            http://ounit.forge.ocamlcore.org/
+Source0:        https://forge.ocamlcore.org/frs/download.php/495/ounit-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
@@ -42,13 +42,11 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n ounit-%{version}
+sh ./configure --destdir $RPM_BUILD_ROOT
 
 
 %build
 make all
-%if %opt
-make allopt
-%endif
 make doc
 
 
@@ -58,11 +56,13 @@ make test
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 make install
 
+# Remove this, reinstall it properly with a %%doc rule below.
+rm -rf $RPM_BUILD_ROOT/usr/local/share/doc
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENCE
+%doc LICENSE.txt
 %{_libdir}/ocaml/oUnit
 %if %opt
 %exclude %{_libdir}/ocaml/oUnit/*.a
@@ -81,7 +81,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc LICENCE README doc
+%doc LICENSE.txt README.txt
+%doc _build/src/api-ounit.docdir/*
 %if %opt
 %{_libdir}/ocaml/oUnit/*.a
 %{_libdir}/ocaml/oUnit/*.cmxa
@@ -90,6 +91,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan  5 2011 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-1
+- New upstream version 1.1.0.
+- Project has moved to new upstream URL and Source0.
+- Rebuild for OCaml 3.12.0.
+- New build system:
+    + doesn't need 'make allopt'
+    + DESTDIR logic changed (see OASIS bug 852)
+    + docdir moved
+- LICENSE and README files renamed
+
 * Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.3-7
 - Rebuild for OCaml 3.11.2.
 

sources

@@ -1 +1 @@
-e0831c33cd18fdbf7615bb053e3792b9  ounit-1.0.3.tar.gz
+bf82bd7f8853cd9a1aff7be716192643  ounit-1.1.0.tar.gz