diff --git a/js.spec b/js.spec index 00eff55..46706cc 100644 --- a/js.spec +++ b/js.spec @@ -1,29 +1,30 @@ %define real_version 1.7.0 -Summary: JavaScript interpreter and libraries -Name: js -Version: 1.70 -Release: 7%{?dist} +Summary: JavaScript interpreter and libraries +Name: js +Version: 1.70 +Release: 8%{?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: GPLv2+ or LGPLv2+ or MPLv1.1 +License: GPLv2+ or LGPLv2+ or MPLv1.1 %else -License: GPLv2+ +License: GPLv2+ %endif -Group: Development/Languages -URL: http://www.mozilla.org/js/ -Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz -Patch0: js-1.7.0-make.patch -Patch1: js-shlib.patch -Patch2: js-1.5-va_copy.patch -Patch3: js-ldflags.patch -Patch4: js-1.7.0-threadsafe.patch -Patch5: js-1.60-ncurses.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Buildrequires: nspr-devel -Buildrequires: readline-devel, ncurses-devel -Provides: libjs = %{version}-%{release} +Group: Development/Languages +URL: http://www.mozilla.org/js/ +Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz +Patch0: js-1.7.0-make.patch +Patch1: js-shlib.patch +Patch2: js-1.5-va_copy.patch +Patch3: js-ldflags.patch +Patch4: js-1.7.0-threadsafe.patch +Patch5: js-1.60-ncurses.patch +Provides: libjs = %{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Buildrequires: nspr-devel +Buildrequires: readline-devel, ncurses-devel + %description JavaScript is the Netscape-developed object scripting language used in millions @@ -63,42 +64,42 @@ includedir=%{_includedir} Name: libjs Description: JS library -Requires: +Requires: nspr Version: %{real_version} Libs: -L${libdir} -ljs -Cflags: -I${includedir} +Cflags: -DXP_UNIX=1 -DJS_THREADSAFE=1 -I${includedir} EOF %build export BUILD_OPT=1 %{__make} %{?_smp_mflags} -C src -f Makefile.ref \ - JS_THREADSAFE="1" \ - XCFLAGS="%{optflags} -fPIC" \ - BUILD_OPT="1" \ + JS_THREADSAFE="1" \ + XCFLAGS="%{optflags} -fPIC" \ + BUILD_OPT="1" \ %if 0%{!?_without_readline:1} - JS_READLINE="1" + JS_READLINE="1" %endif %install %{__rm} -rf %{buildroot} %{__mkdir_p} %{buildroot}%{_bindir} \ - %{buildroot}%{_libdir}/pkgconfig \ - %{buildroot}%{_includedir} + %{buildroot}%{_libdir}/pkgconfig \ + %{buildroot}%{_includedir} %{__install} -m 0755 src/Linux_All_OPT.OBJ/{js,jscpucfg} \ - %{buildroot}%{_bindir}/ + %{buildroot}%{_bindir}/ %{__install} -m 0644 src/Linux_All_OPT.OBJ/libjs.a \ - %{buildroot}%{_libdir}/ + %{buildroot}%{_libdir}/ %{__install} -m 0755 src/Linux_All_OPT.OBJ/libjs.so \ - %{buildroot}%{_libdir}/ + %{buildroot}%{_libdir}/ %{__mv} %{buildroot}%{_libdir}/libjs.so %{buildroot}%{_libdir}/libjs.so.1 %{__ln_s} -nf libjs.so.1 %{buildroot}%{_libdir}/libjs.so %{__install} -m 0644 src/js*.h src/js.msg src/*.tbl \ - src/Linux_All_OPT.OBJ/jsautocfg.h \ - %{buildroot}%{_includedir}/ + src/Linux_All_OPT.OBJ/jsautocfg.h \ + %{buildroot}%{_includedir}/ %{__install} -m 0644 libjs.pc \ - %{buildroot}%{_libdir}/pkgconfig/ + %{buildroot}%{_libdir}/pkgconfig/ %clean @@ -128,6 +129,10 @@ export BUILD_OPT=1 %changelog +* Sun Aug 2 2009 Pavel Alexeev - 1.70-8 +- Reformat spec with tabs. +- By report of Thomas Sondergaard (BZ#511162) Add -DXP_UNIX=1 -DJS_THREADSAFE=1 flags and nspr requires into libjs.pc + * Fri Jul 24 2009 Fedora Release Engineering - 1.70-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild