2015-03-24 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* libedit: added compat32
	* mozjs24: rebuilt
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9469 ec354946-7b23-47d6-9f5a-488ba84defc7

lib/libe/libedit/libedit-vl.spec

@@ -1,20 +1,20 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define snap 20140620
 
 Summary:	The NetBSD Editline library
 Summary(ja):	NetBSD Editline ライブラリ
 Name:		libedit
 Version:	3.1
-Release:	1.%{snap}%{?_dist_release}
+Release:	2.%{snap}%{?_dist_release}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.thrysoee.dk/editline/
-Source0:	http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
 
+Source0:	http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
 # bz #575383
 Patch1:		libedit-3.0-sigwinch.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	gawk
 BuildRequires:	ncurses-devel
 
@@ -35,6 +35,30 @@ Requires:	ncurses-devel
 %description devel
 This package contains development files for %{name}.
 
+
+%package -n compat32-%{name}
+Summary:	The NetBSD Editline library
+Summary(ja):	NetBSD Editline ライブラリ
+Group:		System Environment/Libraries
+Requires: 	%{name} = %{version}-%{release}
+
+%description -n compat32-%{name}
+Libedit is an autotool- and libtoolized port of the NetBSD Editline library.
+It provides generic line editing, history, and tokenization functions, similar
+to those found in GNU Readline.
+
+%package -n compat32-%{name}-devel
+Summary:	Development files for %{name}
+Summary(ja):	%{name} の開発ファイル
+Group: 		Development/Libraries
+Requires: 	%{name}-devel = %{version}-%{release}
+Requires: 	compat32-%{name} = %{version}-%{release}
+Requires: 	compat32-pkgconfig
+Requires: 	compat32-ncurses-devel
+
+%description -n compat32-%{name}-devel
+This package contains development files for %{name}.
+
 %prep
 %setup -q -n %{name}-%{snap}-%{version}
 %patch1 -p1
@@ -61,9 +85,13 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
+%if %{build_compat32}
+%post -n compat32-%{name} -p /sbin/ldconfig
+%postun -n compat32-%{name} -p /sbin/ldconfig
+%endif
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING THANKS
@@ -71,17 +99,31 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc examples/fileman.c examples/test.c
+%doc examples/*.c 
+%{_includedir}/histedit.h
+%dir %{_includedir}/editline
+%{_includedir}/editline/readline.h
+%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
 %doc %{_mandir}/man3/*
 %doc %{_mandir}/man5/editrc.5*
-%{_includedir}/histedit.h
+
+%if %{build_compat32}
+%files -n compat32-%{name}
+%defattr(-,root,root)
+%{_libdir}/%{name}.so.*
+
+%files -n compat32-%{name}-devel
+%defattr(-,root,root)
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
+%endif
 
-%dir %{_includedir}/editline
-%{_includedir}/editline/readline.h
 
 %changelog
+* Tue Mar 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.1-2.20140620
+- added compat32 subpackage
+
 * Sun Jul 06 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1-1.20140620
 - update to 20140620 snap
 

m/mozjs24/mozjs24-vl.spec

@@ -1,29 +1,26 @@
-Summary:	The Mozilla library for JavaScript
+Summary:	JavaScript interpreter and libraries
+Summary(ja):	JavaScript インタプリタ及びライブラリ
 Name:		mozjs24
 Version:	24.2.0
-Release:	1%{?_dist_release}
-# 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
+Release:	2%{?_dist_release}
+License:	MPLv2.0
 Group:		Development/Languages
 URL:		http://www.mozilla.org/js/
-Source0:	http://ftp.mozilla.org/pub/mozilla.org/js/mozjs-24.2.0.tar.bz2	
+Source0:	http://ftp.mozilla.org/pub/mozilla.org/js/mozjs-%{version}.tar.bz2	
+
+Patch0:		js17-build-fixes.patch
+Patch1:		mozjs24-0001-Add-AArch64-support.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
 Buildrequires:	nspr-devel >= 4.7
 Buildrequires:	readline-devel
-BuildRequires:	autoconf213
 BuildRequires:	python
 BuildRequires:	zip
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: Takemikaduchi
+Vendor: 	Project Vine
+Distribution: 	Vine Linux
+Packager: 	Takemikaduchi
 
 %description
 JavaScript is the Netscape-developed object scripting language used in millions
@@ -31,14 +28,13 @@ of web pages and server applications worldwide. Netscape's JavaScript is a
 superset of the ECMA-262 Edition 3 (ECMAScript) standard scripting language,
 with only mild differences from the published standard.
 
-
 %package devel
-Summary: Header files, libraries and development documentation for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-Requires: ncurses-devel readline-devel
-Provides: libjs-devel = %{version}-%{release}
+Summary: 	Header files, libraries and development documentation for %{name}
+Summary(ja): 	%{name} のヘッダファイル、ライブラリ及び開発用ドキュメント
+Group: 		Development/Libraries
+Requires: 	%{name} = %{version}-%{release}
+Requires: 	pkgconfig
+Provides: 	libjs-devel = %{version}-%{release}
 
 %description devel
 This package contains the header files, static libraries and development
@@ -48,30 +44,29 @@ you will need to install %{name}-devel.
 
 %prep
 %setup -q -n mozjs-%{version}
-cd js
-
-# Rm parts with spurios licenses, binaries
-rm -rf src/ctypes/libffi src/editline
+# Delete bundled sources
+rm js/src/editline -rf
+rm js/src/ctypes/libffi -rf
+%patch0 -p1
+%patch1 -p1
+chmod a+x configure
 
-pushd src
-autoconf-2.13
+%build
 %configure \
-    --with-system-nspr \
-    --enable-threadsafe \
-%if 0%{!?_without_readline:1}
-	--enable-readline \
-%endif
-
-popd
+  --disable-static \
+  --with-system-nspr \
+  --enable-threadsafe \
+  --enable-readline \
+  --enable-xterm-updates
 
-
-%build
-cd js
-%{__make} %{?_smp_mflags} -C src
+make %{?_smp_mflags}
 
 %install
-cd js
-%{__make} -C src install DESTDIR=%{buildroot}
+%{__rm} -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+# For some reason the headers and pkg-config file are executable
+find %{buildroot}%{_includedir} -type f -exec chmod a-x {} \;
+chmod a-x  %{buildroot}%{_libdir}/pkgconfig/*.pc
 
 %{__rm} -rf %{buildroot}%{_libdir}/*.a
 %{__rm} -rf %{buildroot}%{_libdir}/*.la
@@ -88,7 +83,7 @@ cd js
 
 %files
 %defattr(-,root,root,-)
-%doc js/src/README.html
+%doc LICENSE README
 %{_bindir}/js24
 %{_libdir}/libmozjs-24.so
 
@@ -99,6 +94,11 @@ cd js
 %{_libdir}/pkgconfig/mozjs-24.pc
 
 %changelog
+* Tue Mar 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 24.2.0-2
+- rebuilt with readline 6.3
+- fixed License
+- added Japanese summary
+
 * Sat Mar 29 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 24.2.0-1
 - initial build