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

	* apt, bc, gnupg: rebuilt with new readline
	* readline: updated
	


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

a/apt/apt-vl.spec

@@ -11,7 +11,7 @@
 
 Name: apt
 Version: 0.5.15lorg3.95
-Release: 24.%{snapver}%{?_dist_release}
+Release: 25.%{snapver}%{?_dist_release}
 Summary: Advanced front-end for rpm (APT - Advanced Package Tool)
 Summary(ja): RPM の高機能なフロントエンド (APT - アドバンスドパッケージツール)
 Group: Applications/Administration
@@ -57,15 +57,15 @@ Patch1: apt-0.5.15lorg3.x-cache-corruption.patch
 Patch2: apt-0.5.15lorg3.95-gcc47.patch
 
 # enhance the sorting by taking Obsoletes into account
-Patch10:		%{name}-0.3.19cnc53-stelian-apt-pkg-algorithms-scores.patch.bz2
+Patch10: %{name}-0.3.19cnc53-stelian-apt-pkg-algorithms-scores.patch.bz2
 # ignore versionless reverse dependencies 
-Patch11:		%{name}-0.5.4cnc9-alt-packagemanager-CheckRConflicts.patch.bz2
+Patch11: %{name}-0.5.4cnc9-alt-packagemanager-CheckRConflicts.patch.bz2
 # alternative scoring method ( PreDepends implies -1 instead of +50 )
-Patch12:		%{name}-0.5.4cnc9-alt-pkgorderlist_score.patch.bz2
+Patch12: %{name}-0.5.4cnc9-alt-pkgorderlist_score.patch.bz2
 # add # to the list of the forbidden char in the name of cdrom
-Patch13:	%{name}-0.5.4cnc9-alt-specialchars.patch.bz2
+Patch13: %{name}-0.5.4cnc9-alt-specialchars.patch.bz2
 # a quick bugfixe to make build-dep work
-Patch16:    %{name}-build-dep.patch.bz2
+Patch16: %{name}-build-dep.patch.bz2
 
 # Vine patch
 # support "$(ARCH)" in sources.list
@@ -137,9 +137,9 @@ complete installation ordering, multiple source capability
 and several other unique features.
 
 %description -l ja
-これは rpm 対応の apt です。 apt-get は簡単かつ安全にパッケージ
+これは rpm 対応の apt です。apt-get は簡単かつ安全にパッケージ
-のアップグレード,インストールを行うことができるコマンドです。
+のアップグレード，インストールを行うことができるコマンドです。
-apt は依存関係の解決、インストール順序の補完などさまざまな特
+apt には依存関係の解決，インストール順序の補完などさまざまな特
 徴があります。
 
 
@@ -406,6 +406,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sat Mar 21 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.5.15lorg3.95-25.git522
+- rebuilt with readline 6.3
+
 * Sun Jun 29 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 0.5.15lorg3.95-24.git522
 - remove Patch230 which breaks some lua scripts..
 

b/bc/bc-vl.spec

@@ -2,14 +2,17 @@ Summary: GNU's bc (a numeric processing language) and dc (a calculator).
 Summary(ja): GNU bc (計算言語) と dc (計算機)
 Name: bc
 Version: 1.06.95
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
-License: GPL
+License: GPLv2+
 URL: 	http://www.gnu.org/software/bc/
-Group:  Applications/Edutainment
+Group:  Applications/Engineering
+
 Source: ftp://alpha.gnu.org/gnu/bc/bc-%{version}.tar.bz2
 Patch1: bc-1.06-dc_ibase.patch
 Patch2: bc-1.06.95-memleak.patch
 Patch3: bc-1.06.95-matlib.patch
+Patch4: bc-1.06.95-sigintmasking.patch
+Patch5: bc-1.06.95-doc.patch
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -42,6 +45,8 @@ bc は任意精度の計算言語です．dc はスタックを用いた対話
 %patch1 -p1 -b .dc_ibase
 %patch2 -p1 -b .memleak
 %patch3 -p1 -b .matlib
+%patch4 -p1 -b .sigintmask
+%patch5 -p1 -b .doc
 
 %build
 %configure --with-readline
@@ -57,25 +62,38 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info %{_infodir}/bc.info %{_infodir}/dir --entry="* bc: (bc).                      The GNU calculator language." || :
+if [ -e %{_infodir}/bc.info.gz -a -e %{_infodir}/dc.info.gz ]; then
-/sbin/install-info %{_infodir}/dc.info %{_infodir}/dir --entry="* dc: (dc).                      The GNU RPN calculator."|| :
+  /sbin/install-info %{_infodir}/bc.info.gz %{_infodir}/dir \
+  --entry="* bc: (bc).                      The GNU calculator language." || :
+  /sbin/install-info %{_infodir}/dc.info.gz %{_infodir}/dir \
+  --entry="* dc: (dc).                      The GNU RPN calculator." || :
+fi
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -e %{_infodir}/bc.info.gz -a -e %{_infodir}/dc.info.gz ]; then
-  /sbin/install-info --delete %{_infodir}/bc.info %{_infodir}/dir --entry="* bc: (bc).                      The GNU calculator language." || :
+  /sbin/install-info --delete %{_infodir}/bc.info.gz %{_infodir}/dir \
-  /sbin/install-info --delete %{_infodir}/dc.info %{_infodir}/dir --entry="* dc: (dc).                      The GNU RPN calculator." || :
+  --entry="* bc: (bc).                      The GNU calculator language." || :
+  /sbin/install-info --delete %{_infodir}/dc.info.gz %{_infodir}/dir \
+  --entry="* dc: (dc).                      The GNU RPN calculator." || :
 fi
 
-
 %files
 %defattr(-,root,root)
-%doc COPYING COPYING.LIB FAQ AUTHORS NEWS README
+%doc COPYING COPYING.LIB FAQ AUTHORS NEWS README Examples/
 %{_bindir}/bc
 %{_bindir}/dc
 %{_mandir}/*/*
 %{_infodir}/*
 
 %changelog
+* Sat Mar 21 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.06.95-3
+- added Patch4 and 5 from Fedora
+  * Wed Oct 02 2013 Frantisek Kluknavsky <fkluknav@redhat.com> - 1.06.95-11
+  - man and info patched - clarified scale after multiplication
+  * Thu Sep 08 2011 Ondrej Vasik <ovasik@redhat.com> 1.06.95-4
+  - do not mask SIGINT in dc when reading from stdin (#697340)
+- rebuilt with readline 6.3
+
 * Sat Dec 28 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.06.95-2
 - rebuild with VineSeed environment
 

g/gnupg/gnupg-vl.spec

@@ -2,7 +2,7 @@ Summary: A GNU utility for secure communication and data storage.
 Summary(ja): GNU 版の RFC2440 (OpenPGP) 公開鍵暗号プログラム
 Name: gnupg
 Version: 1.4.18
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
@@ -107,6 +107,9 @@ fi
 
 
 %changelog
+* Sat Mar 21 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.4.18-2
+- rebuilt with readline 6.3
+
 * Fri Jul 11 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.18-1
 - new upstream release.
 

r/readline/readline-vl.spec

@@ -1,31 +1,30 @@
 Summary: A library for editing typed in command lines.
-Summary(ja): readline ライブラリ
+Summary(ja): Readline ライブラリ
 
 Name: readline
-Version: 5.2
+Version: 6.3
-Release: 5%{?_dist_release}
+Release: 1%{?_dist_release}
-License: GPLv2
+License: GPLv3+
 Group: System Environment/Libraries
 URL: http://tiswww.tis.case.edu/~chet/readline/rltop.html
 Source: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz
 
 # upstream patches
-Patch1: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline52-001
+Patch1: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline63-001
-Patch2: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline52-002
+Patch2: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline63-002
-Patch3: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline52-003
+Patch3: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline63-003
-Patch4: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline52-004
+Patch4: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline63-004
-Patch5: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline52-005
+Patch5: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline63-005
-Patch6: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline52-006
+Patch6: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline63-006
-Patch7: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline52-007
+Patch7: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline63-007
-Patch8: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline52-008
+Patch8: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline63-008
-Patch9: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline52-009
+
-Patch10: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline52-010
+# add workaround for problem in gdb
-Patch11: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline52-011
+# in new version of readline needs to be deleted
-Patch12: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline52-012
+# bz701131
-Patch13: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline52-013
+Patch9: readline-6.2-gdb.patch
-Patch14: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline52-014
+# fix file permissions, remove RPATH, use CFLAGS
-
+Patch10: readline-6.2-shlib.patch
-Patch20: readline-5.2-shlib.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: sed
@@ -34,85 +33,70 @@ Requires(post): /sbin/install-info, /sbin/ldconfig
 Requires(preun): /sbin/install-info
 Requires(postun): /sbin/ldconfig
 
-
 Vendor: Project Vine
 Distribution: Vine Linux
 
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %description
-The readline library reads a line from the terminal and returns it,
+The Readline library provides a set of functions that allow users to
-allowing the user to edit the line with standard emacs editing keys.
+edit command lines. Both Emacs and vi editing modes are available. The
-The readline library allows programmers to provide an easy to use and
+Readline library includes additional functions for maintaining a list
-more intuitive interface for users.
+of previously-entered command lines for recalling or editing those
-
+lines, and for performing csh-like history expansion on previous
-If you want to develop programs that will use the readline library,
+commands.
-you'll also need to install the readline-devel package.
-
 
 %description -l ja
-"readline" ライブラリを用いると、端末から読みこんだ一行を、emacs の標準キー
+Readline ライブラリは、ユーザーがコマンドラインを編集する機能を提供します。
-と同キーバインディングで編集できるようになります。これをプログラム中で使うと、
+Emacs と vi の編集モードが利用可能です。Readline ライブラリはさらに、
-より使いやすいインタフェースをユーザに提供できます。
+これまで入力されたコマンドライン履歴を保持し、再利用する機能も備えています。
-
 
 %package devel
 Summary: Files needed to develop programs which use the readline library.
-Summary(ja): readline ライブラリを使うプログラムための開発用ライブラリ
+Summary(ja): Readline ライブラリを使うプログラムための開発用ライブラリ
 Group: Development/Libraries
 Requires: readline = %{version}
 Requires: ncurses-devel
 
 %description devel
-The readline library will read a line from the terminal and return it.
+The Readline library provides a set of functions that allow users to
-Use of the readline library allows programmers to provide an easy
+edit typed command lines. If you want to develop programs that will
-to use and more intuitive interface for users.
+use the readline library, you need to have the readline-devel package
-
+installed. You also need to have the readline package installed.
-If you want to develop programs which will use the readline library,
-you'll need to have the readline-devel package installed.  You'll also
-need to have the readline package installed.
 
 
 %package -n compat32-%{name}
 Summary: A library for editing typed in command lines.
-Summary(ja): readline ライブラリ
+Summary(ja): Readline ライブラリ
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
-The readline library reads a line from the terminal and returns it,
+The Readline library provides a set of functions that allow users to
-allowing the user to edit the line with standard emacs editing keys.
+edit command lines. Both Emacs and vi editing modes are available. The
-The readline library allows programmers to provide an easy to use and
+Readline library includes additional functions for maintaining a list
-more intuitive interface for users.
+of previously-entered command lines for recalling or editing those
-
+lines, and for performing csh-like history expansion on previous
-If you want to develop programs that will use the readline library,
+commands.
-you'll also need to install the readline-devel package.
-
 
 %description -n compat32-%{name} -l ja
-"readline" ライブラリを用いると、端末から読みこんだ一行を、emacs の標準キー
+Readline ライブラリは、ユーザーがコマンドラインを編集する機能を提供します。
-と同キーバインディングで編集できるようになります。これをプログラム中で使うと、
+Emacs と vi の編集モードが利用可能です。Readline ライブラリはさらに、
-より使いやすいインタフェースをユーザに提供できます。
+これまで入力されたコマンドライン履歴を保持し、再利用する機能も備えています。
-
 
 %package -n compat32-%{name}-devel
 Summary: Files needed to develop programs which use the readline library.
-Summary(ja): readline ライブラリを使うプログラムための開発用ライブラリ
+Summary(ja): Readline ライブラリを使うプログラムための開発用ライブラリ
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
 Requires: compat32-ncurses-devel
 
-
 %description -n compat32-%{name}-devel
-The readline library will read a line from the terminal and return it.
+The Readline library provides a set of functions that allow users to
-Use of the readline library allows programmers to provide an easy
+edit typed command lines. If you want to develop programs that will
-to use and more intuitive interface for users.
+use the readline library, you need to have the readline-devel package
-
+installed. You also need to have the readline package installed.
-If you want to develop programs which will use the readline library,
-you'll need to have the readline-devel package installed.  You'll also
-need to have the readline package installed.
-
 
 %prep
 %setup -q
@@ -126,27 +110,21 @@ need to have the readline package installed.
 %patch6 -p0 -b .006
 %patch7 -p0 -b .007
 %patch8 -p0 -b .008
-%patch9 -p0 -b .009
-%patch10 -p0 -b .010
-%patch11 -p0 -b .011
-%patch12 -p0 -b .012
-%patch13 -p0 -b .013
-%patch14 -p0 -b .014
 
-%patch20 -p1 -b .shlib
+%patch9 -p1 -b .gdb
+%patch10 -p1 -b .shlib
 
 %build
 export CPPFLAGS="-I%{_includedir}/ncurses"
 %configure
-make %{?_smp_mflags} all shared
+make %{?_smp_mflags}
 
 
 %install
 [ "${RPM_BUILD_ROOT}" != "/" ] && %__rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
 
-
+make DESTDIR=$RPM_BUILD_ROOT install
-%makeinstall
 
 mkdir $RPM_BUILD_ROOT/%{_lib}
 mv $RPM_BUILD_ROOT%{_libdir}/libreadline.so.* $RPM_BUILD_ROOT/%{_lib}
@@ -155,6 +133,8 @@ for l in $RPM_BUILD_ROOT%{_libdir}/libreadline.so; do
      sed 's,\(^/\|\)[^/][^/]*,..,g')/%{_lib}/$(readlink $l) $l
 done
 
+rm -rf $RPM_BUILD_ROOT%{_docdir}/readline
+rm -rf $RPM_BUILD_ROOT%{_datadir}/readline
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %clean
@@ -162,8 +142,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %post
 /sbin/ldconfig
-/sbin/install-info %{_infodir}/history.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/history.info.gz %{_infodir}/dir &> /dev/null
-/sbin/install-info %{_infodir}/readline.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/rluserman.info.gz %{_infodir}/dir &> /dev/null
+:
 
 %postun -p /sbin/ldconfig
 
@@ -173,26 +154,38 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %preun
 if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/history.info.gz %{_infodir}/dir
+   /sbin/install-info --delete %{_infodir}/history.info.gz %{_infodir}/dir &> /dev/null
-   /sbin/install-info --delete %{_infodir}/readline.info.gz %{_infodir}/dir
+   /sbin/install-info --delete %{_infodir}/rluserman.info.gz %{_infodir}/dir &> /dev/null
+fi
+:
+
+%post devel
+/sbin/install-info %{_infodir}/readline.info.gz %{_infodir}/dir &> /dev/null
+:
+
+%preun devel
+if [ $1 = 0 ]; then
+   /sbin/install-info --delete %{_infodir}/readline.info.gz %{_infodir}/dir &> /dev/null
 fi
+:
 
 %files
 %defattr(-,root,root)
-%doc CHANGELOG CHANGES COPYING INSTALL MANIFEST README USAGE
+%doc CHANGES COPYING NEWS README USAGE
 %doc doc/*.{html,pdf}
-%{_mandir}/man*/*
-%{_infodir}/*.info*
 /%{_lib}/libreadline*.so.*
 %{_libdir}/libhistory*.so.*
-
+%{_infodir}/history.info*
+%{_infodir}/rluserman.info*
 
 %files devel
 %defattr(-,root,root)
-%doc examples/
+%doc examples/*.c examples/*.h examples/rlfe
 %{_includedir}/readline
 %{_libdir}/lib*.a
 %{_libdir}/lib*.so
+%{_infodir}/readline.info*
+%{_mandir}/man*/*
 
 %if %{build_compat32}
 %files -n compat32-%{name}
@@ -207,6 +200,10 @@ fi
 %endif
 
 %changelog
+* Sat Mar 21 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 6.3-1
+- new upstream release
+- update upstream patches (patch1-8)
+
 * Fri Dec 27 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.2-5
 - rebuild with VineSeed environment