Version 0.28.0.

- Drop upstreamed test patch.
- Drop upstreamed grep 3.8 adaptation.

ocaml-ppxlib-stdlib-shims.patch

@@ -1,5 +1,5 @@
---- a/ast/dune	2022-03-21 14:52:09.000000000 -0600
-+++ b/ast/dune	2022-03-22 14:11:57.019588959 -0600
+--- a/ast/dune	2022-10-06 06:08:58.000000000 -0600
++++ b/ast/dune	2022-10-31 15:15:09.298784089 -0600
 @@ -5,7 +5,7 @@
  (library
   (name ppxlib_ast)
@@ -9,36 +9,36 @@
   (flags
    (:standard -safe-string)
    -w
---- a/dune-project	2022-03-22 14:11:57.019588959 -0600
-+++ b/dune-project	2022-03-22 14:12:31.242612532 -0600
+--- a/dune-project	2022-10-31 15:15:09.298784089 -0600
++++ b/dune-project	2022-10-31 15:15:48.529839305 -0600
 @@ -20,7 +20,6 @@
    (ppx_derivers (>= 1.0))
    (sexplib0 (>= v0.12))
-   (sexplib0 (and :with-test (< "v0.15"))) ; Printexc.register_printer in sexplib0 changed
+   (sexplib0 (and :with-test (>= "v0.15"))) ; Printexc.register_printer in sexplib0 changed
 -  stdlib-shims
    (ocamlfind :with-test)
    (re (and :with-test (>= 1.9.0)))
    (cinaps (and :with-test (>= v0.12.1)))
---- a/metaquot_lifters/dune	2022-03-21 14:52:09.000000000 -0600
-+++ b/metaquot_lifters/dune	2022-03-22 14:11:57.019588959 -0600
+--- a/metaquot_lifters/dune	2022-10-06 06:08:58.000000000 -0600
++++ b/metaquot_lifters/dune	2022-10-31 15:15:09.299784091 -0600
 @@ -3,4 +3,4 @@
   (public_name ppxlib.metaquot_lifters)
   (flags
    (:standard -safe-string))
 - (libraries ppxlib ppxlib_traverse_builtins stdppx stdlib-shims))
 + (libraries ppxlib ppxlib_traverse_builtins stdppx))
---- a/ppxlib.opam	2022-03-22 14:11:57.019588959 -0600
-+++ b/ppxlib.opam	2022-03-22 14:12:47.194623515 -0600
+--- a/ppxlib.opam	2022-10-31 15:15:09.299784091 -0600
++++ b/ppxlib.opam	2022-10-31 15:16:11.681871892 -0600
 @@ -26,7 +26,6 @@ depends: [
    "ppx_derivers" {>= "1.0"}
    "sexplib0" {>= "v0.12"}
-   "sexplib0" {with-test & < "v0.15"}
+   "sexplib0" {with-test & >= "v0.15"}
 -  "stdlib-shims"
    "ocamlfind" {with-test}
    "re" {with-test & >= "1.9.0"}
    "cinaps" {with-test & >= "v0.12.1"}
---- a/src/dune	2022-03-21 14:52:09.000000000 -0600
-+++ b/src/dune	2022-03-22 14:11:57.020588959 -0600
+--- a/src/dune	2022-10-06 06:08:58.000000000 -0600
++++ b/src/dune	2022-10-31 15:15:09.299784091 -0600
 @@ -9,7 +9,6 @@
    ppx_derivers
    ppxlib_traverse_builtins
@@ -47,16 +47,16 @@
    sexplib0)
   (flags
    (:standard -safe-string))
---- a/src/gen/dune	2022-03-21 14:52:09.000000000 -0600
-+++ b/src/gen/dune	2022-03-22 14:11:57.020588959 -0600
+--- a/src/gen/dune	2022-10-06 06:08:58.000000000 -0600
++++ b/src/gen/dune	2022-10-31 15:15:09.299784091 -0600
 @@ -2,4 +2,4 @@
   (names gen_ast_pattern gen_ast_builder)
   (flags
    (:standard -safe-string))
 - (libraries ppxlib_ast astlib ppxlib_traverse_builtins stdppx stdlib-shims))
 + (libraries ppxlib_ast astlib ppxlib_traverse_builtins stdppx))
---- a/stdppx/dune	2022-03-21 14:52:09.000000000 -0600
-+++ b/stdppx/dune	2022-03-22 14:11:57.020588959 -0600
+--- a/stdppx/dune	2022-10-06 06:08:58.000000000 -0600
++++ b/stdppx/dune	2022-10-31 15:15:09.299784091 -0600
 @@ -1,6 +1,6 @@
  (library
   (name stdppx)
@@ -65,8 +65,8 @@
 + (libraries sexplib0)
   (flags
    (:standard -safe-string)))
---- a/traverse/dune	2022-03-21 14:52:09.000000000 -0600
-+++ b/traverse/dune	2022-03-22 14:11:57.020588959 -0600
+--- a/traverse/dune	2022-10-06 06:08:58.000000000 -0600
++++ b/traverse/dune	2022-10-31 15:15:09.300784092 -0600
 @@ -4,6 +4,6 @@
   (kind ppx_deriver)
   (flags

ocaml-ppxlib-test.patch

@@ -1,67 +0,0 @@
---- a/test/base/test.ml	2021-12-08 14:53:37.000000000 -0700
-+++ b/test/base/test.ml	2021-12-09 15:49:53.725195563 -0700
-@@ -106,17 +106,17 @@ let _ = convert_longident "Base.( land )
- 
- let _ = convert_longident "A(B)"
- [%%expect{|
--Exception: (Invalid_argument "Ppxlib.Longident.parse: \"A(B)\"")
-+Exception: Invalid_argument "Ppxlib.Longident.parse: \"A(B)\"".
- |}]
- 
- let _ = convert_longident "A.B(C)"
- [%%expect{|
--Exception: (Invalid_argument "Ppxlib.Longident.parse: \"A.B(C)\"")
-+Exception: Invalid_argument "Ppxlib.Longident.parse: \"A.B(C)\"".
- |}]
- 
- let _ = convert_longident ")"
- [%%expect{|
--Exception: (Invalid_argument "Ppxlib.Longident.parse: \")\"")
-+Exception: Invalid_argument "Ppxlib.Longident.parse: \")\"".
- |}]
- 
- let _ = Ppxlib.Code_path.(file_path @@ top_level ~file_path:"dir/main.ml")
---- a/test/driver/exception_handling/run.t	2021-12-08 14:53:37.000000000 -0700
-+++ b/test/driver/exception_handling/run.t	2021-12-09 15:48:04.773272323 -0700
-@@ -99,10 +99,10 @@ can be reported about it.
- 
-   $ echo "let _ = [%gen_raise_exc] + [%gen_raise_exc]" > impl.ml
-   $ ./extender.exe impl.ml
--  Fatal error: exception (Failure "A raised exception")
-+  Fatal error: exception Failure("A raised exception")
-   [2]
-   $ ./extender.exe -embed-errors impl.ml
--  Fatal error: exception (Failure "A raised exception")
-+  Fatal error: exception Failure("A raised exception")
-   [2]
- 
-  In the case of derivers
-@@ -110,14 +110,14 @@ can be reported about it.
-   $ echo "type a = int" > impl.ml
-   $ echo "type b = int [@@deriving deriver_raised_exception]" >> impl.ml
-   $ ./deriver.exe -embed-errors impl.ml
--  Fatal error: exception (Failure "A raised exception")
-+  Fatal error: exception Failure("A raised exception")
-   [2]
- 
-  In the case of whole file transformations:
- 
-   $ ./whole_file_exception.exe impl.ml
--  Fatal error: exception (Failure "An exception in a whole file transform")
-+  Fatal error: exception Failure("An exception in a whole file transform")
-   [2]
-   $ ./whole_file_exception.exe -embed-errors impl.ml
--  Fatal error: exception (Failure "An exception in a whole file transform")
-+  Fatal error: exception Failure("An exception in a whole file transform")
-   [2]
---- a/test/ppx_import_support/test.ml	2021-12-08 14:53:37.000000000 -0700
-+++ b/test/ppx_import_support/test.ml	2021-12-09 15:50:20.653174641 -0700
-@@ -108,6 +108,6 @@ let id_for_core_types =
-     (fun ~ctxt:_ core_type -> core_type)
- [%%expect{|
- Exception:
--(Failure
--  "Some ppx-es tried to register conflicting transformations: Extension 'id' on type declarations matches extension 'id'")
-+Failure
-+ "Some ppx-es tried to register conflicting transformations: Extension 'id' on type declarations matches extension 'id'".
- |}]

ocaml-ppxlib.spec

@@ -6,8 +6,8 @@
 
 Name:           ocaml-ppxlib
 Epoch:          1
-Version:        0.27.0
-Release:        2%{?dist}
+Version:        0.28.0
+Release:        1%{?dist}
 Summary:        Base library and tools for ppx rewriters
 
 License:        MIT
@@ -15,8 +15,6 @@ URL:            https://github.com/ocaml-ppx/ppxlib
 Source0:        %{url}/archive/%{version}/ppxlib-%{version}.tar.gz
 # Fedora does not have, and does not need, stdlib-shims
 Patch0:         %{name}-stdlib-shims.patch
-# Work around differences in parentheses in test output
-Patch1:         %{name}-test.patch
 
 BuildRequires:  ocaml >= 4.04.1
 BuildRequires:  ocaml-base-devel
@@ -61,9 +59,6 @@ signature files for developing applications that use
 %prep
 %autosetup -n ppxlib-%{version} -p1
 
-# Adapt to grep 3.8
-sed -i 's/egrep/grep -E/g' test/expansion_context/run.t
-
 %build
 %dune_build
 
@@ -80,6 +75,11 @@ sed -i 's/egrep/grep -E/g' test/expansion_context/run.t
 %files devel -f .ofiles-devel
 
 %changelog
+* Mon Oct 31 2022 Jerry James <loganjerry@gmail.com> - 1:0.28.0-1
+- Version 0.28.0
+- Drop upstreamed test patch
+- Drop upstreamed grep 3.8 adaptation
+
 * Tue Sep  6 2022 Jerry James <loganjerry@gmail.com> - 1:0.27.0-2
 - Adapt to grep 3.8
 

sources

@@ -1 +1 @@
-SHA512 (ppxlib-0.27.0.tar.gz) = 7d517e3896c25be116576a05e23cf3b862836b5dac8beabffe5fd475fca62aeb45b3e7be7483d3519c7b9ad618b6c7a0765d7d92e51da28e91c7dec784d6002e
+SHA512 (ppxlib-0.28.0.tar.gz) = 31290cd34f4b306f289b6ef78fbc5907f007c722ffc2cb0682c1944af954f2c6732b236891d1872a22b856d0aee0f7e84d3262ee103aff15d0a4dcd1a20bbfe6