From 4e39884e05680ae101dca105cbaf700078db38be Mon Sep 17 00:00:00 2001 From: "John L. Whiteman" Date: Thu, 31 Jul 2014 10:51:07 -0700 Subject: [PATCH] Updating to 4.10.6. Required by latest nss 3.16.3. Signed-off-by: John L. Whiteman --- packaging/nspr.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/packaging/nspr.spec b/packaging/nspr.spec index 7f15a2b..cc70f1c 100644 --- a/packaging/nspr.spec +++ b/packaging/nspr.spec @@ -1,5 +1,5 @@ Name: nspr -Version: 4.10.2 +Version: 4.10.6 Release: 0 License: MPL-2.0 Summary: Netscape Portable Runtime @@ -39,8 +39,7 @@ cp %{SOURCE1001} . modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" BUILD_STRING="$(date -u -d "${modified}" "+%%F %%T")" BUILD_TIME="$(date -u -d "${modified}" "+%%s000000")" -# -cd nspr +#cd nspr export CFLAGS="%{optflags}" %configure --enable-optimize="$CFLAGS" \ %ifarch x86_64 @@ -65,11 +64,16 @@ mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_libdir}/nspr mkdir -p %{buildroot}%{_libdir}/pkgconfig mkdir -p %{buildroot}%{_includedir}/nspr4 -cp nspr/config/nspr-config %{buildroot}%{_bindir}/ -cp nspr/config/nspr.pc %{buildroot}%{_libdir}/pkgconfig -cp -L nspr/dist/lib/*.so %{buildroot}%{_libdir} -cp -L nspr/dist/lib/*.a %{buildroot}%{_libdir}/nspr/ -cp -rL nspr/dist/include/nspr/* %{buildroot}%{_includedir}/nspr4/ +#cp nspr/config/nspr-config %{buildroot}%{_bindir}/ +#cp nspr/config/nspr.pc %{buildroot}%{_libdir}/pkgconfig +#cp -L nspr/dist/lib/*.so %{buildroot}%{_libdir} +#cp -L nspr/dist/lib/*.a %{buildroot}%{_libdir}/nspr/ +#cp -rL nspr/dist/include/nspr/* %{buildroot}%{_includedir}/nspr4/ +cp config/nspr-config %{buildroot}%{_bindir}/ +cp config/nspr.pc %{buildroot}%{_libdir}/pkgconfig +cp -L dist/lib/*.so %{buildroot}%{_libdir} +cp -L dist/lib/*.a %{buildroot}%{_libdir}/nspr/ +cp -rL dist/include/nspr/* %{buildroot}%{_includedir}/nspr4/ # #31667 chmod -x %{buildroot}%{_includedir}/nspr4/prvrsion.h -- 2.7.4