diff --git a/ncurses.spec b/ncurses.spec index b3482b7..74faef6 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,6 +1,6 @@ %define majver %(echo %version | cut -d. -f 1) Name: ncurses -Version: 6.4 +Version: 6.5 Release: 1mamba Summary: A CRT screen handling and optimization package Group: System/Libraries @@ -14,6 +14,8 @@ Patch1: ncurses-6.3-pkgconfig.patch License: MIT ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libgcc +BuildRequires: libstdc++6-devel ## AUTOBUILDREQ-END %if "%{stage1}" != "1" BuildRequires: emacs >= 21.3 @@ -64,15 +66,19 @@ The header files and libraries for developing applications that use the ncurses %setup -q # Do not link against test libraries -%patch0 -p1 -b .libs +%patch 0 -p1 -b .libs # Do not leak build-time LDFLAGS into the pkgconfig files -%patch1 -p1 -b .pkgconfig +%patch 1 -p1 -b .pkgconfig %build mkdir narrowc widec cd narrowc ln -s ../configure . %configure \ + --disable-root-access \ + --disable-root-environ \ + --disable-setuid-environ \ + --disable-widec \ --with-pkg-config-libdir=%{_libdir}/pkgconfig \ --with-install-prefix=%{buildroot} \ --with-normal \ @@ -89,14 +95,18 @@ ln -s ../configure . %if "%{stage1}" == "1" CPPFLAGS="-ldl" %endif -# --enable-termcap \ %make cd ../widec ln -s ../configure . %configure \ + --disable-root-access \ + --disable-root-environ \ + --disable-setuid-environ \ --enable-widec \ + --with-cxx-binding \ + --with-cxx-shared \ --with-pkg-config-libdir=%{_libdir}/pkgconfig \ --with-install-prefix=%{buildroot} \ --with-normal \ @@ -110,10 +120,7 @@ ln -s ../configure . --enable-pc-files \ --with-ticlib \ --with-versioned-syms \ -%if "%{stage1}" == "1" - CPPFLAGS="-ldl" -%endif -# --enable-termcap \ + --with-xterm-kbs=del \ %make cd .. @@ -136,19 +143,6 @@ cd .. ln -sf ../l/linux %{buildroot}%{_datadir}/terminfo/c/console -#mv %{buildroot}%{_datadir}/terminfo/x/xterm \ -# %{buildroot}%{_datadir}/terminfo/x/xterm-original -#ln -s xterm-xfree86 %{buildroot}%{_datadir}/terminfo/x/xterm - -#install -d %{buildroot}/%{_lib} -#mv %{buildroot}%{_libdir}/libncurses.so.5* %{buildroot}/%{_lib} -#ln -sf /%{_lib}/libncurses.so.5 %{buildroot}%{_libdir}/libncurses.so -#ln -sf /%{_lib}/libncurses.so.5 %{buildroot}%{_libdir}/libcurses.so - -#mv %{buildroot}%{_libdir}/libncursesw.so.5* %{buildroot}/%{_lib} -#ln -sf /%{_lib}/libncursesw.so.5 %{buildroot}%{_libdir}/libncursesw.so -#ln -sf /%{_lib}/libncursesw.so.5 %{buildroot}%{_libdir}/libcursesw.so - ln -sf libncursesw.a %{buildroot}%{_libdir}/libcurses.a ln -sf libncursesw.a %{buildroot}%{_libdir}/libcursesw.a @@ -173,26 +167,6 @@ for lib in tic tinfo; do ln -sfv ncursesw.pc %{buildroot}%{_libdir}/pkgconfig/${lib}.pc done -## fix strange permissions -#chmod 755 %{buildroot}/%{_libdir}/*.so.* - -#DEFAULT_TERMINFOS="\ -#ansi ansi-m console dumb color_xterm linux pcansi-m screen vt52 vt100 vt102 vt220 \ -#xterm xterm-256color" -# -#find %{buildroot}%{_datadir}/terminfo -type d | sed "s|^%{buildroot}|%dir |" >> filelist-terminfo -#find %{buildroot}%{_datadir}/terminfo -type f -o -type l | sed "s|^%{buildroot}||" > filelist-terminfo -# -#> filelist-terminfo-default -#for t in $DEFAULT_TERMINFOS; do -# F=`grep "/${t}\$" filelist-terminfo` -# [ "$F" ] && { -# echo "$F" >> filelist-terminfo-default -# sed -i "/\/${t}$/d" filelist-terminfo -# } -#done -#: - %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -224,17 +198,17 @@ fi %files -n libncurses %defattr(-,root,root) %{_libdir}/libform.so.* -%{_libdir}/libformw.so.* %{_libdir}/libmenu.so.* -%{_libdir}/libmenuw.so.* +%{_libdir}/libncurses++w.so.* %{_libdir}/libncurses.so.* -%{_libdir}/libncursesw.so.* %{_libdir}/libpanel.so.* +%{_libdir}/libformw.so.* +%{_libdir}/libmenuw.so.* +%{_libdir}/libncursesw.so.* %{_libdir}/libpanelw.so.* %{_libdir}/libtic.so.* %{_libdir}/libticw.so.* %{_libdir}/libtinfo.so.* -#%{_datadir}/terminfo/* %ifnarch x86_64 aarch64 %{_libdir}/terminfo %endif @@ -242,18 +216,34 @@ fi %files -n libncurses-devel %defattr(-,root,root) %{_bindir}/ncurses%{majver}-config + %{_bindir}/ncursesw%{majver}-config -%{_datadir}/tabset/* %{_includedir}/* -%{_libdir}/lib*.so -%{_libdir}/*.a +%{_datadir}/tabset/* +%{_libdir}/libcurses*.so +%{_libdir}/libform*.so +%{_libdir}/libmenu*.so +%{_libdir}/libncurses*.so +%{_libdir}/libpanel*.so +%{_libdir}/libtic*.so +%{_libdir}/libtinfo.so +%{_libdir}/libcurses*.a +%{_libdir}/libform.a +%{_libdir}/libmenu.a +%{_libdir}/libpanel.a +%{_libdir}/libtic.a +%{_libdir}/libformw.a +%{_libdir}/libmenuw.a +%{_libdir}/libncurses*.a +%{_libdir}/libpanelw.a +%{_libdir}/libticw.a %{_libdir}/pkgconfig/form.pc %{_libdir}/pkgconfig/formw.pc %{_libdir}/pkgconfig/menu.pc %{_libdir}/pkgconfig/menuw.pc +%{_libdir}/pkgconfig/ncurses.pc %{_libdir}/pkgconfig/ncurses++.pc %{_libdir}/pkgconfig/ncurses++w.pc -%{_libdir}/pkgconfig/ncurses.pc %{_libdir}/pkgconfig/ncursesw.pc %{_libdir}/pkgconfig/panel.pc %{_libdir}/pkgconfig/panelw.pc @@ -261,10 +251,8 @@ fi %{_libdir}/pkgconfig/ticw.pc %{_libdir}/pkgconfig/tinfo.pc %{_mandir}/man3/* -%doc doc/html/hackguide.html -%doc doc/html/ncurses-intro.html -%doc c++/README* -%doc README ANNOUNCE doc/html/announce.html +#%doc c++/README* +#%doc README ANNOUNCE doc/html/announce.html %files terminfo %defattr(-,root,root) @@ -272,6 +260,9 @@ fi %{_datadir}/terminfo/* %changelog +* Mon Jul 29 2024 Automatic Build System 6.5-1mamba +- automatic version update by autodist + * Sun Jan 01 2023 Automatic Build System 6.4-1mamba - automatic version update by autodist