Hello community, here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2013-01-14 09:43:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml (Old) and /work/SRC/openSUSE:Factory/.ocaml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml/ocaml.changes 2012-06-29 10:42:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml.new/ocaml.changes 2013-01-14 09:43:25.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 2 17:06:58 CET 2013 - [email protected] + +- update specfile to handle disabled do_opt variable + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml.spec ++++++ --- /var/tmp/diff_new_pack.7U3jHR/_old 2013-01-14 09:43:27.000000000 +0100 +++ /var/tmp/diff_new_pack.7U3jHR/_new 2013-01-14 09:43:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ocaml # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Andrew Psaltis <ampsaltis at gmail dot com> # Copyright (c) 2011 Andrew Psaltis <ampsaltis at gmail dot com> # @@ -18,15 +18,13 @@ # - Name: ocaml Version: 3.12.1 Release: 0 %define doc_version 3.12 +%define do_opt 1 %ifarch s390 s390x %define do_opt 0 -%else -%define do_opt 1 %endif Source0: http://caml.inria.fr/pub/distrib/ocaml-%{doc_version}/ocaml-%{version}.tar.bz2 Source1: http://caml.inria.fr/pub/distrib/ocaml-%{doc_version}/ocaml-%{doc_version}-refman.html.tar.gz @@ -59,17 +57,11 @@ BuildRequires: binutils-devel Provides: ocaml(compiler) = %{version} Requires: ocaml-runtime = %{version} -#ExcludeArch: ppc64 - -%if 0%{?suse_version} <= 1140 -%define _use_internal_dependency_generator 1 -%endif # This ensures that the find_provides/find_requires calls ocamlobjinfo correctly. %global __ocaml_requires_opts -c -f "%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo" %global __ocaml_provides_opts -f "%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo" - %description Objective Caml is a high-level, strongly-typed, functional and object-oriented programming language from the ML family of languages. @@ -85,7 +77,6 @@ Group: Development/Languages/Other Provides: ocaml(runtime) = %{version} - %description runtime Objective Caml is a high-level, strongly-typed, functional and object-oriented programming language from the ML family of languages. @@ -100,7 +91,6 @@ Group: Development/Languages/Other Requires: ocaml = %{version}-%{release} - %description source Source code for Objective Caml libraries. @@ -111,7 +101,6 @@ Group: System/Libraries Requires: ocaml-runtime = %{version}-%{release} - %description x11 X11 support for Objective Caml. @@ -121,9 +110,8 @@ Summary: The Objective Caml Compiler and Programming Environment License: SUSE-LGPL-2.0-with-linking-exception Group: System/Libraries -Requires: ocaml(runtime) = %{version}-%{release} Requires: ocaml = %{version}-%{release} - +Requires: ocaml(runtime) = %{version}-%{release} %description labltk Labltk is a library for interfacing Objective Caml with the scripting @@ -137,12 +125,11 @@ Summary: Development files for labltk License: SUSE-LGPL-2.0-with-linking-exception Group: Development/Libraries/Other -Requires: ocaml = %{version}-%{release} Requires: %{name}-labltk = %{version}-%{release} -Requires: xorg-x11-libX11-devel +Requires: ocaml = %{version}-%{release} Requires: tcl-devel Requires: tk-devel - +Requires: xorg-x11-libX11-devel %description labltk-devel Labltk is a library for interfacing Objective Caml with the scripting @@ -159,7 +146,6 @@ Group: Development/Languages/Other Requires: ocaml-runtime = %{version}-%{release} - %description camlp4 Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml, parsing a source file and printing some result on standard output. @@ -171,12 +157,11 @@ Summary: Pre-Processor-Pretty-Printer for Objective Caml License: SUSE-LGPL-2.0-with-linking-exception Group: Development/Languages/Other -Requires: ocaml = %{version}-%{release} Requires: %{name}-camlp4 = %{version}-%{release} +Requires: ocaml = %{version}-%{release} Provides: camlp4 = %{version} Obsoletes: camlp4 < %{version} - %description camlp4-devel Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml, parsing a source file and printing some result on standard output. @@ -190,7 +175,6 @@ Group: Development/Languages/Other Requires: ocaml = %{version}-%{release} - %description ocamldoc Objective Caml is a high-level, strongly-typed, functional and object-oriented programming language from the ML family of languages. @@ -203,11 +187,10 @@ Summary: The Objective Caml Compiler and Programming Environment License: GPL-2.0+ Group: Development/Languages/Other -Requires: ocaml = %{version}-%{release} Requires: emacs +Requires: ocaml = %{version}-%{release} Provides: caml-mode - %description emacs Objective Caml is a high-level, strongly-typed, functional and object-oriented programming language from the ML family of languages. @@ -222,7 +205,6 @@ Group: Development/Languages/Other Requires: ocaml = %{version}-%{release} - %description docs Objective Caml is a high-level, strongly-typed, functional and object-oriented programming language from the ML family of languages. @@ -237,7 +219,6 @@ Group: Development/Libraries/Other Requires: ocaml = %{version}-%{release} - %description compiler-libs Objective Caml is a high-level, strongly-typed, functional and object-oriented programming language from the ML family of languages. @@ -252,7 +233,6 @@ Group: Development/Libraries/Other Requires: ocaml-compiler-libs = %{version}-%{release} - %description compiler-libs-devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. @@ -276,7 +256,6 @@ find -name ".cvsignore" | xargs -r rm -f - %build %ifarch %ix86 # Default OPT flags for these architectures use -fomit-frame-pointer, @@ -295,7 +274,6 @@ make world %endif - %install make install \ BINDIR="$RPM_BUILD_ROOT%{_bindir}" \ @@ -331,38 +309,38 @@ cp -a typing/ utils/ parsing/ $RPM_BUILD_ROOT%{_libdir}/ocaml/compiler-libs %fdupes $RPM_BUILD_ROOT - %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz - %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc Changes LICENSE README %{_bindir}/* %{_mandir}/*/* %{_libdir}/ocaml/*.a -%ifnarch %arm ppc +%if %{do_opt} +%ifarch %ix86 ppc64 x86_64 %{_libdir}/ocaml/*.cmxs %endif %{_libdir}/ocaml/*.cmxa %{_libdir}/ocaml/*.cmx -%{_libdir}/ocaml/*.mli %{_libdir}/ocaml/*.o +%endif +%{_libdir}/ocaml/*.mli %{_libdir}/ocaml/libcamlrun_shared.so %{_libdir}/ocaml/vmthreads/*.mli %{_libdir}/ocaml/vmthreads/*.a +%if %{do_opt} %{_libdir}/ocaml/threads/*.a %{_libdir}/ocaml/threads/*.cmxa %{_libdir}/ocaml/threads/*.cmx +%endif %{_libdir}/ocaml/caml %{_libdir}/ocaml/ocamlbuild %{_libdir}/ocaml/Makefile.config @@ -386,7 +364,6 @@ %exclude %{_libdir}/ocaml/ocamldoc %exclude %{_libdir}/ocaml/stublibs/dlllabltk.so - %files runtime %defattr(-,root,root,-) %{_bindir}/ocamlrun @@ -405,18 +382,15 @@ %exclude %{_libdir}/ocaml/stublibs/dlllabltk.so %doc README LICENSE Changes - %files x11 %defattr(-,root,root,-) %{_libdir}/ocaml/graphicsX11.cmi %{_libdir}/ocaml/graphicsX11.mli - %files source %defattr(-,root,root,-) %{_libdir}/ocaml/*.ml - %files labltk %defattr(-,root,root,-) %{_bindir}/labltk @@ -426,22 +400,22 @@ %{_libdir}/ocaml/labltk/*.cmo %{_libdir}/ocaml/stublibs/dlllabltk.so - %files labltk-devel %defattr(-,root,root,-) %{_bindir}/ocamlbrowser %{_libdir}/ocaml/labltk/labltktop %{_libdir}/ocaml/labltk/pp %{_libdir}/ocaml/labltk/tkcompiler +%if %{do_opt} %{_libdir}/ocaml/labltk/*.a %{_libdir}/ocaml/labltk/*.cmxa %{_libdir}/ocaml/labltk/*.cmx -%{_libdir}/ocaml/labltk/*.mli %{_libdir}/ocaml/labltk/*.o +%endif +%{_libdir}/ocaml/labltk/*.mli %doc otherlibs/labltk/examples_labltk %doc otherlibs/labltk/examples_camltk - %files camlp4 %defattr(-,root,root,-) %dir %{_libdir}/ocaml/camlp4 @@ -461,11 +435,11 @@ %{_libdir}/ocaml/camlp4/Camlp4Top/*.cmi %{_libdir}/ocaml/camlp4/Camlp4Top/*.cmo - %files camlp4-devel %defattr(-,root,root,-) %{_bindir}/camlp4* %{_bindir}/mkcamlp4 +%if %{do_opt} %{_libdir}/ocaml/camlp4/*.a %{_libdir}/ocaml/camlp4/*.cmxa %{_libdir}/ocaml/camlp4/*.cmx @@ -478,8 +452,7 @@ %{_libdir}/ocaml/camlp4/Camlp4Printers/*.o %{_libdir}/ocaml/camlp4/Camlp4Top/*.cmx %{_libdir}/ocaml/camlp4/Camlp4Top/*.o -#%%{_mandir}/man1/* - +%endif %files ocamldoc %defattr(-,root,root,-) @@ -487,12 +460,10 @@ %{_libdir}/ocaml/ocamldoc %doc ocamldoc/Changes.txt - %files docs %defattr(-,root,root,-) %doc htmlman - %files emacs %defattr(-,root,root,-) %doc emacs/README @@ -501,27 +472,25 @@ %{_datadir}/emacs/site-lisp/* %{_bindir}/ocamltags - %files compiler-libs %defattr(-,root,root,-) %doc LICENSE README %{_libdir}/ocaml/compiler-libs -#%%exclude %{_libdir}/ocaml/compiler-libs/*/*.cmo +%if %{do_opt} %exclude %{_libdir}/ocaml/compiler-libs/*/*.cmx -%exclude %{_libdir}/ocaml/compiler-libs/*/*.mli %exclude %{_libdir}/ocaml/compiler-libs/*/*.o +%endif +%exclude %{_libdir}/ocaml/compiler-libs/*/*.mli %exclude %{_libdir}/ocaml/compiler-libs/*/*.ml - %files compiler-libs-devel %defattr(-,root,root,-) %doc LICENSE README -#%%{_libdir}/ocaml/compiler-libs/*/*.cmo +%if %{do_opt} %{_libdir}/ocaml/compiler-libs/*/*.cmx -%{_libdir}/ocaml/compiler-libs/*/*.mli %{_libdir}/ocaml/compiler-libs/*/*.o +%endif %{_libdir}/ocaml/compiler-libs/*/*.ml - - +%{_libdir}/ocaml/compiler-libs/*/*.mli %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
