Author: qboosh Date: Sat Feb 4 20:33:50 2012 GMT Module: packages Tag: HEAD ---- Log message: - don't provide libjs.so.1 symlink; libraries are not binary compatible, app linked with js 1.7.0 segfaults when run with js185 - release 3
---- Files affected: packages/js185: js185.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: packages/js185/js185.spec diff -u packages/js185/js185.spec:1.3 packages/js185/js185.spec:1.4 --- packages/js185/js185.spec:1.3 Thu Jan 19 22:08:47 2012 +++ packages/js185/js185.spec Sat Feb 4 21:33:44 2012 @@ -8,7 +8,7 @@ Summary(pl.UTF-8): Implementacja SpiderMonkey języka JavaScript 1.8.5 Name: js185 Version: 1.0.0 -Release: 2 +Release: 3 License: MPL 1.1 or GPL v2+ or LGPL v2.1+ Group: Libraries Source0: http://ftp.mozilla.org/pub/mozilla.org/js/%{name}-%{version}.tar.gz @@ -24,13 +24,6 @@ BuildRequires: rpmbuild(macros) >= 1.294 BuildRequires: sed >= 4.0 Requires: nspr >= 4.7.0 -%ifarch %{x8664} ia64 ppc64 s390x sparc64 -Provides: libjs.so.1()(64bit) -%else -Provides: libjs.so.1 -%endif -Provides: js = 2:1.8.5 -Obsoletes: js < 2:1.8 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -104,10 +97,9 @@ # not installed by make install in new buildsystem install js/src/shell/js js/src/jscpucfg $RPM_BUILD_ROOT%{_bindir} -# provide libjs.so for backward compability +# provide libjs.so for backward compability at build time +# (don't provide libjs.so.1 as the libraries are not binary-compatible) ln -sf libmozjs185.so $RPM_BUILD_ROOT%{_libdir}/libjs.so -ln -sf libmozjs185.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libjs.so.1.0.0 -ln -sf libmozjs185.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libjs.so.1 ln -sf libmozjs185-1.0.a $RPM_BUILD_ROOT%{_libdir}/libjs.a %clean @@ -120,9 +112,6 @@ %defattr(644,root,root,755) %doc js/src/README.html %attr(755,root,root) %{_bindir}/js -%attr(755,root,root) %{_libdir}/libjs.so.*.*.* -# NOTE: it's alternative symlink, created in PLD, so must be packaged -%attr(755,root,root) %{_libdir}/libjs.so.1 %attr(755,root,root) %{_libdir}/libmozjs185.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libmozjs185.so.1.0 @@ -146,6 +135,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.4 2012/02/04 20:33:44 qboosh +- don't provide libjs.so.1 symlink; libraries are not binary compatible, + app linked with js 1.7.0 segfaults when run with js185 +- release 3 + Revision 1.3 2012/01/19 21:08:47 megabajt - added Provides for libjs.so.1 - removed ghost directive from libjs.so.1 (symlink is created in %install ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/js185/js185.spec?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
