- New upstream version 3.0.2.

- Fix URL and source URL.
- Rebase Display->Livdisplay patch.
- Remove png check CVE patch (now upstream).
- RETAIN tiff check CVE patch (NOT upstream).
- Replace %%define with %%global.
- Use upstream RPM 4.8 OCaml dependency generator.
- Fix configure.ac, also we now BR ocaml-autoconf.
- Recheck package with rpmlint: . Strip dllcamlimages_core.so
This commit is contained in:
Richard W.M. Jones 2010-01-12 15:33:08 +00:00
parent 35ddec975f
commit ec685a98a9
2 changed files with 16 additions and 1 deletions

View File

@ -0,0 +1,12 @@
--- camlimages-3.0.2/configure.ac 2009-10-26 12:42:04.000000000 +0000
+++ camlimages-3.0.2.autoconf/configure.ac 2010-01-12 15:23:49.179300765 +0000
@@ -4,8 +4,7 @@
AM_INIT_AUTOMAKE([foreign])
# Check ocaml
-AC_PROG_OCAML([3.08])
-AC_PROG_OCAML_TOOL(OCAMLMKLIB, ocamlmklib)
+AC_PROG_OCAML
AC_SUBST(OCAMLLIB)
# Check versions to build

View File

@ -90,7 +90,8 @@ make
rm -rf $RPM_BUILD_ROOT
make install ocamlsitelibdir=%{_libdir}/ocaml/camlimages DESTDIR=$RPM_BUILD_ROOT
strip $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dllcamlimages.so
strip $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dllcamlimages.so \
$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dllcamlimages_core.so
%clean
@ -129,6 +130,8 @@ rm -rf $RPM_BUILD_ROOT
- Replace %%define with %%global.
- Use upstream RPM 4.8 OCaml dependency generator.
- Fix configure.ac, also we now BR ocaml-autoconf.
- Recheck package with rpmlint:
. Strip dllcamlimages_core.so
* Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 3.0.1-15
- Rebuild for OCaml 3.11.2.