Attachment 642251 Details for Bug 875343 – Specfile patch

[patch] Specfile patch

js-spec.patch (text/plain), 1.98 KB, created by Ville Skyttä on 2012-11-10 16:13:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2012-11-10 16:13:45 UTC

Size: 1.98 KB

patch

obsolete

>diff --git a/js.spec b/js.spec
>index 034218c..55904a7 100644
>--- a/js.spec
>+++ b/js.spec
>@@ -5,13 +5,7 @@ Name:		js
> Epoch:		1
> Version:		1.8.5
> Release:		10%{?hgdate:.hg%{hgdate}}%{?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
>-%else
>-License:		GPLv2+
>-%endif
> Group:		Development/Languages
> URL:			http://www.mozilla.org/js/
> Source0:		http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
>@@ -20,12 +14,13 @@ Patch1:			js-1.8.5-secondary-jit.patch
> Patch2:			js185-destdir.patch
> Patch3:			js-1.8.5-537701.patch
> Patch4:                 js185-arm-nosoftfp.patch
>+Patch5:                 js185-libedit.patch
> Provides:		libjs = %{version}-%{release}
> BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
> Buildrequires:	nspr-devel >= 4.7
> BuildRequires:  python
> BuildRequires:  zip
>-Buildrequires:	readline-devel
>+Buildrequires:	libedit-devel
> BuildRequires:  ncurses-devel
> BuildRequires:  autoconf213
> 
>@@ -52,13 +47,13 @@ you will need to install %{name}-devel.
> 
> 
> %prep
>-# All patches come from old version and maintainer. I think it is Fedora related only
> %setup -q -n %{name}-%{version}
> %patch0 -p2 -b .64bit-big-endian
> %patch1 -p2 -b .secondary-jit
> %patch2 -p0 -b .destdir
> %patch3 -p1 -b .537701
> %patch4 -p1 -b .armhfp
>+%patch5 -p1 -b .libedit
> cd js
> 
> # Rm parts with spurios licenses, binaries
>@@ -68,14 +63,6 @@ rm -rf src/ctypes/libffi src/t src/tests/src/jstests.jar src/tracevis src/v8
> 
> pushd src
> autoconf-2.13
>-%configure \
>-    --with-system-nspr \
>-    --enable-threadsafe \
>-%if 0%{!?_without_readline:1}
>-    --enable-readline \
>-%endif
>-%{nil}
>-
> popd
> 
> # Create pkgconfig file
>@@ -95,8 +82,14 @@ EOF
> 
> 
> %build
>-cd js
>-make %{?_smp_mflags} -C src
>+cd js/src
>+CPPFLAGS="$(pkg-config --cflags libedit)" \
>+%configure \
>+    --with-system-nspr \
>+    --enable-threadsafe \
>+    --enable-readline
>+make %{?_smp_mflags}
>+
> 
> %install
> cd js

Actions: View | Diff

Attachments on bug 875343: 642250 | 642251