import oniguruma-6.8.2-1.el8

1 files changed, 11 insertions, 93 deletions

diff --git a/oniguruma.spec b/oniguruma.spec
index 03d8dd2..9a77f9c 100644
--- a/oniguruma.spec
+++ b/oniguruma.spec
@@ -1,71 +1,25 @@
-# remirepo spec file for oniguruma5
-# renamed for parallel installation, from:
-#
-# Fedora spec file for oniguruma
-#
-# License: MIT
-# http://opensource.org/licenses/MIT
-#
-# Please preserve changelog entries
-#
-%global libname oniguruma
-%global soname  5
-%undefine	_changelog_trimtime
-
-# Fedora 29 have 6.9, soname 5
-# Fedora 28 have 6.8, soname 5
-# Fedora 27 have 6.6, soname 4
-# EPEL-7 have 5.9, soname 2
-# RHEL-6 have 5.9, soname 2
-
-%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
-Name:       %{libname}
-%else
-Name:       %{libname}%{soname}
-%endif
-Version:	6.9.2
-Release:	2%{?dist}
+Name:		oniguruma
+Version:	6.8.2
+Release:	1%{?dist}
 Summary:	Regular expressions library
 
+Group:		System Environment/Libraries
 License:	BSD
 URL:		https://github.com/kkos/oniguruma/
 Source0:	https://github.com/kkos/oniguruma/releases/download/v%{version}/onig-%{version}.tar.gz
-# upstream patches
-Patch10:	0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch
-#Patch11:	0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch
-# Not use Patch11 for F-30 and below, this is almost API change (deprecation of API) in
-# onig_new_deluxe() and this change should be avoided (if possible) in stable
-# branch
-# Instead use another fix
-Patch101:	0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch
-
-BuildRequires:	gcc
-
-%if "%{name}" == "%{libname}"
-Obsoletes:      %{libname}%{soname} <= %{version}
-%endif
 
 %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
 
 
 %package	devel
 Summary:	Development files for %{name}
+Group:		Development/Libraries
 Requires:	%{name}%{?isa} = %{version}-%{release}
 
-%if "%{name}" == "%{libname}"
-Obsoletes: %{libname}%{soname}-devel <= %{version}
-%else
-Conflicts: %{libname}-devel          <  %{version}
-Provides:  %{libname}-devel          =  %{version}-%{release}
-%endif
-
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -88,14 +42,9 @@ for f in \
 done
 %endif
 
-%patch10 -p1 -b .CVE-2019-13225
-#%%patch11 -p1 -b .CVE-2019-13224
-%patch101 -p1 -b .CVE-2019-13224
-
-
 %build
 %configure \
-	--disable-silent-rules \
+    --disable-silent-rules \
 	--disable-static \
 	--with-rubydir=%{_bindir}
 %{__make} %{?_smp_mflags}
@@ -108,20 +57,17 @@ done
 find $RPM_BUILD_ROOT -name '*.la' \
 	-exec %{__rm} -f {} ';'
 
-
 %check
 %{__make} check
 
+%post -p /sbin/ldconfig
 
-%if 0%{?fedora} < 28 && 0%{?rhel} < 8
-%post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
-%endif
 
 
 %files
+%defattr(-,root,root,-)
 %doc	AUTHORS
-%{!?_licensedir:%global license %%doc}
 %license	COPYING
 %doc	HISTORY
 %doc	README.md
@@ -129,16 +75,15 @@ find $RPM_BUILD_ROOT -name '*.la' \
 %lang(ja)	%doc	README_japanese
 %lang(ja)	%doc	index_ja.html
 
-%{_libdir}/libonig.so.%{soname}*
+%{_libdir}/libonig.so.5*
 
 %files devel
+%defattr(-,root,root,-)
 %doc	doc/API
 %doc	doc/CALLOUTS.API
 %doc	doc/CALLOUTS.BUILTIN
 %doc	doc/FAQ
 %doc	doc/RE
-%doc	doc/SYNTAX.md
-%doc	doc/UNICODE_PROPERTIES
 %lang(ja)	%doc	doc/API.ja
 %lang(ja)	%doc	doc/CALLOUTS.API.ja
 %lang(ja)	%doc	doc/CALLOUTS.BUILTIN.ja
@@ -149,36 +94,9 @@ find $RPM_BUILD_ROOT -name '*.la' \
 
 %{_libdir}/libonig.so
 %{_includedir}/onig*.h
-%{_libdir}/pkgconfig/%{libname}.pc
-
+%{_libdir}/pkgconfig/%{name}.pc	
 
 %changelog
-* Mon Jul 15 2019 Remi Collet <remi@remirepo.net> -6.9.2-2
-- add security fixes from Fedora
-
-* Fri Jul 12 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.2-2
-- Upstream patch for CVE-2019-13225 (#1728966)
-- NON-upstream patch for CVE-2019-13224 (#1728971)
-
-* Mon May 13 2019 Remi Collet <remi@remirepo.net> -6.9.2-1
-- update to 6.9.2
-
-* Mon Apr  1 2019 Remi Collet <remi@remirepo.net> -6.9.1-1
-- rename to oniguruma5 to allow parallel installation
-  beside old oniguruma version
-
-* Wed Dec 12 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.1-1
-- 6.9.1
-
-* Wed Sep 12 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.0-2
-- 6.9.0
-
-* Sat Sep  8 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.8.2-3
-- Bump release
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.8.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Mon Apr 23 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.8.2-1
 - 6.8.2