summaryrefslogtreecommitdiffstats
path: root/oniguruma.spec
diff options
context:
space:
mode:
Diffstat (limited to 'oniguruma.spec')
-rw-r--r--oniguruma.spec23
1 files changed, 7 insertions, 16 deletions
diff --git a/oniguruma.spec b/oniguruma.spec
index 12f49c7..b07a184 100644
--- a/oniguruma.spec
+++ b/oniguruma.spec
@@ -19,12 +19,12 @@
# EPEL-7 have 5.9, soname 2
# RHEL-6 have 5.9, soname 2
-%global mainver 6.9.5
-%global postver rev1
+%global mainver 6.9.6
+#global postver rev1
Name: %{libname}%{oldsoname}php
Version: %{mainver}%{?postver:+%postver}
-Release: 4%{?dist}
+Release: 1%{?dist}
Summary: Regular expressions library
License: BSD
@@ -68,19 +68,6 @@ developing applications that use %{name}.
%patch0 -p1 -b .bump
-%if 0
-for f in \
- README.ja \
- doc/API.ja \
- doc/FAQ.ja \
- doc/RE.ja
- do
- iconv -f EUC-JP -t UTF-8 $f > $f.tmp && \
- ( touch -r $f $f.tmp ; %{__mv} -f $f.tmp $f ) || \
- %{__rm} -f $f.tmp
-done
-%endif
-
%build
# This package fails its testsuite when compiled with LTO, but the real problem
@@ -90,6 +77,7 @@ done
%configure \
--enable-posix-api \
+ --enable-binary-compatible-posix-api \
--disable-silent-rules \
--disable-static \
--with-rubydir=%{_bindir}
@@ -152,6 +140,9 @@ sed -e '/^test_regset_LDADD/s/$/ -lrt/' -i test/Makefile
%changelog
+* Thu Nov 5 2020 Remi Collet <remi@remirepo.net> -6.9.6-1
+- update to 6.9.6 (from Fedora)
+
* Tue Oct 20 2020 Remi Collet <remi@remirepo.net> -6.9.5+rev1-4
- From Fedora: Revert fix for CVE-2020-26159, marked as false
https://github.com/kkos/oniguruma/issues/221