commit ocaml-pcre for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-pcre for openSUSE:Factory
checked in at 2020-08-24 15:08:37
Comparing /work/SRC/openSUSE:Factory/ocaml-pcre (Old)
and /work/SRC/openSUSE:Factory/.ocaml-pcre.new.3399 (New)
Package is "ocaml-pcre"
Mon Aug 24 15:08:37 2020 rev:4 rq:828701 version:7.4.6
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-pcre/ocaml-pcre.changes2020-03-09
14:14:06.962535548 +0100
+++ /work/SRC/openSUSE:Factory/.ocaml-pcre.new.3399/ocaml-pcre.changes
2020-08-24 15:09:18.118575313 +0200
@@ -1,0 +2,6 @@
+Thu Aug 20 20:20:20 UTC 2020 - oher...@suse.de
+
+- Update to version 7.4.6
+ Remove build dependency on Base
+
+---
Old:
ocaml-pcre-7.4.3.tar.xz
New:
ocaml-pcre-7.4.6.tar.xz
Other differences:
--
++ ocaml-pcre.spec ++
--- /var/tmp/diff_new_pack.A0qFke/_old 2020-08-24 15:09:21.366576896 +0200
+++ /var/tmp/diff_new_pack.A0qFke/_new 2020-08-24 15:09:21.370576897 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-pcre
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2011 Andrew Psaltis
#
# All modifications and additions to the file contributed by third parties
@@ -18,20 +18,19 @@
Name: ocaml-pcre
-Version:7.4.3
+Version:7.4.6
Release:0
%{?ocaml_preserve_bytecode}
Summary:Perl compatibility regular expressions (PCRE) for OCaml
-License:LGPL-2.0
+License:LGPL-2.0-only
Group: Development/Languages/OCaml
-Url:https://opam.ocaml.org/packages/pcre
+URL:https://opam.ocaml.org/packages/pcre
Source0:%{name}-%{version}.tar.xz
-BuildRequires: ocaml(ocaml_base_version) >= 4.08
BuildRequires: ocaml-dune
-BuildRequires: ocaml-rpm-macros >= 20200220
-BuildRequires: ocamlfind(base)
-BuildRequires: ocamlfind(dune.configurator)
+BuildRequires: ocaml-rpm-macros >= 20200514
BuildRequires: pkg-config
+BuildRequires: ocaml(ocaml_base_version) >= 4.08
+BuildRequires: ocamlfind(dune.configurator)
BuildRequires: pkgconfig(libpcre)
%description
++ _service ++
--- /var/tmp/diff_new_pack.A0qFke/_old 2020-08-24 15:09:21.402576913 +0200
+++ /var/tmp/diff_new_pack.A0qFke/_new 2020-08-24 15:09:21.402576913 +0200
@@ -1,10 +1,13 @@
-git://github.com/mmottl/pcre-ocaml.git
+ocaml-pcre
+60fce5301b4e645efb8f8e14994ee055e8f8f781
git
+disable
+git://github.com/mmottl/pcre-ocaml.git
@PARENT_TAG@
-45a2781669d4dc1616f9d07510b366cbe0ae99d4
-ocaml-pcre
+[v]?([^+]+)(.*)
+\1
*.tar
++ ocaml-pcre-7.4.3.tar.xz -> ocaml-pcre-7.4.6.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-pcre-7.4.3/CHANGES.md
new/ocaml-pcre-7.4.6/CHANGES.md
--- old/ocaml-pcre-7.4.3/CHANGES.md 2019-10-27 22:30:56.0 +0100
+++ new/ocaml-pcre-7.4.6/CHANGES.md 2020-08-04 19:34:21.0 +0200
@@ -1,3 +1,21 @@
+### 7.4.6 (2020-08-04)
+
+ * Removed mistakenly kept base library configuration dependency.
+
+
+### 7.4.5 (2020-08-04)
+
+ * Removed excessive build dependency on `base` package.
+
+
+### 7.4.4 (2020-07-30)
+
+ * Added missing dune-configurator dependency.
+
+ * Added support for const char strings in stubs due to stricter handling
+in newer OCaml runtimes. This eliminates C-compiler warnings.
+
+
### 7.4.3 (2019-10-27)
* Switched from `caml_alloc_custom` to `caml_alloc_custom_mem`.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-pcre-7.4.3/dune-project
new/ocaml-pcre-7.4.6/dune-project
--- old/ocaml-pcre-7.4.3/dune-project 2019-10-27 22:30:56.0 +0100
+++ new/ocaml-pcre-7.4.6/dune-project 2020-08-04 19:34:21.0 +0200
@@ -20,8 +20,8 @@
(depends
(ocaml (>= 4.08))
(dune (>= 1.10))
+dune-configurator
(conf-libpcre :build)
-(base :build)
base-bytes
)
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-pcre-7.4.3/pcre.opam
new/ocaml-pcre-7.4.6/pcre.opam
--- old/ocaml-pcre-7.4.3/pcre.opam 2019-10-27 22:30:56.0 +0100
+++ new/ocaml-pcre-7.4.6/pcre.opam 2020-08-04 19:34:21.0 +0200
@@ -20,7 +20,7 @@
depends: [
"ocaml" {>= "4.08"}
"dune" {>= "1.10"}
+ "dune-configurator"
"conf-libpcre" {build}
- "base" {build}
"base-bytes"
]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-pcre-7.4.3/src/config/discover.ml
new/ocaml-pcre-7.4.6/src/config/discover.ml
--- old/ocaml-pcre-7.4.3/src/config/discover.m
commit ocaml-pcre for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-pcre for openSUSE:Factory
checked in at 2020-03-09 14:14:03
Comparing /work/SRC/openSUSE:Factory/ocaml-pcre (Old)
and /work/SRC/openSUSE:Factory/.ocaml-pcre.new.26092 (New)
Package is "ocaml-pcre"
Mon Mar 9 14:14:03 2020 rev:3 rq:780712 version:7.4.3
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-pcre/ocaml-pcre.changes2017-08-18
15:02:18.683831380 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-pcre.new.26092/ocaml-pcre.changes
2020-03-09 14:14:06.962535548 +0100
@@ -1,0 +2,13 @@
+Sat Feb 29 20:20:20 UTC 2020 - oher...@suse.de
+
+- Update to version 7.4.3
+ See included CHANGES.md
+
+---
+Thu Feb 20 20:20:20 UTC 2020 - oher...@suse.de
+
+- Update to version 7.4.1
+- Require current ocaml-rpm-macros
+- Remove ocaml-pcre-warnings.patch
+
+---
Old:
ocaml-pcre-warnings.patch
pcre-ocaml-7.2.3.tar.xz
New:
_service
ocaml-pcre-7.4.3.tar.xz
Other differences:
--
++ ocaml-pcre.spec ++
--- /var/tmp/diff_new_pack.d1lTBF/_old 2020-03-09 14:14:08.142536326 +0100
+++ /var/tmp/diff_new_pack.d1lTBF/_new 2020-03-09 14:14:08.142536326 +0100
@@ -13,37 +13,30 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: ocaml-pcre
-Version:7.2.3
+Version:7.4.3
Release:0
%{?ocaml_preserve_bytecode}
Summary:Perl compatibility regular expressions (PCRE) for OCaml
License:LGPL-2.0
Group: Development/Languages/OCaml
-
-Url:http://mmottl.github.io/pcre-ocaml/
-#
https://github.com/mmottl/pcre-ocaml/releases/download/v%{version}/pcre-ocaml-%{version}.tar.gz
-Source0:pcre-ocaml-%{version}.tar.xz
-Patch0: ocaml-pcre-warnings.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-BuildRequires: gawk
-BuildRequires: ocaml >= 3.10.2
-BuildRequires: ocaml-oasis
-BuildRequires: ocaml-ocamldoc
-BuildRequires: ocaml-rpm-macros >= 4.03
+Url:https://opam.ocaml.org/packages/pcre
+Source0:%{name}-%{version}.tar.xz
+BuildRequires: ocaml(ocaml_base_version) >= 4.08
+BuildRequires: ocaml-dune
+BuildRequires: ocaml-rpm-macros >= 20200220
+BuildRequires: ocamlfind(base)
+BuildRequires: ocamlfind(dune.configurator)
BuildRequires: pkg-config
-BuildRequires: ocamlfind(bytes)
BuildRequires: pkgconfig(libpcre)
%description
Perl compatibile regular expressions (PCRE) for OCaml.
-
%packagedevel
Summary:Development files for %{name}
Group: Development/Languages/OCaml
@@ -54,65 +47,24 @@
The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}.
-
%prep
-%setup -q -n pcre-ocaml-%{version}
-%patch0 -p1
+%autosetup -p1
%build
-sed -i~ "
-s@\(.*\)\(CCOpt:\)\(.*\)\$@\1\2 %{optflags} -fPIC `pkg-config --cflags
libpcre`@
-s@\(.*\)\(CCLib:\)\(.*\)\$@\1\2 `pkg-config --libs libpcre`@
-" _oasis
-if diff -u _oasis~ _oasis
-then
- exit 1
-fi
-%oasis_setup
-%ocaml_oasis_configure --enable-docs
-%ocaml_oasis_build
-%ocaml_oasis_doc
+dune_release_pkgs='pcre'
+%ocaml_dune_setup
+%ocaml_dune_build
%install
-%ocaml_oasis_findlib_install
-#
-mkdir -vp %{buildroot}/etc/ld.so.conf.d/
-tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_
-%{_libdir}/ocaml/pcre
-_EOF_
-#
+%ocaml_dune_install
+%ocaml_create_file_list
-%post -p /sbin/ldconfig
+%check
+%ocaml_dune_test
-%postun -p /sbin/ldconfig
+%files -f %{name}.files
-%files
-%defattr(-,root,root,-)
-%doc COPYING.txt README.md
-/etc/ld.so.conf.d/*.conf
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.cmxs
-%endif
-%{_libdir}/ocaml/*/*.so
-
-%files devel
-%defattr(-,root,root,-)
-%{oasis_docdir_html}
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%{_libdir}/ocaml/*/*.a
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.cmx
-%{_libdir}/ocaml/*/*.cmxa
-%endif
-%{_libdir}/ocaml/*/*.annot
-%{_libdir}/ocaml/*/*.cma
-%{_libdir}/ocaml/*/*.cmi
-%{_libdir}/ocaml/*/*.cmt
-%{_libdir}/ocaml/*/*.cmti
-%{_libdir}/ocaml/*/*.mli
-%{_libdir}/ocaml/*/META
+%files devel -f %{name}.files.devel
+%doc README.md
%changelog
++ _service ++
git://github.com/mmottl/pcre-ocaml.git
git
@PARENT_TAG@
45a2781669d4dc1616f9d07510b366cbe0ae99d4
ocaml-pcre
*.tar
xz
commit ocaml-pcre for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-pcre for openSUSE:Factory
checked in at 2017-08-18 15:02:14
Comparing /work/SRC/openSUSE:Factory/ocaml-pcre (Old)
and /work/SRC/openSUSE:Factory/.ocaml-pcre.new (New)
Package is "ocaml-pcre"
Fri Aug 18 15:02:14 2017 rev:2 rq:512539 version:7.2.3
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-pcre/ocaml-pcre.changes2016-07-15
12:47:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-pcre.new/ocaml-pcre.changes
2017-08-18 15:02:18.683831380 +0200
@@ -1,0 +2,15 @@
+Tue Jul 25 13:04:54 UTC 2017 - oher...@suse.de
+
+- Use Group: Development/Languages/OCaml
+
+---
+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
+
+---
Other differences:
--
++ ocaml-pcre.spec ++
--- /var/tmp/diff_new_pack.lYW8MT/_old 2017-08-18 15:02:20.343597734 +0200
+++ /var/tmp/diff_new_pack.lYW8MT/_new 2017-08-18 15:02:20.347597171 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-pcre
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Andrew Psaltis
#
# All modifications and additions to the file contributed by third parties
@@ -19,31 +19,26 @@
Name: ocaml-pcre
Version:7.2.3
-%{ocaml_preserve_bytecode}
Release:0
+%{?ocaml_preserve_bytecode}
Summary:Perl compatibility regular expressions (PCRE) for OCaml
License:LGPL-2.0
-Group: Development/Libraries/Other
+Group: Development/Languages/OCaml
Url:http://mmottl.github.io/pcre-ocaml/
#
https://github.com/mmottl/pcre-ocaml/releases/download/v%{version}/pcre-ocaml-%{version}.tar.gz
Source0:pcre-ocaml-%{version}.tar.xz
Patch0: ocaml-pcre-warnings.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# ocaml autodep start for pkg: ocaml-pcre
-# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml()
provides/requires
-%if 0%{?suse_version} < 1210
-Requires: ocaml-runtime
-%endif
-# ocaml autodep end for pkg: ocaml-pcre
BuildRequires: gawk
BuildRequires: ocaml >= 3.10.2
BuildRequires: ocaml-oasis
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-rpm-macros >= 4.03
+BuildRequires: pkg-config
BuildRequires: ocamlfind(bytes)
-BuildRequires: pcre-devel
+BuildRequires: pkgconfig(libpcre)
%description
Perl compatibile regular expressions (PCRE) for OCaml.
@@ -51,7 +46,7 @@
%packagedevel
Summary:Development files for %{name}
-Group: Development/Libraries/Other
+Group: Development/Languages/OCaml
Requires: %{name} = %{version}
Requires: pcre-devel
@@ -65,6 +60,14 @@
%patch0 -p1
%build
+sed -i~ "
+s@\(.*\)\(CCOpt:\)\(.*\)\$@\1\2 %{optflags} -fPIC `pkg-config --cflags
libpcre`@
+s@\(.*\)\(CCLib:\)\(.*\)\$@\1\2 `pkg-config --libs libpcre`@
+" _oasis
+if diff -u _oasis~ _oasis
+then
+ exit 1
+fi
%oasis_setup
%ocaml_oasis_configure --enable-docs
%ocaml_oasis_build
@@ -75,7 +78,7 @@
#
mkdir -vp %{buildroot}/etc/ld.so.conf.d/
tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_
-%{_libdir}/ocaml/stublibs
+%{_libdir}/ocaml/pcre
_EOF_
#
@@ -89,7 +92,7 @@
/etc/ld.so.conf.d/*.conf
%dir %{_libdir}/ocaml
%dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
%{_libdir}/ocaml/*/*.cmxs
%endif
%{_libdir}/ocaml/*/*.so
@@ -100,7 +103,7 @@
%dir %{_libdir}/ocaml
%dir %{_libdir}/ocaml/*
%{_libdir}/ocaml/*/*.a
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
%{_libdir}/ocaml/*/*.cmx
%{_libdir}/ocaml/*/*.cmxa
%endif
