Author: rjones
Update of /cvs/pkgs/rpms/ocaml-camlimages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7763
Modified Files:
ocaml-camlimages.spec
Added Files:
camlimages-3.0.2-ocaml-autoconf.patch
Log Message:
* Tue Jan 12 2010 Richard W.M. Jones <rjones@xxxxxxxxxx> - 3.0.2-1
- 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
camlimages-3.0.2-ocaml-autoconf.patch:
configure.ac | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE camlimages-3.0.2-ocaml-autoconf.patch ---
--- 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
Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/devel/ocaml-camlimages.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ocaml-camlimages.spec 12 Jan 2010 15:29:30 -0000 1.24
+++ ocaml-camlimages.spec 12 Jan 2010 15:33:08 -0000 1.25
@@ -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@xxxxxxxxxx> - 3.0.1-15
- Rebuild for OCaml 3.11.2.
_______________________________________________
ocaml-devel mailing list
ocaml-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/ocaml-devel
