rpms/js/FC-4 js-1.5-va_copy.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 js.spec, 1.6, 1.7 sources, 1.2, 1.3 js-va_copy.patch, 1.1, NONE
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Wed Feb 1 10:09:37 UTC 2006
Author: thias
Update of /cvs/extras/rpms/js/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21436
Modified Files:
.cvsignore js.spec sources
Added Files:
js-1.5-va_copy.patch
Removed Files:
js-va_copy.patch
Log Message:
Backport js 1.5 update from devel to FC-4.
js-1.5-va_copy.patch:
--- NEW FILE js-1.5-va_copy.patch ---
diff -Naupr js.orig/src/config/Linux_All.mk js/src/config/Linux_All.mk
--- js.orig/src/config/Linux_All.mk 2005-05-10 21:53:44.000000000 +0200
+++ js/src/config/Linux_All.mk 2006-01-26 11:38:12.000000000 +0100
@@ -91,8 +91,12 @@ endif
JS_EDITLINE = 1
ifeq ($(CPU_ARCH),x86_64)
-# Use VA_COPY() standard macro on x86-64
-# FIXME: better use it everywhere
+# Use va_copy() standard macro on x86-64
+OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
+endif
+
+ifeq ($(CPU_ARCH),ppc)
+# Use va_copy() standard macro on ppc too
OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
endif
diff -Naupr js.orig/src/jsprf.c js/src/jsprf.c
--- js.orig/src/jsprf.c 2004-09-24 05:31:15.000000000 +0200
+++ js/src/jsprf.c 2006-01-26 11:34:52.000000000 +0100
@@ -55,7 +55,7 @@
** and requires array notation.
*/
#ifdef HAVE_VA_COPY
-#define VARARGS_ASSIGN(foo, bar) VA_COPY(foo,bar)
+#define VARARGS_ASSIGN(foo, bar) va_copy(foo,bar)
#elif defined(HAVE_VA_LIST_AS_ARRAY)
#define VARARGS_ASSIGN(foo, bar) foo[0] = bar[0]
#else
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/js/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Nov 2004 02:47:15 -0000 1.2
+++ .cvsignore 1 Feb 2006 10:09:37 -0000 1.3
@@ -1 +1 @@
-js-1.5-rc6a.tar.gz
+js-1.5.tar.gz
Index: js.spec
===================================================================
RCS file: /cvs/extras/rpms/js/FC-4/js.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- js.spec 19 Apr 2005 20:19:07 -0000 1.6
+++ js.spec 1 Feb 2006 10:09:37 -0000 1.7
@@ -1,11 +1,9 @@
%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
-%define real_version 1.5-rc6a
-
Summary: JavaScript interpreter and libraries
Name: js
Version: 1.5
-Release: 0.rc6a.6
+Release: 2%{?dist}
%if 0%{?_without_readline:1}
License: MPL/GPL/LGPL
%else
@@ -13,15 +11,14 @@
%endif
Group: Development/Languages
URL: http://www.mozilla.org/js/
-Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz
+Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{version}.tar.gz
Patch0: js-make.patch
Patch1: js-shlib.patch
-Patch2: js-perlconnect.patch
-Patch3: js-va_copy.patch
-Patch4: js-ldflags.patch
+Patch2: js-1.5-va_copy.patch
+Patch3: js-ldflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: perl >= 1:5.6.1 readline-devel
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires: perl >= 1:5.6.1, readline-devel
Provides: libjs = %{version}-%{release}
%description
@@ -29,10 +26,11 @@
This package has been created for purposes of Sablotron and is suitable
for embedding in applications.
+
%package devel
Summary: Header files, libraries and development documentation for %{name}
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}, pkgconfig
Provides: libjs-devel = %{version}-%{release}
%description devel
@@ -40,73 +38,109 @@
documentation for %{name}. If you like to develop programs using %{name},
you will need to install %{name}-devel.
+
%prep
%setup -q -n %{name}
%patch0 -b .make
%patch1 -b .shlib
-%patch2 -b .perl
-%patch3 -p 1 -b .vacopy
-%patch4 -b .ldflags
-cp src/perlconnect/README.html src/README.perlconnect.html
+%patch2 -p1 -b .vacopy
+%patch3 -b .ldflags
+%{__cp} src/perlconnect/README.html src/README.perlconnect.html
+
+# Create pkgconfig file
+%{__cat} > libjs.pc << 'EOF'
+prefix=%{_prefix}
+exec_prefix=${_prefix}
+libdir=${_libdir}
+includedir=${_includedir}
+
+Name: libjs
+Description: JS library
+Requires:
+Version: %{version}
+Libs: -L${libdir} -ljs
+Cflags: -I${includedir}
+EOF
+
%build
export BUILD_OPT=1
%{__make} -C src -f Makefile.ref \
- XCFLAGS="%{optflags} -fPIC" \
- BUILD_OPT="1" \
+ XCFLAGS="%{optflags} -fPIC" \
+ BUILD_OPT="1" \
%if 0%{!?_without_readline:1}
- JS_READLINE="1" \
+ JS_READLINE="1" \
%endif
- JS_PERLCONNECT="1"
+ JS_PERLCONNECT="1"
cd src/perlconnect
-MAKEFLAGS=-s %{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"
+ MAKEFLAGS=-s %{__perl} Makefile.PL INSTALLDIRS=vendor
+ %{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"
cd -
+
%install
%{__rm} -rf %{buildroot}
-%{__install} -d -m0755 %{buildroot}%{_bindir} \
- %{buildroot}%{_libdir} \
- %{buildroot}%{_includedir}
-%{__install} -m0755 src/Linux_All_OPT.OBJ/js %{buildroot}%{_bindir}
-%{__install} -m0755 src/Linux_All_OPT.OBJ/jscpucfg %{buildroot}%{_bindir}
-%{__install} -m0755 src/Linux_All_OPT.OBJ/libjs.so %{buildroot}%{_libdir}/libjs.so.1
+%{__mkdir_p} %{buildroot}%{_bindir} \
+ %{buildroot}%{_libdir}/pkgconfig \
+ %{buildroot}%{_includedir}
+%{__install} -m 0755 src/Linux_All_OPT.OBJ/{js,jscpucfg} \
+ %{buildroot}%{_bindir}/
+%{__install} -m 0755 src/Linux_All_OPT.OBJ/libjs.{a,so} \
+ %{buildroot}%{_libdir}/
+%{__mv} %{buildroot}%{_libdir}/libjs.so %{buildroot}%{_libdir}/libjs.so.1
%{__ln_s} -nf libjs.so.1 %{buildroot}%{_libdir}/libjs.so
-%{__install} -m0755 src/Linux_All_OPT.OBJ/libjs.a %{buildroot}%{_libdir}
-%{__install} -m0644 src/js*.h src/Linux_All_OPT.OBJ/jsautocfg.h \
- %{buildroot}%{_includedir}
+%{__install} -m 0644 src/js*.h src/Linux_All_OPT.OBJ/jsautocfg.h \
+ %{buildroot}%{_includedir}/
+%{__install} -m 0644 libjs.pc \
+ %{buildroot}%{_libdir}/pkgconfig/
%{__make} -C src/perlconnect pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -o -name jsperlbuild.pl | xargs -r rm
find %{buildroot} -type f -name '*.bs' -a -size 0 | xargs -r rm
-chmod -R u+w %{buildroot}/*
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
%check || :
ln -s libjs.so src/Linux_All_OPT.OBJ/libjs.so.1
LD_LIBRARY_PATH=`pwd`/src/Linux_All_OPT.OBJ %{__make} -C src/perlconnect test
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%clean
-%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
+%doc src/README*.html src/perlconnect/bg.jpg
%{_bindir}/js
%{_libdir}/*.so.*
-%{perl_vendorarch}/auto/JS
+%{perl_vendorarch}/auto/JS/
%{perl_vendorarch}/*.pm
%files devel
%defattr(-, root, root, 0755)
-%doc src/README*.html src/perlconnect/bg.jpg
%{_bindir}/jscpucfg
+%{_libdir}/pkgconfig/*.pc
%{_libdir}/*.so
%{_libdir}/*.a
%{_includedir}/js*.h
+
%changelog
+* Mon Jan 30 2006 Matthias Saou <http://freshrpms.net/> 1.5.0-2
+- Fix .pc file.
+
+* Thu Jan 26 2006 Matthias Saou <http://freshrpms.net/> 1.5.0-1
+- Update to 1.5.0 final.
+- Spec file cleanups.
+- Move docs from devel to main, since we need the license there.
+- Remove no longer needed js-perlconnect.patch.
+- Update js-1.5-va_copy.patch.
+- Include a pkgconfig file (#178993).
+
* Tue Apr 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.5-0.rc6a.6
- Link shared lib with libperl.
@@ -130,3 +164,4 @@
* Tue Mar 02 2004 Dag Wieers <dag at wieers.com> - 1.5-0.rc6
- Initial package. (using DAR)
+
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/js/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Nov 2004 02:47:15 -0000 1.2
+++ sources 1 Feb 2006 10:09:37 -0000 1.3
@@ -1 +1 @@
-43e55003be28b4329b9005aedcc0f015 js-1.5-rc6a.tar.gz
+863bb6462f4ce535399a7c6276ae6776 js-1.5.tar.gz
--- js-va_copy.patch DELETED ---
More information about the scm-commits
mailing list