From 1482534b7219482b6259aeb16925fae2527b7e23 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 7 May 2021 14:09:24 +0200
Subject: update to 6.9.7.1

---
 libonig.xml       |  5 +++--
 onig-soname.patch |  6 +++---
 oniguruma.spec    | 12 ++++++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/libonig.xml b/libonig.xml
index e95b3f4..97d9255 100644
--- a/libonig.xml
+++ b/libonig.xml
@@ -9,14 +9,15 @@
 
 <version>
     <!-- Version of the library -->
-6.9.6
+6.9.7.1
 </version>
 
 <headers>
     <!-- The list of paths to header files and/or
          directories with header files, one per line -->
-/usr/include/oniguruma.h
 /usr/include/oniggnu.h
+/usr/include/onigposix.h
+/usr/include/oniguruma.h
 </headers>
 
 <libs>
diff --git a/onig-soname.patch b/onig-soname.patch
index 8250565..a09f740 100644
--- a/onig-soname.patch
+++ b/onig-soname.patch
@@ -1,12 +1,12 @@
 diff -up ./configure.bump ./configure
 --- ./configure.bump	2020-11-05 10:04:52.680279189 +0100
 +++ ./configure	2020-11-05 10:05:58.099066485 +0100
-@@ -12245,7 +12245,7 @@ CC=$lt_save_CC
+@@ -12239,7 +12239,7 @@ CC=$lt_save_CC
  # Only expand once:
  
  
--LTVERSION="6:0:1"
-+LTVERSION="106:0:1"
+-LTVERSION="7:0:2"
++LTVERSION="107:0:2"
  
  
  
diff --git a/oniguruma.spec b/oniguruma.spec
index b07a184..25bd600 100644
--- a/oniguruma.spec
+++ b/oniguruma.spec
@@ -19,17 +19,17 @@
 # EPEL-7 have 5.9, soname 2
 # RHEL-6 have 5.9, soname 2
 
-%global mainver 6.9.6
-#global postver rev1
+%global mainver 6.9.7
+%global postver 1
 
 Name:		%{libname}%{oldsoname}php
-Version:	%{mainver}%{?postver:+%postver}
+Version:	%{mainver}%{?postver:.%postver}
 Release:	1%{?dist}
 Summary:	Regular expressions library
 
 License:	BSD
 URL:		https://github.com/kkos/oniguruma/
-Source0:	https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?postver:_%postver}/onig-%{mainver}%{?postver:-%postver}.tar.gz
+Source0:	https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?postver:.%postver}/onig-%{mainver}%{?postver:.%postver}.tar.gz
 
 # Bump soname from 5 to 105 to allow parallel installation
 Patch0:		onig-soname.patch
@@ -66,6 +66,7 @@ developing applications that use %{name}.
 %setup -q -n onig-%{mainver}
 %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in
 
+grep ^LTVERSION= configure
 %patch0 -p1 -b .bump
 
 
@@ -140,6 +141,9 @@ sed -e '/^test_regset_LDADD/s/$/ -lrt/' -i test/Makefile
 
 
 %changelog
+* Fri May  7 2021 Remi Collet <remi@remirepo.net> -6.9.7.1-1
+- update to 6.9.7.1
+
 * Thu Nov  5 2020 Remi Collet <remi@remirepo.net> -6.9.6-1
 - update to 6.9.6 (from Fedora)
 
-- 
cgit