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

	* bind, guild, js, unixODBC: rebuilt
	* ed: updated
	


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

b/bind/bind-vl.spec

@@ -11,13 +11,15 @@
 %define bind_uid  25
 %define bind_gid  25
 
+%bcond_with readline
+
 Summary: A DNS (Domain Name System) server.
 Summary(ja): DNS (Domain Name System) サーバ
 Name: %{pname}
 Version: %{pversion}
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Epoch: %{bind_epoch}
-License: distributable
+License: ISC and BSD and Public Domain
 Group: System Environment/Daemons
 URL: http://www.isc.org/bind.html
 
@@ -30,9 +32,12 @@ Source5: keygen.c
 Patch1: bind-9.3.3rc2-rndckey.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: openssl-devel glibc-devel libtool readline-devel
+BuildRequires: openssl-devel glibc-devel libtool
 BuildRequires: libxml2-devel
 BuildRequires: libcap-devel
+%if %{with readline}
+BuildRequires: readline-devel
+%endif
 Requires(pre): %{pname}-utils = %{bind_epoch}:%{version}-%{release}
 Requires(pre): shadow-utils
 Requires: %{pname}-libs = %{bind_epoch}:%{version}-%{release}
@@ -128,6 +133,9 @@ autoconf
 %configure \
   --with-libtool \
   --with-openssl=/usr \
+%if %{without readline}
+    --without-readline \
+%endif
   --disable-openssl-version-ceck \
   --enable-threads \
   --enable-ipv6 \
@@ -299,6 +307,9 @@ fi
 %{_bindir}/isc-config.sh
 
 %changelog
+* Mon Mar 23 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 9.9.6.P2-2
+- rebuilt without readline to avoid GPL infection
+
 * Fri Feb 27 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 9.9.6.P2-1
 - new upstream release with secrity fix (CVE-2015-1349)
 - added BR: readline-devel

e/ed/ed-vl.spec

@@ -1,14 +1,14 @@
 Summary: The GNU line editor.
 Summary(ja): GNU ラインエディタ
 Name: ed
-Version: 1.9
+Version: 1.10
 Release: 1%{?_dist_release}
 
-License: GPLv3+
+License: GPLv3+ and GFDL
 Group: Applications/Text
 URL: http://www.gnu.org/software/ed/
 
-Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires(post): /sbin/install-info
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 22 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.10-1
+- updated to 1.10
+
 * Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.9-1
 - update to 1.9
 

g/guile/guile-vl.spec

@@ -5,7 +5,7 @@ Name: guile
 Summary: A GNU implementation of Scheme for application extensibility.
 Summary(ja): アプリケーション拡張用 Scheme の GNU な実装
 Version: 2.0.11
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 Group: Development/Languages
 License: GPLv2+ and LGPLv2+ and GFDL and OFSFDL
@@ -59,7 +59,7 @@ install the guile package.
 %package -n compat32-%{name}
 Summary: A GNU implementation of Scheme for application extensibility.
 Summary(ja): アプリケーション拡張用 Scheme の GNU な実装
-Group: Development/Languages
+Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -140,9 +140,11 @@ if [ "$1" = 0 ]; then
 fi
 :
 
+%if %{build_compat32}
 %post -n compat32-%{name} -p /sbin/ldconfig
 
 %postun -n compat32-%{name} -p /sbin/ldconfig
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -194,6 +196,9 @@ fi
 %endif
 
 %changelog
+* Tue Mar 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.0.11-2
+- rebuilt with readline 6.3
+
 * Sun Jan 25 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.11-1
 - update to 2.0.11
 - add BuildRequires: libunistring-devel, libffi-devel, gc-devel

j/js/js-vl.spec

@@ -1,33 +1,36 @@
 #% global hgdate 51702867d932
 
 Summary:	JavaScript interpreter and libraries
+Summary(ja):	JavaScript インタプリタ及びライブラリ
 Name:		js
+Epoch:		1
 Version:	1.8.5
-Release:	3%{?hgdate:.hg%{hgdate}}%{?_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}
+Release:	4%{?hgdate:.hg%{hgdate}}%{?_dist_release}
 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
 Patch0:		js-1.8.5-64bit-big-endian.patch
 Patch1:		js-1.8.5-secondary-jit.patch
 Patch2:		js185-destdir.patch
-Patch3:		js-1.8.5-configure.patch
-Patch4:		js-1.8.5-537701.patch
-Patch5:		js185-arm-nosoftfp.patch
-Provides:		libjs = %{version}-%{release}
+#Patch3:	js-1.8.5-configure.patch
+Patch3:		js-1.8.5-537701.patch
+Patch4:		js185-arm-nosoftfp.patch
+Patch5:		js185-libedit.patch
+Patch6:		0001-Make-js-config.h-multiarch-compatible.patch
+
+Provides:	libjs = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires:	nspr-devel >= 4.7, python, zip
-Buildrequires:	readline-devel, ncurses-devel, autoconf213
-Epoch:		1
+BuildRequires:	nspr-devel >= 4.7
+BuildRequires:, python
+BuildRequires:  zip
+BuildRequires:	libedit-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  autoconf213
 
-Vendor: Project Vine
-Distribution: Vine Linux
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
 %description
 JavaScript is the Netscape-developed object scripting language used in millions
@@ -38,10 +41,11 @@ with only mild differences from the published standard.
 
 %package devel
 Summary: Header files, libraries and development documentation for %{name}
+Summary(ja): %{name} のヘッダファイル、ライブラリ及び開発用ドキュメント
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: pkgconfig
-Requires: ncurses-devel readline-devel
+Requires: ncurses-devel
 Provides: libjs-devel = %{version}-%{release}
 
 %description devel
@@ -56,9 +60,11 @@ you will need to install %{name}-devel.
 %patch0 -p2 -b .64bit-big-endian
 %patch1 -p2 -b .secondary-jit
 %patch2 -p0 -b .destdir
-%patch3 -p1 -b .version
-%patch4 -p1 -b .537701
-%patch5 -p1 -b .armhfp
+%patch3 -p1 -b .537701
+%patch4 -p1 -b .armhfp
+%patch5 -p1 -b .libedit
+%patch6 -p1 -b .multiarch
+
 cd js
 
 # Rm parts with spurios licenses, binaries
@@ -68,13 +74,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
-
 popd
 
 # Create pkgconfig file
@@ -94,10 +93,17 @@ 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
+%{__rm} -rf %{buildroot}
 cd js
 %{__make} -C src install DESTDIR=%{buildroot}
 # We don't want this
@@ -146,6 +152,9 @@ popd
 %{_includedir}/prmjtime.h
 
 %changelog
+* Mon Mar 23 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1:1.8.5-4
+- added Patch5 to build with libedit instead of readline
+
 * Tue Dec 31 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1:1.8.5-3
 - rebuild with VineSeed environment
 

u/unixODBC/unixODBC-vl.spec

@@ -1,12 +1,8 @@
-%define __libtoolize true
-
-%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.8.5)
-%define _qt4_bindir %(pkg-config --variable bindir --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{_qt4_version}/bin)
-
 Name: unixODBC
-Summary: A complete ODBC Driver Manager for Linux
 Version: 2.3.2
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Summary: A complete ODBC Driver Manager for Linux
+Summary(ja): Linux 用 ODBC ドライバマネージャー
 
 Group: System Environment/Libraries
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
@@ -31,43 +27,27 @@ Patch10: unixODBC-isql.1.patch
 Conflicts: iodbc
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libX11-devel libXt-devel libXext-devel
-BuildRequires: qt4-devel qt-assistant-adp-devel readline-devel
 BuildRequires: automake autoconf libtool libtool-ltdl-devel bison flex
-BuildRequires: desktop-file-utils
+BuildRequires: readline-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
 
 %description
-The unixODBC Project goals are to develop and promote unixODBC to
-be the definitive standard for ODBC on the Linux platform. This is to
-include GUI support for KDE.
-
-Install unixODBC if you'd like to access databases through ODBC. This
-package include drivers for PostgreSQL and local files.
-
-If you want to develop programs that will access data through ODBC,
-you'll also need to have the unixODBC package installed.
+Install unixODBC if you want to access databases through ODBC.
+You will also need the mysql-connector-odbc package if you want to access
+a MySQL database, and/or the postgresql-odbc package for PostgreSQL.
 
 %package devel
 Summary: Development files for programs which will use the unixODBC library.
+Summary(ja): unixODBC ライブラリを用いるプログラムのための開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description devel
-Install unixODBC if you'd like to access databases through ODBC drivers.
-
-If you want to develop programs that will access data through ODBC, 
-you'll also need to install the unixODBC-devel (this) package.
-
-%package kde
-Summary: KDE DriverManager components for ODBC
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description kde
-Components for the ODBCConfig and DataManager (KDE) Components of unixODBC.
+The unixODBC package can be used to access databases through ODBC
+drivers. If you want to develop programs that will access data through
+ODBC, you need to install this package.
 
 %prep
 %setup -q
@@ -105,6 +85,7 @@ export CFLAGS CXXFLAGS
 make all
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 
@@ -168,10 +149,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
-%post kde -p /sbin/ldconfig
-
-%postun kde -p /sbin/ldconfig
-
 %files -f base-so-list
 %doc README COPYING AUTHORS ChangeLog NEWS doc
 %doc README.dist
@@ -188,6 +165,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Tue Mar 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.3.2-2
+- rebuilt with readline 6.3
+- removed kde-subpackage-related BuildRequires
+- added Japanese summary
+
 * Tue Jul  8 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.2-1
 - new upstream release.
 - gui was discontinued in upstream.