ncurses-6.1-1

n/ncurses/ncurses-vl.spec

@@ -1,17 +1,16 @@
-Summary: A CRT screen handling and optimization package.
-Summary(ja): CRT スクリーンの操作と最適化を行うパッケージ
+%global revision 20190824
+
+Summary: A screen handling and optimization package.
+Summary(ja): スクリーンの操作と最適化を行うパッケージ
 Name: ncurses
-Version: 5.9
+Version: 6.1
 %define includedirw %{_includedir}/ncursesw
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
-Release: 3%{?_dist_release}
+Release: 1%{?_dist_release}
 License: distributable
 Group: System Environment/Libraries
-URL: http://dickey.his.com/ncurses/ncurses.html
-
-Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz
-
-Patch1: ncurses-5.9-20110409-20110716.patch.bz2
+URL: https://invisible-island.net/ncurses/ncurses.html
+Source0: https://invisible-mirror.net/archives/ncurses/current/ncurses-6.1-%{revision}.tgz
 Patch8: ncurses-config.patch
 Patch9: ncurses-libs.patch
 Patch11: ncurses-urxvt.patch
@@ -68,8 +67,8 @@ C++ bindings to ncurses
 
 
 %package -n compat32-%{name}
-Summary: A CRT screen handling and optimization package.
-Summary(ja): CRT スクリーンの操作と最適化を行うパッケージ
+Summary: A screen handling and optimization package.
+Summary(ja): スクリーンの操作と最適化を行うパッケージ
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -117,48 +116,70 @@ C++ bindings to ncurses
 
 
 %prep
-%setup -q
-%patch1 -p1
+%setup -q -n %{name}-%{version}-%{revision}
 
 %patch8 -p1 -b .config
 %patch9 -p1 -b .libs
 %patch11 -p1 -b .urxvt
 %patch12 -p1 -b .kbs
 
-find . -name "*.orig" -exec rm -f {} \;
-
+for f in ANNOUNCE; do
+    iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
+        touch -r ${f}{,_} && mv -f ${f}{_,}
+done
 
 %build
 %define rootdatadir /lib
-%define ncurses_options \\\
-    --with-shared --without-ada --with-ospeed=unsigned \\\
-    --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \\\
-    --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\
-    --enable-overwrite \\\
-    --enable-pc-files \\\
-    --with-termlib=tinfo \\\
-    --with-chtype=long
-
-mkdir narrowc widec
-cd narrowc
-ln -s ../configure .
-%configure %{ncurses_options} --with-ticlib
-make %{?_smp_mflags} libs
-make %{?_smp_mflags} -C progs
-
-cd ../widec
-ln -s ../configure .
-%configure %{ncurses_options} --enable-widec --without-progs
-make %{?_smp_mflags} libs
-cd ..
+common_options=" \
+    --enable-colorfgbg \
+    --enable-hard-tabs \
+    --enable-overwrite \
+    --enable-pc-files \
+    --enable-xmc-glitch \
+    --disable-stripping \
+    --disable-wattr-macros \
+    --with-ospeed=unsigned \
+    --with-pkg-config-libdir=%{_libdir}/pkgconfig \
+    --with-shared \
+    --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \
+    --with-termlib=tinfo \
+    --with-ticlib=tic \
+    --with-xterm-kbs=DEL \
+    --without-ada"
+abi5_options="--with-chtype=long"
+
+for abi in 5 6; do
+    for char in narrowc widec; do
+        mkdir $char$abi
+        pushd $char$abi
+        ln -s ../configure .
+
+        [ $abi = 6 -a $char = widec ] && progs=yes || progs=no
+
+        %configure $(
+            echo $common_options --with-abi-version=$abi
+            [ $abi = 5 ] && echo $abi5_options
+            [ $char = widec ] && echo --enable-widec
+            [ $progs = yes ] || echo --without-progs
+        )
+
+        make %{?_smp_mflags} libs
+        [ $progs = yes ] && make %{?_smp_mflags} -C progs
+
+        popd
+    done
+done
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-make -C narrowc DESTDIR=$RPM_BUILD_ROOT install.{libs,progs,data}
-rm -f $RPM_BUILD_ROOT%{_libdir}/libtinfo.*
-make -C widec DESTDIR=$RPM_BUILD_ROOT install.{libs,includes,man}
+make -C narrowc5 DESTDIR=$RPM_BUILD_ROOT install.libs
+rm ${RPM_BUILD_ROOT}%{_libdir}/lib{tic,tinfo}.so.5*
+make -C widec5 DESTDIR=$RPM_BUILD_ROOT install.libs
+make -C narrowc6 DESTDIR=$RPM_BUILD_ROOT install.libs
+rm ${RPM_BUILD_ROOT}%{_libdir}/lib{tic,tinfo}.so.6*
+make -C widec6 DESTDIR=$RPM_BUILD_ROOT install.{libs,progs,data,includes,man}
 
 chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.*
 chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/lib*.a
@@ -195,9 +216,12 @@ done
 
 # prepare -base and -term file lists
 for termname in \
-    Eterm cons25 cygwin gnome* hurd jfbterm mach* mlterm mrxvt \
-    nsterm putty* pcansi rxvt rxvt-\* screen screen-\* screen.* \
-    sun teraterm wsvt25* xfce xterm xterm-\*
+    ansi dumb linux vt100 vt100-nav vt102 vt220 vt52 \
+    Eterm\* aterm bterm cons25 cygwin eterm\* gnome gnome-256color hurd jfbterm \
+    konsole konsole-256color mach\* mlterm mrxvt nsterm putty{,-256color} pcansi \
+    rxvt{,-\*} screen{,-\*color,.[^mlp]\*,.linux,.mlterm\*,.putty{,-256color},.mrxvt} \
+    st{,-\*color} sun teraterm teraterm2.3 tmux{,-\*} vte vte-256color vwmterm \
+    wsvt25\* xfce xterm xterm-\*
 do
     for i in $RPM_BUILD_ROOT%{_datadir}/terminfo/?/$termname; do
         for t in $(find $RPM_BUILD_ROOT%{_datadir}/terminfo -samefile $i); do
@@ -322,6 +346,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 30 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.1-1
+- updated to 6.1 + 20190824.
+
 * Mon Jan 13 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.9-3
 - rebuild with VineSeed environment