rpms/js/devel js-1.7.0-make.patch, NONE, 1.1 js-1.7.0-threadsafe.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 js.spec, 1.19, 1.20 sources, 1.4, 1.5 js-1.5-threadsafe.patch, 1.1, NONE js-make.patch, 1.1, NONE

Sun Feb 3 12:42:39 UTC 2008

Author: thias

Update of /cvs/extras/rpms/js/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21324

Modified Files:
	.cvsignore js.spec sources 
Added Files:
	js-1.7.0-make.patch js-1.7.0-threadsafe.patch 
Removed Files:
	js-1.5-threadsafe.patch js-make.patch 
Log Message:
Update to 1.7.0, as 1.70 to avoid introducing an epoch for now...


js-1.7.0-make.patch:

--- NEW FILE js-1.7.0-make.patch ---
diff -Naupr js.orig/src/Makefile.ref js/src/Makefile.ref
--- js.orig/src/Makefile.ref	2006-07-26 21:16:47.000000000 +0200
+++ js/src/Makefile.ref	2007-11-20 22:00:35.000000000 +0100
@@ -335,8 +335,8 @@ ifdef USE_MSVC
 $(PROGRAM): $(PROG_OBJS) $(LIBRARY)
 	link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
 else
-$(PROGRAM): $(PROG_OBJS) $(LIBRARY)
-	$(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
+$(PROGRAM): $(PROG_OBJS) $(SHARED_LIBRARY)
+	$(CC) -o $@ $(CFLAGS) $(PROG_OBJS) -L$(OBJDIR) -ljs $(LDFLAGS) $(OTHER_LIBS) \
 	    $(PROG_LIBS)
 endif
 

js-1.7.0-threadsafe.patch:

--- NEW FILE js-1.7.0-threadsafe.patch ---
diff -Naupr js.orig/src/Makefile.ref js/src/Makefile.ref
--- js.orig/src/Makefile.ref	2006-07-26 21:16:47.000000000 +0200
+++ js/src/Makefile.ref	2007-11-20 22:03:59.000000000 +0100
@@ -63,11 +63,11 @@ INCLUDES   += -I$(OBJDIR)
 
 ifdef JS_THREADSAFE
 DEFINES += -DJS_THREADSAFE
-INCLUDES += -I$(DIST)/include/nspr
+INCLUDES += $(shell nspr-config --cflags)
 ifdef USE_MSVC
 OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib
 else
-OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX)
+OTHER_LIBS += $(shell nspr-config --libs)
 endif
 endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/js/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2007 12:26:40 -0000	1.4
+++ .cvsignore	3 Feb 2008 12:42:05 -0000	1.5
@@ -1 +1 @@
-js-1.60.tar.gz
+js-1.7.0.tar.gz


Index: js.spec
===================================================================
RCS file: /cvs/extras/rpms/js/devel/js.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- js.spec	24 Jan 2008 14:30:06 -0000	1.19
+++ js.spec	3 Feb 2008 12:42:05 -0000	1.20
@@ -1,9 +1,9 @@
-%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
+%define real_version 1.7.0
 
 Summary: JavaScript interpreter and libraries
 Name: js
-Version: 1.60
-Release: 6%{?dist}
+Version: 1.70
+Release: 1%{?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}
@@ -13,19 +13,16 @@
 %endif
 Group: Development/Languages
 URL: http://www.mozilla.org/js/
-Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{version}.tar.gz
-Patch0: js-make.patch
+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.5-threadsafe.patch
+Patch4: js-1.7.0-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(ExtUtils::MakeMaker), perl(ExtUtils::Embed)
-Buildrequires: readline-devel, ncurses-devel, nspr-devel
-# Temporary fix (#226970 - nspr-devel should require pkgconfig)
-Buildrequires: pkgconfig
+Buildrequires: nspr-devel
+Buildrequires: readline-devel, ncurses-devel
 Provides: libjs = %{version}-%{release}
 
 %description
@@ -37,7 +34,8 @@
 %package devel
 Summary: Header files, libraries and development documentation for %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}, pkgconfig
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 Provides: libjs-devel = %{version}-%{release}
 
 %description devel
@@ -48,13 +46,12 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -p0 -b .make
+%patch0 -p1 -b .make
 %patch1 -p0 -b .shlib
 %patch2 -p1 -b .vacopy
 %patch3 -p0 -b .ldflags
 %patch4 -p1 -b .threadsafe
 %patch5 -p1 -b .ncurses
-%{__cp} src/perlconnect/README.html src/README.perlconnect.html
 
 # Create pkgconfig file
 %{__cat} > libjs.pc << 'EOF'
@@ -66,7 +63,7 @@
 Name: libjs
 Description: JS library
 Requires:
-Version: %{version}
+Version: %{real_version}
 Libs: -L${libdir} -ljs
 Cflags: -I${includedir}
 EOF
@@ -74,19 +71,13 @@
 
 %build
 export BUILD_OPT=1
-%{__make} -C src -f Makefile.ref \
+%{__make} %{?_smp_mflags} -C src -f Makefile.ref \
     JS_THREADSAFE="1" \
     XCFLAGS="%{optflags} -fPIC" \
     BUILD_OPT="1" \
 %if 0%{!?_without_readline:1}
-    JS_READLINE="1" \
+    JS_READLINE="1"
 %endif
-    JS_PERLCONNECT="1"
-
-cd src/perlconnect
-    MAKEFLAGS=-s %{__perl} Makefile.PL INSTALLDIRS=vendor
-    %{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"
-cd -
 
 
 %install
@@ -107,23 +98,12 @@
     %{buildroot}%{_includedir}/
 %{__install} -m 0644 libjs.pc \
     %{buildroot}%{_libdir}/pkgconfig/
-%{__make} -C src/perlconnect pure_install PERL_INSTALL_ROOT=%{buildroot}
-# Remove unwanted perl related files
-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
-# For some reason, the pure_install above doesn't set u+w :-(
-find %{buildroot}%{perl_vendorarch} -type f -exec %{__chmod} u+w {} \;
 
 
 %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
@@ -131,11 +111,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc src/README*.html src/perlconnect/bg.jpg
+%doc src/README.html
 %{_bindir}/js
 %{_libdir}/*.so.*
-%{perl_vendorarch}/auto/JS/
-%{perl_vendorarch}/*.pm
 
 %files devel
 %defattr(-,root,root,-)
@@ -149,6 +127,10 @@
 
 
 %changelog
+* Sun Feb  3 2008 Matthias Saou <http://freshrpms.net/> 1.70-1
+- Update to 1.7.0, as 1.70 to avoid introducing an epoch for now...
+- Remove no longer provided perlconnect parts.
+
 * Thu Jan 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.60-6
 - BR: perl(ExtUtils::Embed)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/js/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Feb 2007 12:26:41 -0000	1.4
+++ sources	3 Feb 2008 12:42:05 -0000	1.5
@@ -1 +1 @@
-bd8f021e43a8fbbec55ac2cd3d483243  js-1.60.tar.gz
+5571134c3863686b623ebe4e6b1f6fe6  js-1.7.0.tar.gz


--- js-1.5-threadsafe.patch DELETED ---


--- js-make.patch DELETED ---


