From c6ce3ed3ebf82deb32c038e057fa5c30e9a1a8a2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 18 Jul 2016 13:52:06 +0900 Subject: [PATCH] 6.0.0 --- .gitignore | 1 + oniguruma.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1c435e1..53ddda6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ onig-5.9.2.tar.gz /onig-5.9.4.tar.gz /onig-5.9.5.tar.gz /onig-5.9.6.tar.gz +/onig-6.0.0.tar.gz diff --git a/oniguruma.spec b/oniguruma.spec index 9c5a213..fe82bc3 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,12 +1,12 @@ Name: oniguruma -Version: 5.9.6 -Release: 3%{?dist} +Version: 6.0.0 +Release: 1%{?dist} Summary: Regular expressions library Group: System Environment/Libraries License: BSD -URL: http://www.geocities.jp/kosako3/oniguruma/ -Source0: http://www.geocities.jp/kosako3/oniguruma/archive/onig-%{version}.tar.gz +URL: https://github.com/kkos/oniguruma/ +Source0: https://github.com/kkos/oniguruma/releases/download/v%{version}/onig-%{version}.tar.gz # FIXME # Don't know exactly why, however without Patch0 onig_new returns # NULL reg variable @@ -34,7 +34,9 @@ developing applications that use %{name}. %prep %setup -q -n onig-%{version} +( cd src %patch0 -p1 -b .nullreg +) %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in for f in \ @@ -50,6 +52,7 @@ done %build %configure \ + --disable-silent-rules \ --disable-static \ --with-rubydir=%{_bindir} %{__make} %{?_smp_mflags} @@ -80,7 +83,7 @@ find $RPM_BUILD_ROOT -name '*.la' \ %lang(ja) %doc README.ja %lang(ja) %doc index_ja.html -%{_libdir}/libonig.so.* +%{_libdir}/libonig.so.3* %files devel %defattr(-,root,root,-) @@ -98,6 +101,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Jul 11 2016 Mamoru TASAKA - 6.0.0-1 +- 6.0.0 + * Thu Feb 04 2016 Fedora Release Engineering - 5.9.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index c56f9d7..0fb9547 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d08f10ea5c94919780e6b7bed1ef9830 onig-5.9.6.tar.gz +67a9da531f5dc92a3ca13fa196519959 onig-6.0.0.tar.gz