diff --git a/js.spec b/js.spec index a6c5992..bbe4d55 100644 --- a/js.spec +++ b/js.spec @@ -3,11 +3,13 @@ Summary: JavaScript interpreter and libraries Name: js Version: 1.60 -Release: 2%{?dist} +Release: 3%{?dist} +# The sources are triple licensed, but when we link against readline which is +# GPL, the result can only be GPL. %if 0%{?_without_readline:1} -License: MPL/GPL/LGPL +License: GPLv2+ or LGPLv2+ or MPLv1.1 %else -License: GPL +License: GPLv2+ %endif Group: Development/Languages URL: http://www.mozilla.org/js/ @@ -20,7 +22,8 @@ Patch4: js-1.5-threadsafe.patch Patch5: js-1.60-ncurses.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildRequires: perl >= 1:5.6.1, readline-devel, ncurses-devel, nspr-devel +BuildRequires: perl(ExtUtils::MakeMaker) +Buildrequires: readline-devel, ncurses-devel, nspr-devel # Temporary fix (#226970 - nspr-devel should require pkgconfig) Buildrequires: pkgconfig Provides: libjs = %{version}-%{release} @@ -146,6 +149,10 @@ LD_LIBRARY_PATH=`pwd`/src/Linux_All_OPT.OBJ %{__make} -C src/perlconnect test %changelog +* Mon Aug 6 2007 Matthias Saou 1.60-3 +- Update License field. +- Add perl(ExtUtils::MakeMaker) build requirement to pull in perl-devel. + * Fri Feb 2 2007 Matthias Saou 1.60-2 - Include jsopcode.tbl and js.msg in devel (#235481). - Install static lib mode 644 instead of 755.