diff --git a/SPECS/rh-java-common.spec b/SPECS/rh-java-common.spec index f749dce..0a2c4a1 100644 --- a/SPECS/rh-java-common.spec +++ b/SPECS/rh-java-common.spec @@ -6,7 +6,7 @@ Name: %scl_name Version: 1.1 -Release: 39%{?dist} +Release: 43%{?dist} Summary: Package that installs %scl License: GPLv2+ @@ -125,6 +125,8 @@ chmod a+x h2m_helper # generate the man page help2man -N --section 7 ./h2m_helper -o %{scl_name}.7 +# Fix single quotes in man page. +sed -i "s/'/\\\\(aq/g" %{scl_name}.7 %install %scl_install @@ -173,7 +175,9 @@ install -m 755 -d %{buildroot}%{_datadir}/xmvn %dir %{_javaconfdir} %dir %{_javadir} %dir %{_javadocdir} -%dir %{_jnidir} +# %%{scl_files} macro owns all %%{_prefix}/lib subdirs/files with 555 perms +# we need to override this to prevent file conflict with javapackages-tools +%attr(755,root,root) %dir %{_jnidir} %dir %{_mavenpomdir} %dir %{_datadir}/maven-metadata %dir %{_datadir}/xmvn @@ -191,6 +195,18 @@ install -m 755 -d %{buildroot}%{_datadir}/xmvn %{_root_prefix}/lib/rpm/%{name}-javapackages-requires-wrapper %changelog +* Tue Jul 21 2015 Mikolaj Izdebski - 1.1-43 +- Fix syntax errors in manpage + +* Thu Jul 02 2015 Michael Simacek - 1.1-42 +- Ensure 755 permissions on _jnidir + +* Wed Jun 10 2015 Michal Srb - 1.1-41 +- Convert back to arch + +* Tue Jun 9 2015 Mikolaj Izdebski - 1.1-40 +- Convert to noarch + * Mon Apr 27 2015 Mikolaj Izdebski - 1.1-39 - Rebuild for final RHSCL 2.0 release