rpms/js/devel js-1.60-ncurses.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 js.spec, 1.13, 1.14 sources, 1.3, 1.4

Matthias Saou (thias) fedora-extras-commits at redhat.com
Fri Feb 2 12:27:13 UTC 2007


Author: thias

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

Modified Files:
	.cvsignore js.spec sources 
Added Files:
	js-1.60-ncurses.patch 
Log Message:
Update to 1.60, link against ncurses (#226773), fix perl file modes (#224603).


js-1.60-ncurses.patch:

--- NEW FILE js-1.60-ncurses.patch ---
diff -Naupr js.orig/src/Makefile.ref js/src/Makefile.ref
--- js.orig/src/Makefile.ref	2006-08-21 20:58:45.000000000 +0200
+++ js/src/Makefile.ref	2007-02-02 12:59:06.000000000 +0100
@@ -132,7 +132,7 @@ endif 
 ifdef JS_READLINE
 # For those platforms with the readline library installed.
 DEFINES += -DEDITLINE
-PROG_LIBS += -lreadline -ltermcap
+PROG_LIBS += -lreadline -lncurses
 else
 ifdef JS_EDITLINE
 # Use the editline library, built locally.


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


Index: js.spec
===================================================================
RCS file: /cvs/extras/rpms/js/devel/js.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- js.spec	28 Aug 2006 08:36:50 -0000	1.13
+++ js.spec	2 Feb 2007 12:26:41 -0000	1.14
@@ -2,8 +2,8 @@
 
 Summary: JavaScript interpreter and libraries
 Name: js
-Version: 1.5
-Release: 6%{?dist}
+Version: 1.60
+Release: 1%{?dist}
 %if 0%{?_without_readline:1}
 License: MPL/GPL/LGPL
 %else
@@ -17,9 +17,12 @@
 Patch2: js-1.5-va_copy.patch
 Patch3: js-ldflags.patch
 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, nspr-devel
+BuildRequires: perl >= 1:5.6.1, readline-devel, ncurses-devel, nspr-devel
+# Temporary fix (#226970 - nspr-devel should require pkgconfig)
+Buildrequires: pkgconfig
 Provides: libjs = %{version}-%{release}
 
 %description
@@ -47,6 +50,7 @@
 %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
@@ -98,8 +102,11 @@
 %{__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
@@ -134,6 +141,12 @@
 
 
 %changelog
+* Fri Feb  2 2007 Matthias Saou <http://freshrpms.net/> 1.60-1
+- Update to 1.60.
+- Rebuild in order to link against ncurses instead of termcap (#226773).
+- Add ncurses-devel build requirement and patch s/termcap/ncurses/ in.
+- Change mode of perl library from 555 to 755 (#224603).
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.5-6
 - Fix pkgconfig file (#204232 & dupe #204236).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/js/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Jan 2006 15:42:51 -0000	1.3
+++ sources	2 Feb 2007 12:26:41 -0000	1.4
@@ -1 +1 @@
-863bb6462f4ce535399a7c6276ae6776  js-1.5.tar.gz
+bd8f021e43a8fbbec55ac2cd3d483243  js-1.60.tar.gz




More information about the scm-commits mailing list