Browse code
Fixed jq %check adding oniguruma package
Change-Id: I6e0bb2888961f7dbad4a58e2b37e86221e329589
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3614
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Danut Moraru <dmoraru@vmware.com>
changpil authored on 2017/08/23 09:46:24Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: jq is a lightweight and flexible command-line JSON processor. |
| 2 | 2 |
Name: jq |
| 3 | 3 |
Version: 1.5 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
Group: Applications/System |
| 6 | 6 |
Vendor: VMware, Inc. |
| 7 | 7 |
License: MIT |
| ... | ... |
@@ -13,6 +13,9 @@ Patch0: CVE-2015-8863.patch |
| 13 | 13 |
#https://github.com/wmark/jq/commit/e6f32d647b180006a90e080ab61ce6f09c3134d7 |
| 14 | 14 |
Patch1: CVE-2016-4074.patch |
| 15 | 15 |
Distribution: Photon |
| 16 |
+%if %{with_check}
|
|
| 17 |
+BuildRequires: oniguruma |
|
| 18 |
+%endif |
|
| 16 | 19 |
|
| 17 | 20 |
%description |
| 18 | 21 |
jq is a lightweight and flexible command-line JSON processor. |
| ... | ... |
@@ -60,6 +63,8 @@ rm -rf %{buildroot}/*
|
| 60 | 60 |
%{_includedir}/*
|
| 61 | 61 |
|
| 62 | 62 |
%changelog |
| 63 |
+* Tue Aug 22 2017 Chang Lee <changlee@vmware.com> 1.5-3 |
|
| 64 |
+- Add oniguruma for %check |
|
| 63 | 65 |
* Wed Jun 07 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.5-2 |
| 64 | 66 |
- Fix for CVE-2015-8863 and CVE-2016-4074 |
| 65 | 67 |
* Mon May 15 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.5-1 |
| 66 | 68 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,52 @@ |
| 0 |
+Name: oniguruma |
|
| 1 |
+Version: 6.5.0 |
|
| 2 |
+Release: 1%{?dist}
|
|
| 3 |
+Summary: Regular expressions library |
|
| 4 |
+Group: System Environment/Libraries |
|
| 5 |
+License: BSD |
|
| 6 |
+URL: https://github.com/kkos/oniguruma/ |
|
| 7 |
+Source0: https://github.com/kkos/oniguruma/releases/download/v%{version}/onig-%{version}.tar.gz
|
|
| 8 |
+%define sha1 onig=1347cc424b8b631b3fe9b7972b27c797a0ffdd3e |
|
| 9 |
+%description |
|
| 10 |
+Oniguruma is a regular expressions library. |
|
| 11 |
+The characteristics of this library is that different character encoding |
|
| 12 |
+for every regular expression object can be specified. |
|
| 13 |
+(supported APIs: GNU regex, POSIX and Oniguruma native) |
|
| 14 |
+ |
|
| 15 |
+%prep |
|
| 16 |
+%setup -q -n onig-%{version}
|
|
| 17 |
+%build |
|
| 18 |
+./configure \ |
|
| 19 |
+ --prefix=%{_prefix} \
|
|
| 20 |
+ --disable-silent-rules \ |
|
| 21 |
+ --disable-static \ |
|
| 22 |
+ --with-rubydir=%{_bindir}
|
|
| 23 |
+make |
|
| 24 |
+ |
|
| 25 |
+%install |
|
| 26 |
+make install \ |
|
| 27 |
+ DESTDIR=%{buildroot} \
|
|
| 28 |
+ INSTALL="install -c -p" |
|
| 29 |
+find %{buildroot}/%{_libdir} -name '*.la' -delete
|
|
| 30 |
+ |
|
| 31 |
+%check |
|
| 32 |
+make check |
|
| 33 |
+%post -p /sbin/ldconfig |
|
| 34 |
+%postun -p /sbin/ldconfig |
|
| 35 |
+%files |
|
| 36 |
+%defattr(-,root,root,-) |
|
| 37 |
+%doc AUTHORS |
|
| 38 |
+%license COPYING |
|
| 39 |
+%doc README |
|
| 40 |
+%doc index.html |
|
| 41 |
+%lang(ja) %doc README.ja |
|
| 42 |
+%lang(ja) %doc index_ja.html |
|
| 43 |
+%{_bindir}/onig-config
|
|
| 44 |
+%{_libdir}/libonig.so
|
|
| 45 |
+%{_libdir}/libonig.so.4*
|
|
| 46 |
+%{_includedir}/onig*.h
|
|
| 47 |
+%{_libdir}/pkgconfig/%{name}.pc
|
|
| 48 |
+ |
|
| 49 |
+%changelog |
|
| 50 |
+* Tue Aug 22 2017 Chang Lee <changlee@vmware.com> 6.5.0-1 |
|
| 51 |
+- Initial version |