Author: megabajt Date: Thu Jan 19 21:08:52 2012 GMT Module: packages Tag: HEAD ---- Log message: - added Provides for libjs.so.1 - removed ghost directive from libjs.so.1 (symlink is created in %install and won't be generated by ldconfig, so can't be marked as ghost) - release 2
---- Files affected: packages/js185: js185.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/js185/js185.spec diff -u packages/js185/js185.spec:1.2 packages/js185/js185.spec:1.3 --- packages/js185/js185.spec:1.2 Wed Jan 18 15:25:59 2012 +++ packages/js185/js185.spec Thu Jan 19 22:08:47 2012 @@ -8,7 +8,7 @@ Summary(pl.UTF-8): Implementacja SpiderMonkey języka JavaScript 1.8.5 Name: js185 Version: 1.0.0 -Release: 1 +Release: 2 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,6 +24,11 @@ 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) @@ -102,7 +107,7 @@ # provide libjs.so for backward compability 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 $RPM_BUILD_ROOT%{_libdir}/libjs.so.1 +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 @@ -116,7 +121,8 @@ %doc js/src/README.html %attr(755,root,root) %{_bindir}/js %attr(755,root,root) %{_libdir}/libjs.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libjs.so.1 +# 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 @@ -140,6 +146,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +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 + and won't be generated by ldconfig, so can't be marked as ghost) +- release 2 + Revision 1.2 2012/01/18 14:25:59 kiesiu - provide libjs for backward compatibility ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/js185/js185.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
