Hello community, here is the log from the commit of package ocaml checked in at Thu Aug 17 18:22:54 CEST 2006. -------- --- ocaml/ocaml.changes 2006-01-25 21:38:54.000000000 +0100 +++ ocaml/ocaml.changes 2006-08-17 17:37:05.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 17 17:37:00 CEST 2006 - cthiel@suse.de + +- fix build with X.Org 7.1 + +------------------------------------------------------------------- New: ---- ocaml-3.08.3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml.spec ++++++ --- /var/tmp/diff_new_pack.8Xz0Tb/_old 2006-08-17 18:21:33.000000000 +0200 +++ /var/tmp/diff_new_pack.8Xz0Tb/_new 2006-08-17 18:21:33.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package ocaml (Version 3.08.3) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,7 +16,7 @@ Group: Development/Languages/Other Autoreqprov: on Version: 3.08.3 -Release: 1 +Release: 14 %define doc_version 3.08 Source0: ftp://ftp.inria.fr/lang/caml-light/ocaml-%{version}.tar.bz2 Source1: ftp://ftp.inria.fr/lang/caml-light/ocaml-%{doc_version}-refman.html.tar.bz2 @@ -28,8 +28,9 @@ Patch3: ocaml-3.04-ia64.dif Patch4: ocaml-3.08.1-type_punning.patch Patch5: ocaml-3.08.3-gcc4.patch +Patch6: ocaml-3.08.3.patch URL: http://caml.inria.fr/ -Summary: The Objective Caml compiler and programming environment +Summary: The Objective Caml Compiler and Programming Environment BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %install_info_prereq @@ -38,7 +39,7 @@ object-oriented programming language from the ML family of languages. This package comprises two batch compilers (a fast bytecode compiler -and an optimizing native-code compiler), an interactive toplevel +and an optimizing native-code compiler), an interactive top level system, Lex&Yacc tools, a replay debugger, and a comprehensive library. @@ -58,6 +59,7 @@ %patch3 %patch4 %patch5 +%patch6 %build cp -f /usr/share/libtool/config.guess config/gnu/ @@ -67,7 +69,9 @@ %endif ./configure -bindir %{_bindir} \ -libdir %{_libdir}/ocaml \ - -mandir %{_mandir} + -mandir %{_mandir} \ + -x11include %{_includedir}/X11 \ + -x11lib %{_libdir}/X11 flag=$(echo %{optflags} | sed 's/-fomit-frame-pointer//') %ifarch s390 s390x ppc64 make BYTECCCOMPOPTS="$flag -fno-defer-pop -fno-strict-aliasing" \ @@ -112,7 +116,7 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %clean -[ "$RPM_BUILD_ROOT" != "/" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) @@ -126,6 +130,8 @@ %{_datadir}/emacs/site-lisp/* %changelog -n ocaml +* Thu Aug 17 2006 - cthiel@suse.de +- fix build with X.Org 7.1 * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Thu May 12 2005 - ro@suse.de ++++++ ocaml-3.08.3.patch ++++++ --- Makefile +++ Makefile @@ -577,7 +577,7 @@ otherlibraries: for i in $(OTHERLIBRARIES); do \ - (cd otherlibs/$$i; $(MAKE) RUNTIME=$(RUNTIME) all) || exit $$?; \ + (cd otherlibs/$$i; $(MAKE) depend; $(MAKE) RUNTIME=$(RUNTIME) all) || exit $$?; \ done otherlibrariesopt: for i in $(OTHERLIBRARIES); do \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org