rename to oniguruna5php and bump soname to 105

1 files changed, 19 insertions, 18 deletions

diff --git a/oniguruma.spec b/oniguruma.spec
index a4e7bb0..c33e400 100644
--- a/oniguruma.spec
+++ b/oniguruma.spec
@@ -1,4 +1,4 @@
-# remirepo spec file for oniguruma5
+# remirepo spec file for oniguruma5php
 # renamed for parallel installation, from:
 #
 # Fedora spec file for oniguruma
@@ -9,7 +9,8 @@
 # Please preserve changelog entries
 #
 %global libname oniguruma
-%global soname  5
+%global oldsoname  5
+%global newsoname  105
 %undefine	_changelog_trimtime
 
 # Fedora 29 have 6.9, soname 5
@@ -21,11 +22,7 @@
 %global mainver 6.9.5
 %global postver rev1
 
-%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
-Name:       %{libname}
-%else
-Name:       %{libname}%{soname}
-%endif
+Name:		%{libname}%{oldsoname}php
 Version:	%{mainver}%{?postver:+%postver}
 Release:	1%{?dist}
 Summary:	Regular expressions library
@@ -34,32 +31,31 @@ 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
 
+# Bump soname from 5 to 105 to allow parallel installation
+Patch0:		onig-soname.patch
+
 BuildRequires:	gcc
 
-%if "%{name}" == "%{libname}"
-Obsoletes:      %{libname}%{soname} <= %{version}
-%endif
+# TODO Obsoletes: %{libname}%{oldsoname} <= %{version}
+
 
 %description
 Oniguruma is a regular expressions library.
 The characteristics of this library is that different character encoding
 for every regular expression object can be specified.
 (supported APIs: GNU regex, POSIX and Oniguruma native)
-%if "%{name}" != "%{libname}"
-%{name} is designed to be installed beside %{libname}.
-%endif
+
+%{name} is designed to be installed beside %{libname}
+and only used by PHP binaries (mbstring extension).
 
 
 %package	devel
 Summary:	Development files for %{name}
 Requires:	%{name}%{?isa} = %{version}-%{release}
 
-%if "%{name}" == "%{libname}"
-Obsoletes: %{libname}%{soname}-devel <= %{version}
-%else
+Obsoletes: %{libname}%{oldsoname}-devel <= %{version}
 Conflicts: %{libname}-devel          <  %{version}
 Provides:  %{libname}-devel          =  %{version}-%{release}
-%endif
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -70,6 +66,8 @@ developing applications that use %{name}.
 %setup -q -n onig-%{mainver}
 %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in
 
+%patch0 -p1 -b .bump
+
 %if 0
 for f in \
 	README.ja \
@@ -125,7 +123,7 @@ sed -e '/^test_regset_LDADD/s/$/ -lrt/' -i test/Makefile
 %lang(ja)	%doc	README_japanese
 %lang(ja)	%doc	index_ja.html
 
-%{_libdir}/libonig.so.%{soname}*
+%{_libdir}/libonig.so.%{newsoname}*
 
 %files devel
 %doc	doc/API
@@ -149,6 +147,9 @@ sed -e '/^test_regset_LDADD/s/$/ -lrt/' -i test/Makefile
 
 
 %changelog
+* Thu May 28 2020 Remi Collet <remi@remirepo.net> -6.9.5+rev1-1
+- rename to oniguruna5php and bump soname to 105
+
 * Thu May 14 2020 Remi Collet <remi@remirepo.net> -6.9.5+rev1-1
 - update to 6.9.5-rev1 (from Fedora)