commit ocaml-camlp4 for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-camlp4 for openSUSE:Factory
checked in at 2020-02-26 15:01:26
Comparing /work/SRC/openSUSE:Factory/ocaml-camlp4 (Old)
and /work/SRC/openSUSE:Factory/.ocaml-camlp4.new.26092 (New)
Package is "ocaml-camlp4"
Wed Feb 26 15:01:26 2020 rev:7 rq:778050 version:4.05
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-camlp4/ocaml-camlp4.changes
2019-11-30 10:36:33.188178158 +0100
+++ /work/SRC/openSUSE:Factory/.ocaml-camlp4.new.26092/ocaml-camlp4.changes
2020-02-26 15:01:30.288767204 +0100
@@ -1,0 +2,10 @@
+Thu Feb 20 20:20:20 UTC 2020 - oher...@suse.de
+
+- Fix inconsistent packaging
+ Move everything into the devel subpkg The binaries are already
+ in the devel subpkg, but they need libs from the main pkg. With
+ the update Requires/Provides both pkgs provide identical strings,
+ which leads to conflicts
+- Require current ocaml-rpm-macros
+
+---
Other differences:
--
++ ocaml-camlp4.spec ++
--- /var/tmp/diff_new_pack.4IJyAY/_old 2020-02-26 15:01:31.468769558 +0100
+++ /var/tmp/diff_new_pack.4IJyAY/_new 2020-02-26 15:01:31.468769558 +0100
@@ -26,11 +26,11 @@
Url:https://github.com/ocaml/camlp4
Source: %{name}-%{version}.tar.xz
BuildRequires: ocaml-ocamlbuild
-BuildRequires: ocaml-rpm-macros >= 20191101
+BuildRequires: ocaml-rpm-macros >= 20200220
BuildRequires: ocaml(ocaml_base_version) = 4.05
BuildRequires: ocamlfind(compiler-libs)
Conflicts: ocaml < 4.05.0
-Requires: ocaml-runtime = 4.05.0
+Requires: ocaml(ocaml_base_version) = 4.05
%description
Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml, parsing a
@@ -68,7 +68,7 @@
%install
%make_install
-d="%{buildroot}$(ocamlc -where)/camlp4"
+d="%{buildroot}%{ocaml_standard_library}/camlp4"
tee "${d}/META" <<_META_
# Specifications for the "camlp4" preprocessor:
requires = ""
@@ -215,44 +215,12 @@
archive(native) = "camlp4prof.cmx"
)
_META_
+%ocaml_create_file_list
-%files
-%doc LICENSE README.md
-%dir %{_libdir}/ocaml/camlp4
-%dir %{_libdir}/ocaml/camlp4/Camlp4Filters
-%dir %{_libdir}/ocaml/camlp4/Camlp4Parsers
-%dir %{_libdir}/ocaml/camlp4/Camlp4Printers
-%dir %{_libdir}/ocaml/camlp4/Camlp4Top
-%{_libdir}/ocaml/camlp4/*.cma
-%{_libdir}/ocaml/camlp4/*.cmi
-%{_libdir}/ocaml/camlp4/*.cmo
-%{_libdir}/ocaml/camlp4/Camlp4Filters/*.cmi
-%{_libdir}/ocaml/camlp4/Camlp4Filters/*.cmo
-%{_libdir}/ocaml/camlp4/Camlp4Parsers/*.cmi
-%{_libdir}/ocaml/camlp4/Camlp4Parsers/*.cmo
-%{_libdir}/ocaml/camlp4/Camlp4Printers/*.cmi
-%{_libdir}/ocaml/camlp4/Camlp4Printers/*.cmo
-%{_libdir}/ocaml/camlp4/Camlp4Top/*.cmi
-%{_libdir}/ocaml/camlp4/Camlp4Top/*.cmo
-
-%files devel
-%{_bindir}/camlp4*
-%{_bindir}/mkcamlp4
-%dir %{_libdir}/ocaml/camlp4
-%{_libdir}/ocaml/camlp4/META
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/camlp4/*.a
-%{_libdir}/ocaml/camlp4/*.cmx
-%{_libdir}/ocaml/camlp4/*.cmxa
-%{_libdir}/ocaml/camlp4/*.o
-%{_libdir}/ocaml/camlp4/Camlp4Filters/*.cmx
-%{_libdir}/ocaml/camlp4/Camlp4Filters/*.o
-%{_libdir}/ocaml/camlp4/Camlp4Parsers/*.cmx
-%{_libdir}/ocaml/camlp4/Camlp4Parsers/*.o
-%{_libdir}/ocaml/camlp4/Camlp4Printers/*.cmx
-%{_libdir}/ocaml/camlp4/Camlp4Printers/*.o
-%{_libdir}/ocaml/camlp4/Camlp4Top/*.cmx
-%{_libdir}/ocaml/camlp4/Camlp4Top/*.o
-%endif
+%files -f %{name}.files
+%doc README.md
+
+%files devel -f %{name}.files.devel
+%{_bindir}/*
%changelog
commit ocaml-camlp4 for openSUSE:Factory
Hello community, here is the log from the commit of package ocaml-camlp4 for openSUSE:Factory checked in at 2019-11-30 10:35:50 Comparing /work/SRC/openSUSE:Factory/ocaml-camlp4 (Old) and /work/SRC/openSUSE:Factory/.ocaml-camlp4.new.26869 (New) Package is "ocaml-camlp4" Sat Nov 30 10:35:50 2019 rev:6 rq:750771 version:4.05 Changes: --- /work/SRC/openSUSE:Factory/ocaml-camlp4/ocaml-camlp4.changes 2019-11-07 23:14:36.404408613 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-camlp4.new.26869/ocaml-camlp4.changes 2019-11-30 10:36:33.188178158 +0100 @@ -1,0 +2,5 @@ +Mon Nov 25 12:34:56 UTC 2019 - oher...@suse.de + +- Add compiler-libs-devel to BuildRequires (bsc#1156934) + +--- Other differences: -- ++ ocaml-camlp4.spec ++ --- /var/tmp/diff_new_pack.y5qrZw/_old 2019-11-30 10:36:34.544177996 +0100 +++ /var/tmp/diff_new_pack.y5qrZw/_new 2019-11-30 10:36:34.544177996 +0100 @@ -28,6 +28,7 @@ BuildRequires: ocaml-ocamlbuild BuildRequires: ocaml-rpm-macros >= 20191101 BuildRequires: ocaml(ocaml_base_version) = 4.05 +BuildRequires: ocamlfind(compiler-libs) Conflicts: ocaml < 4.05.0 Requires: ocaml-runtime = 4.05.0
commit ocaml-camlp4 for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-camlp4 for openSUSE:Factory
checked in at 2019-11-07 23:14:33
Comparing /work/SRC/openSUSE:Factory/ocaml-camlp4 (Old)
and /work/SRC/openSUSE:Factory/.ocaml-camlp4.new.2990 (New)
Package is "ocaml-camlp4"
Thu Nov 7 23:14:33 2019 rev:5 rq:745388 version:4.05
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-camlp4/ocaml-camlp4.changes
2017-08-18 15:02:53.790889345 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-camlp4.new.2990/ocaml-camlp4.changes
2019-11-07 23:14:36.404408613 +0100
@@ -1,0 +2,8 @@
+Fri Nov 1 12:34:56 UTC 2019 - oher...@suse.de
+
+- Require current rpm macros
+- Require exact ocaml(ocaml_base_version)
+- Provide ocamlfind() via private META files, copied from findlib
+- Use _service file
+
+---
Old:
camlp4-4.05-1.tar.xz
New:
_service
ocaml-camlp4-4.05.tar.xz
Other differences:
--
++ ocaml-camlp4.spec ++
--- /var/tmp/diff_new_pack.Ddtt8K/_old 2019-11-07 23:14:36.832409082 +0100
+++ /var/tmp/diff_new_pack.Ddtt8K/_new 2019-11-07 23:14:36.840409090 +0100
@@ -24,13 +24,12 @@
License:SUSE-LGPL-2.0-with-linking-exception
Group: Development/Languages/OCaml
Url:https://github.com/ocaml/camlp4
-Source: camlp4-%{version}-1.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Source: %{name}-%{version}.tar.xz
BuildRequires: ocaml-ocamlbuild
-BuildRequires: ocaml-rpm-macros >= 4.05.0
+BuildRequires: ocaml-rpm-macros >= 20191101
BuildRequires: ocaml(ocaml_base_version) = 4.05
Conflicts: ocaml < 4.05.0
-Requires: ocaml-runtime >= 4.05.0
+Requires: ocaml-runtime = 4.05.0
%description
Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml, parsing a
@@ -38,7 +37,6 @@
This package contains the runtime files.
-
%package devel
Summary:Pre-Processor-Pretty-Printer for Objective Caml
Group: Development/Languages/OCaml
@@ -54,7 +52,7 @@
This package contains the development files.
%prep
-%setup -q -n camlp4-%{version}-1
+%autosetup -p1
%build
./configure
@@ -68,10 +66,156 @@
%endif
%install
-make install DESTDIR=%{buildroot} %{?_smp_mflags}
+%make_install
+d="%{buildroot}$(ocamlc -where)/camlp4"
+tee "${d}/META" <<_META_
+# Specifications for the "camlp4" preprocessor:
+requires = ""
+version = "%{name} %{version}"
+description = "Base for Camlp4 syntax extensions"
+directory = "+camlp4"
+
+# For the toploop:
+requires(byte,toploop) = "dynlink"
+archive(byte,toploop,camlp4o) = "camlp4o.cma"
+archive(byte,toploop,camlp4r) = "camlp4r.cma"
+
+# For the preprocessor itself:
+archive(syntax,preprocessor,camlp4o) = "-parser o -parser op -printer p"
+archive(syntax,preprocessor,camlp4r) = "-parser r -parser rp -printer p"
+preprocessor = "camlp4"
+
+package "lib" (
+ requires = "camlp4 dynlink"
+ version = "%{name} %{version}"
+ description = "Camlp4 library"
+ archive(byte) = "camlp4lib.cma"
+ archive(byte,toploop) = "" # already contained in camlp4*.cma
+ archive(native) = "camlp4lib.cmxa"
+)
+
+package "gramlib" (
+ requires = "camlp4.lib"
+ version = "%{name} %{version}"
+ description = "Compatibilty name for camlp4.lib"
+)
+
+# dont use camlp4.lib and camlp4.fulllib together'
+package "fulllib" (
+ requires = "camlp4 dynlink"
+ version = "%{name} %{version}"
+ description = "Camlp4 library"
+ error(pkg_camlp4.lib) = "camlp4.lib and camlp4.fulllib are incompatible"
+ archive(byte) = "camlp4fulllib.cma"
+ archive(byte,toploop) = "" # already contained in camlp4*.cma
+ archive(native) = "camlp4fulllib.cmxa"
+)
+
+package "quotations" (
+ version = "%{name} %{version}"
+ description = "Syntax extension: Quotations to create AST nodes"
+ requires = "camlp4.quotations.r" # backward compat
+ archive(syntax,preprocessor) = "-ignore foo"
+ package "o" (
+requires = "camlp4"
+version = "%{name} %{version}"
+description = "Syntax extension: Quotations to create AST nodes (original
syntax)"
+archive(syntax,preprocessor) = "-parser Camlp4QuotationCommon -parser
Camlp4OCamlOriginalQuotationExpander"
+archive(syntax,toploop) = "Camlp4Parsers/Camlp4QuotationCommon.cmo
Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmo"
+ )
+ package "r" (
+requires = "camlp4"
+version = "%{name} %{version}"
+description = "Syntax extension: Quotations to create AST nodes (revised
syntax)"
+archive(syntax,preprocessor) = "-parser Camlp4QuotationCommon -parser
Camlp4OCamlRevisedQuotationExpander"
+archive(syntax,toploop) = "Camlp4Parsers/Camlp4QuotationCommon.cmo
Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmo"
+ )
+)
+
+package
commit ocaml-camlp4 for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-camlp4 for openSUSE:Factory
checked in at 2017-08-18 15:02:52
Comparing /work/SRC/openSUSE:Factory/ocaml-camlp4 (Old)
and /work/SRC/openSUSE:Factory/.ocaml-camlp4.new (New)
Package is "ocaml-camlp4"
Fri Aug 18 15:02:52 2017 rev:4 rq:515939 version:4.05
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-camlp4/ocaml-camlp4.changes
2016-07-15 12:46:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-camlp4.new/ocaml-camlp4.changes
2017-08-18 15:02:53.790889345 +0200
@@ -1,0 +2,25 @@
+Thu Aug 10 14:49:59 UTC 2017 - oher...@suse.de
+
+- Require ocaml(ocaml_base_version)
+
+---
+Tue Jul 25 13:04:54 UTC 2017 - oher...@suse.de
+
+- Use Group: Development/Languages/OCaml
+
+---
+Mon Jul 17 20:24:18 UTC 2017 - oher...@suse.de
+
+- Update to match ocaml 4.05
+
+---
+Mon Jul 17 12:48:58 UTC 2017 - oher...@suse.de
+
+- Wrap specfile conditionals to fix quilt setup
+
+---
+Mon Jul 17 10:48:58 UTC 2017 - oher...@suse.de
+
+- Remove autodeps for pre openSUSE 12.1 releases
+
+---
Old:
camlp4-4.03-1.tar.xz
New:
camlp4-4.05-1.tar.xz
Other differences:
--
++ ocaml-camlp4.spec ++
--- /var/tmp/diff_new_pack.WRhbBm/_old 2017-08-18 15:02:54.978722134 +0200
+++ /var/tmp/diff_new_pack.WRhbBm/_new 2017-08-18 15:02:54.982721571 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-camlp4
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,27 +17,20 @@
Name: ocaml-camlp4
-Version:4.03
+Version:4.05
Release:0
-%{ocaml_preserve_bytecode}
+%{?ocaml_preserve_bytecode}
Summary:Pre-Processor-Pretty-Printer for Objective Caml
License:SUSE-LGPL-2.0-with-linking-exception
-Group: Development/Languages/Other
+Group: Development/Languages/OCaml
Url:https://github.com/ocaml/camlp4
Source: camlp4-%{version}-1.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# ocaml autodep start for pkg: ocaml-camlp4
-# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml()
provides/requires
-%if 0%{?suse_version} < 1210
-Requires: ocaml-compiler-libs
-Requires: ocaml-runtime
-%endif
-# ocaml autodep end for pkg: ocaml-camlp4
-BuildRequires: ocaml >= 4.02.0
BuildRequires: ocaml-ocamlbuild
-BuildRequires: ocaml-rpm-macros >= 4.02.1
-Conflicts: ocaml < 4.02.0
-Requires: ocaml-runtime >= 4.02.0
+BuildRequires: ocaml-rpm-macros >= 4.05.0
+BuildRequires: ocaml(ocaml_base_version) = 4.05
+Conflicts: ocaml < 4.05.0
+Requires: ocaml-runtime >= 4.05.0
%description
Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml, parsing a
@@ -48,9 +41,9 @@
%package devel
Summary:Pre-Processor-Pretty-Printer for Objective Caml
-Group: Development/Languages/Other
+Group: Development/Languages/OCaml
Requires: %{name} = %{version}
-Requires: ocaml >= 4.02.0
+Requires: ocaml(ocaml_base_version) = 4.05
Provides: camlp4 = %{version}
Obsoletes: camlp4 < %{version}
@@ -68,7 +61,7 @@
make \
%{?_smp_mflags} \
byte
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
make \
%{?_smp_mflags} \
native
@@ -101,7 +94,7 @@
%defattr(-,root,root)
%{_bindir}/camlp4*
%{_bindir}/mkcamlp4
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
%dir %{_libdir}/ocaml/camlp4
%{_libdir}/ocaml/camlp4/*.a
%{_libdir}/ocaml/camlp4/*.cmx
++ camlp4-4.03-1.tar.xz -> camlp4-4.05-1.tar.xz ++
9176 lines of diff (skipped)
commit ocaml-camlp4 for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-camlp4 for openSUSE:Factory
checked in at 2016-07-15 12:46:07
Comparing /work/SRC/openSUSE:Factory/ocaml-camlp4 (Old)
and /work/SRC/openSUSE:Factory/.ocaml-camlp4.new (New)
Package is "ocaml-camlp4"
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-camlp4/ocaml-camlp4.changes
2015-11-26 17:01:16.0 +0100
+++ /work/SRC/openSUSE:Factory/.ocaml-camlp4.new/ocaml-camlp4.changes
2016-07-15 12:46:21.0 +0200
@@ -1,0 +2,6 @@
+Wed May 18 21:14:02 UTC 2016 - oher...@suse.de
+
+- Update to 4.03 (fate#320836)
+ remove camlp4.DESTDIR.patch
+
+---
Old:
camlp4-4.02.1-1.tar.xz
camlp4.DESTDIR.patch
New:
camlp4-4.03-1.tar.xz
Other differences:
--
++ ocaml-camlp4.spec ++
--- /var/tmp/diff_new_pack.9WVVZe/_old 2016-07-15 12:46:23.0 +0200
+++ /var/tmp/diff_new_pack.9WVVZe/_new 2016-07-15 12:46:23.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-camlp4
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,16 +16,15 @@
#
-Version:4.02.1
+Name: ocaml-camlp4
+Version:4.03
Release:0
%{ocaml_preserve_bytecode}
-Name: ocaml-camlp4
Summary:Pre-Processor-Pretty-Printer for Objective Caml
License:SUSE-LGPL-2.0-with-linking-exception
Group: Development/Languages/Other
Url:https://github.com/ocaml/camlp4
Source: camlp4-%{version}-1.tar.xz
-Patch0: camlp4.DESTDIR.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# ocaml autodep start for pkg: ocaml-camlp4
# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml()
provides/requires
@@ -35,6 +34,7 @@
%endif
# ocaml autodep end for pkg: ocaml-camlp4
BuildRequires: ocaml >= 4.02.0
+BuildRequires: ocaml-ocamlbuild
BuildRequires: ocaml-rpm-macros >= 4.02.1
Conflicts: ocaml < 4.02.0
Requires: ocaml-runtime >= 4.02.0
@@ -62,7 +62,6 @@
%prep
%setup -q -n camlp4-%{version}-1
-%patch0 -p1
%build
./configure
++ camlp4-4.02.1-1.tar.xz -> camlp4-4.03-1.tar.xz ++
9284 lines of diff (skipped)
commit ocaml-camlp4 for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-camlp4 for openSUSE:Factory
checked in at 2015-11-26 17:01:15
Comparing /work/SRC/openSUSE:Factory/ocaml-camlp4 (Old)
and /work/SRC/openSUSE:Factory/.ocaml-camlp4.new (New)
Package is "ocaml-camlp4"
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-camlp4/ocaml-camlp4.changes
2014-10-31 12:28:01.0 +0100
+++ /work/SRC/openSUSE:Factory/.ocaml-camlp4.new/ocaml-camlp4.changes
2015-11-26 17:01:16.0 +0100
@@ -1,0 +2,5 @@
+Tue Nov 10 10:18:47 UTC 2015 - oher...@suse.de
+
+- Add hardcoded Provides for pre 12.1 repos
+
+---
Other differences:
--
++ ocaml-camlp4.spec ++
--- /var/tmp/diff_new_pack.BooZSF/_old 2015-11-26 17:01:16.0 +0100
+++ /var/tmp/diff_new_pack.BooZSF/_new 2015-11-26 17:01:16.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-camlp4
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,9 +17,9 @@
Version:4.02.1
+Release:0
%{ocaml_preserve_bytecode}
Name: ocaml-camlp4
-Release:0
Summary:Pre-Processor-Pretty-Printer for Objective Caml
License:SUSE-LGPL-2.0-with-linking-exception
Group: Development/Languages/Other
@@ -27,15 +27,17 @@
Source: camlp4-%{version}-1.tar.xz
Patch0: camlp4.DESTDIR.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+# ocaml autodep start for pkg: ocaml-camlp4
+# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml()
provides/requires
+%if 0%{?suse_version} < 1210
+Requires: ocaml-compiler-libs
+Requires: ocaml-runtime
+%endif
+# ocaml autodep end for pkg: ocaml-camlp4
BuildRequires: ocaml >= 4.02.0
BuildRequires: ocaml-rpm-macros >= 4.02.1
Conflicts: ocaml < 4.02.0
Requires: ocaml-runtime >= 4.02.0
-%if %suse_version < 1210
-# Due to lack of generated requires in old rpm, force this
-BuildRequires: ocaml-compiler-libs
-Requires: ocaml-compiler-libs
-%endif
%description
Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml, parsing a
@@ -63,14 +65,6 @@
%patch0 -p1
%build
-# For ppc64 we need a larger stack than default to compile some files
-# because the stages in the OCaml compiler are not mutually tail
-# recursive.
-%ifarch ppc64 ppc64le
-ulimit -a
-ulimit -Hs 65536
-ulimit -Ss 65536
-%endif
./configure
make \
%{?_smp_mflags} \
