Hello community,

here is the log from the commit of package ocaml for openSUSE:Factory checked 
in at 2018-04-06 17:46:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml (Old)
 and      /work/SRC/openSUSE:Factory/.ocaml.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ocaml"

Fri Apr  6 17:46:23 2018 rev:63 rq:593823 version:4.05.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml/ocaml.changes      2017-08-21 
11:34:55.476047236 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml.new/ocaml.changes 2018-04-06 
17:46:36.677854350 +0200
@@ -1,0 +2,19 @@
+Wed Apr  4 09:20:09 UTC 2018 - kstreit...@suse.com
+
+- run spec-cleaner
+- update URL to www.ocaml.org
+- the language is officially called OCaml and not Objective Caml,
+  rename it in summaries and descriptions
+- tweak summaries and descriptions
+- remove definition of %{_rpmconfigdir} macro - it should be
+  defined on all distros by default now
+
+-------------------------------------------------------------------
+Wed Apr  4 06:57:00 UTC 2018 - oher...@suse.de
+
+- Remove info and html documentation because it is not as free
+  as it should be. Drop ocaml-docs package. (bsc#1080640)
+- adjust ocaml-3.09-emacs_localcompile.patch and
+  ocaml-3.08.3-gcc4.patch for autosetup
+
+-------------------------------------------------------------------

Old:
----
  ocaml-4.05-refman-html.tar.xz
  ocaml-4.05-refman.info.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ocaml.spec ++++++
--- /var/tmp/diff_new_pack.ws1Rmw/_old  2018-04-06 17:46:37.437826883 +0200
+++ /var/tmp/diff_new_pack.ws1Rmw/_new  2018-04-06 17:46:37.441826739 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ocaml
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Andrew Psaltis <ampsaltis at gmail dot com>
 # Copyright (c) 2011 Andrew Psaltis <ampsaltis at gmail dot com>
 #
@@ -36,7 +36,7 @@
 %define do_opt 1
 %endif
 %if %{without ocaml_force_enable_ocaml_opt}
-%ifarch %arm aarch64 %ix86 ppc ppc64 ppc64le s390x x86_64
+%ifarch %{arm} aarch64 %{ix86} ppc ppc64 ppc64le s390x x86_64
 %define do_opt 1
 %endif
 %endif
@@ -47,17 +47,13 @@
 Name:           ocaml
 Version:        4.05.0
 Release:        0
-Summary:        The Objective Caml Compiler and Programming Environment
-License:        QPL-1.0 and SUSE-LGPL-2.0-with-linking-exception
+Summary:        OCaml Compiler and Programming Environment
+License:        QPL-1.0 AND SUSE-LGPL-2.0-with-linking-exception
 Group:          Development/Languages/OCaml
-Url:            http://caml.inria.fr/
-#
-# http://caml.inria.fr/pub/distrib/
+Url:            http://www.ocaml.org
 Source0:        
http://caml.inria.fr/pub/distrib/ocaml-%{ocaml_base_version}/ocaml-%{version}.tar.xz
 Source1:        ocaml-findlib.rpm.prov_req.attr.sh
-Source2:        ocaml-%{ocaml_base_version}-refman-html.tar.xz
-Source3:        ocaml-%{ocaml_base_version}-refman.info.tar.xz
-Source4:        rpmlintrc
+Source2:        rpmlintrc
 Patch0:         ocaml-3.00-camldebug_el.patch
 Patch1:         ocamldoc-man-th.patch
 Patch2:         ocaml-3.04-ocamltags--no-site-start.patch
@@ -70,22 +66,20 @@
 BuildRequires:  emacs-nox
 BuildRequires:  fdupes
 BuildRequires:  ncurses-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(x11)
-Requires(post): %{install_info_prereq}
-Requires(pre):  %{install_info_prereq}
+Requires:       ocaml(runtime) = %{version}-%{release}
+Obsoletes:      ocaml-docs
 Provides:       ocaml(compiler) = %{version}
 Provides:       ocaml(ocaml_base_version) = %{ocaml_base_version}
-Requires:       ocaml(runtime) = %{version}-%{release}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{do_opt}
 Requires:       gcc
 Provides:       ocaml(ocaml.opt) = %{version}
 %endif
 
 %description
-Objective Caml is a high-level, strongly-typed, functional and
-object-oriented programming language from the ML family of languages.
+OCaml is a high-level, strongly-typed, functional and 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 top level
@@ -93,55 +87,65 @@
 
 %package       rpm-macros
 Summary:        RPM macros for building OCaml source packages
-License:        QPL-1.0 and SUSE-LGPL-2.0-with-linking-exception
+License:        QPL-1.0 AND SUSE-LGPL-2.0-with-linking-exception
 Group:          Development/Languages/OCaml
 
 %description       rpm-macros
-A set of helper macros to unify common code used in ocaml spec files.
+OCaml is a high-level, strongly-typed, functional and object-oriented
+programming language from the ML family of languages.
+
+This package contains a set of helper macros to unify common code used
+in ocaml spec files.
 
 %package runtime
-Summary:        The Objective Caml Compiler and Programming Environment
+Summary:        OCaml runtime environment
 License:        QPL-1.0
 Group:          Development/Languages/OCaml
 Provides:       ocaml(runtime) = %{version}-%{release}
 
 %description runtime
-Objective Caml is a high-level, strongly-typed, functional and
-object-oriented programming language from the ML family of languages.
+OCaml is a high-level, strongly-typed, functional and object-oriented
+programming language from the ML family of languages.
 
-This package contains the runtime environment needed to run Objective
-Caml bytecode.
+This package contains the runtime environment needed to run OCaml
+bytecode.
 
 %package source
-Summary:        Source code for Objective Caml libraries
-License:        QPL-1.0 and SUSE-LGPL-2.0-with-linking-exception
+Summary:        Source code for OCaml libraries
+License:        QPL-1.0 AND SUSE-LGPL-2.0-with-linking-exception
 Group:          Development/Languages/OCaml
 
 %description source
-Source code for Objective Caml libraries.
+OCaml is a high-level, strongly-typed, functional and object-oriented
+programming language from the ML family of languages.
+
+This package contains source code for OCaml libraries.
 
 %package x11
-Summary:        X11 support for Objective Caml
+Summary:        X11 support for OCaml
 License:        SUSE-LGPL-2.0-with-linking-exception
 Group:          Development/Languages/OCaml
 
 %description x11
-X11 support for Objective Caml.
+OCaml is a high-level, strongly-typed, functional and object-oriented
+programming language from the ML family of languages.
+
+This package contains X11 support for OCaml.
 
 %package ocamldoc
-Summary:        The Objective Caml Compiler and Programming Environment
+Summary:        Documentation generator for OCaml
 License:        QPL-1.0
 Group:          Development/Languages/OCaml
 Requires:       ocaml = %{version}
 
 %description ocamldoc
-Objective Caml is a high-level, strongly-typed, functional and
-object-oriented programming language from the ML family of languages.
+OCaml is a high-level, strongly-typed, functional and object-oriented
+programming language from the ML family of languages.
 
-This package contains a documentation generator for Objective Caml.
+This package contains a documentation generator for OCaml.
 
 %package emacs
-Summary:        The Objective Caml Compiler and Programming Environment
+Summary:        Emacs mode for OCaml
 License:        GPL-2.0+
 Group:          Development/Languages/OCaml
 Requires:       emacs
@@ -149,34 +153,20 @@
 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.
+OCaml is a high-level, strongly-typed, functional and object-oriented
+programming language from the ML family of languages.
 
-This package provides caml-mode for emacs
-
-%package docs
-Summary:        The Objective Caml Compiler and Programming Environment
-License:        GPL-2.0+ and QPL-1.0
-Group:          Development/Languages/OCaml
-Requires:       ocaml = %{version}
-
-%description docs
-Objective Caml is a high-level, strongly-typed, functional and
-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 top level
-system, Lex&Yacc tools, a replay debugger, and a comprehensive library.
+This package provides Emacs mode for OCaml.
 
 %package compiler-libs
-Requires:       ncurses-devel
 Summary:        Libraries used internal to the OCaml Compiler
 License:        QPL-1.0
 Group:          Development/Languages/OCaml
+Requires:       ncurses-devel
 
 %description compiler-libs
-Objective Caml is a high-level, strongly-typed, functional and
-object-oriented programming language from the ML family of languages.
+OCaml is a high-level, strongly-typed, functional and object-oriented
+programming language from the ML family of languages.
 
 This package contains several modules used internally by the OCaml
 compilers. They are not needed for normal OCaml development, but may
@@ -189,21 +179,18 @@
 Requires:       ocaml-compiler-libs = %{version}
 
 %description compiler-libs-devel
-The %{name}-devel package contains libraries and signature files for
-developing applications that use %{name}.
+OCaml is a high-level, strongly-typed, functional and object-oriented
+programming language from the ML family of languages.
+
+This package contains libraries and signature files for developing
+applications that use Ocaml.
 
 %prep
 : do_opt %{do_opt}
-%setup -q -a 2 -a 3
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch4 -p1
-%patch5
-%patch7
+%autosetup -p1
 
 %build
-%ifarch %ix86
+%ifarch %{ix86}
 # Default OPT flags for these architectures use -fomit-frame-pointer,
 # which gets in the way of some of the profiling done within.
 OUR_OPT_FLAGS="`echo '%{optflags}' | sed 's/-fomit-frame-pointer//g'`"
@@ -218,9 +205,12 @@
             -mandir %{_mandir} \
             -x11include %{_includedir} \
             -x11lib %{_libdir}
+
 %if %{do_opt}
+# build using native-code compilers (equivalent to `make world opt opt.opt`)
 make world.opt \
 %else
+# build bytecode compiler
 make world \
 %endif
        BYTECCRPATH= \
@@ -229,7 +219,7 @@
 
 %install
 make install \
-     DESTDIR="%{buildroot}"
+     DESTDIR=%{buildroot}
 
 if test -f %{buildroot}%{_libdir}/ocaml/libasmrun_pic.a
 then
@@ -238,18 +228,11 @@
        %{buildroot}%{_libdir}/ocaml/libasmrun_pic.a \
        %{buildroot}%{_libdir}/ocaml/libasmrun.a
 fi
-export EMACS_SITE_LISP=%{_datadir}/emacs/site-lisp
-install -d %{buildroot}%{_infodir} \
-           %{buildroot}${EMACS_SITE_LISP}
-(
-  cd emacs
+EMACS_SITE_LISP=%{_datadir}/emacs/site-lisp
+pushd emacs
   make install DESTDIR=%{buildroot} EMACSDIR=%{buildroot}${EMACS_SITE_LISP}
   make install-ocamltags SCRIPTDIR=%{buildroot}${EMACS_SITE_LISP}
-)
-
-(
-  cd infoman; cp -f ocaml* %{buildroot}%{_infodir}
-)
+popd
 
 # fix bnc#411232
 echo '(load "ocaml.el" nil t t)' 
>%{buildroot}${EMACS_SITE_LISP}/suse-start-ocaml.el
@@ -291,6 +274,7 @@
        -name '*.sml' \
        \) -type f -exec chmod -v a-x "{}" \;
 
+# install OCaml macros
 mkdir -vp %{buildroot}%{_sysconfdir}/rpm
 tee %{buildroot}%{_sysconfdir}/rpm/macros.%{name} <<'_EOF_'
 # get rid of /usr/lib/rpm/find-debuginfo.sh
@@ -357,7 +341,7 @@
        --sbindir        %%{_sbindir} \\\
        --prefix         %%{_prefix} \\\
        --sysconfdir     %%{_sysconfdir} \\\
-       --exec-prefix    %%{_exec_prefix} \\\
+       --exec-prefix    %%{_prefix} \\\
        --sharedstatedir %%{_sharedstatedir}
 #
 %%ocaml_oasis_build \
@@ -376,11 +360,7 @@
 #
 #
 _EOF_
-#
-%if "%{?_rpmconfigdir}" == ""
-%define _rpmconfigdir /usr/lib/rpm
-%endif
-: _rpmconfigdir %{_rpmconfigdir}
+
 tag="ocamlfind"
 mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs
 tee %{buildroot}%{_rpmconfigdir}/fileattrs/${tag}.attr <<_EOF_
@@ -389,16 +369,9 @@
 %__${tag}_path     ^%%{_libdir}/ocaml/.*/META$|^%%{_libdir}/ocaml/META$
 _EOF_
 #
-tee %{buildroot}%{_rpmconfigdir}/${tag}.sh < %{S:1}
-
-%post
-%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
-
-%postun
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
+tee %{buildroot}%{_rpmconfigdir}/${tag}.sh < %{SOURCE1}
 
 %files
-%defattr(-,root,root)
 %doc Changes LICENSE
 %{_rpmconfigdir}/fileattrs
 %attr(755,root,root) %{_rpmconfigdir}/*.sh
@@ -433,18 +406,15 @@
 %{_libdir}/ocaml/ld.conf
 %{_libdir}/ocaml/objinfo_helper
 %exclude %{_libdir}/ocaml/graphicsX11.mli
-%{_infodir}/*
 %exclude %{_bindir}/ocamlrun
 %exclude %{_bindir}/ocamldoc*
 %exclude %{_libdir}/ocaml/ocamldoc
 
 %files rpm-macros
-%defattr(-,root,root,-)
 %dir %{_sysconfdir}/rpm
 %config %{_sysconfdir}/rpm/*
 
 %files runtime
-%defattr(-,root,root,-)
 %{_bindir}/ocamlrun
 %dir %{_libdir}/ocaml
 %{_libdir}/ocaml/*.cmo
@@ -465,33 +435,24 @@
 %doc LICENSE Changes
 
 %files x11
-%defattr(-,root,root,-)
 %{_libdir}/ocaml/graphicsX11.cmi
 %{_libdir}/ocaml/graphicsX11.mli
 
 %files source
-%defattr(-,root,root,-)
 %{_libdir}/ocaml/*.ml
 
 %files ocamldoc
-%defattr(-,root,root,-)
 %{_bindir}/ocamldoc*
 %{_libdir}/ocaml/ocamldoc
 %doc ocamldoc/Changes.txt
 
-%files docs
-%defattr(-,root,root,-)
-%doc htmlman
-
 %files emacs
-%defattr(-,root,root,-)
 %doc emacs/README
 %dir %{_datadir}/emacs
 %dir %{_datadir}/emacs/site-lisp
 %{_datadir}/emacs/site-lisp/*
 
 %files compiler-libs
-%defattr(-,root,root,-)
 %doc LICENSE
 %{_libdir}/ocaml/compiler-libs
 %if %{do_opt}
@@ -505,7 +466,6 @@
 %exclude %{_libdir}/ocaml/compiler-libs/*/*.ml
 
 %files compiler-libs-devel
-%defattr(-,root,root,-)
 %doc LICENSE
 %if %{do_opt}
 %{_libdir}/ocaml/compiler-libs/*.cmx

++++++ ocaml-3.08.3-gcc4.patch ++++++
--- /var/tmp/diff_new_pack.ws1Rmw/_old  2018-04-06 17:46:37.485825148 +0200
+++ /var/tmp/diff_new_pack.ws1Rmw/_new  2018-04-06 17:46:37.485825148 +0200
@@ -1,6 +1,6 @@
 +- reduce register pressure in bng_ia32.c (thanks to matz)
---- otherlibs/num/bng_ia32.c
-+++ otherlibs/num/bng_ia32.c
+--- a/otherlibs/num/bng_ia32.c
++++ b/otherlibs/num/bng_ia32.c
 @@ -121,7 +121,7 @@
          "leal 4(%1), %1 \n\t"
          "decl %2 \n\t"

++++++ ocaml-3.09-emacs_localcompile.patch ++++++
--- /var/tmp/diff_new_pack.ws1Rmw/_old  2018-04-06 17:46:37.501824571 +0200
+++ /var/tmp/diff_new_pack.ws1Rmw/_new  2018-04-06 17:46:37.501824571 +0200
@@ -1,5 +1,5 @@
---- emacs/Makefile
-+++ emacs/Makefile
+--- a/emacs/Makefile
++++ b/emacs/Makefile
 @@ -19,6 +19,10 @@
        inf-caml.el caml-compat.el caml-help.el caml-types.el \
        caml-xemacs.el caml-emacs.el


Reply via email to