rpm/ncurses
SHA256
1
0
Fork 0
forked from pool/ncurses
Code Pull Requests Activity

pcre2

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=530
This commit is contained in:
Dr. Werner Fink 2021-02-09 09:33:58 +00:00 committed by Git OBS Bridge
parent a482db674d
commit 0d6f4a9f2c
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ncurses.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 9 09:33:11 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- For (lib)pcre2 support the devel package has to require this
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 8 08:46:27 UTC 2021 - Dr. Werner Fink <werner@suse.de> Mon Feb 8 08:46:27 UTC 2021 - Dr. Werner Fink <werner@suse.de>

18
ncurses.spec
View File

@ -25,6 +25,7 @@
%bcond_with memleakck %bcond_with memleakck
%bcond_without onlytinfo %bcond_without onlytinfo
%bcond_with libbsd %bcond_with libbsd
%bcond_without usepcre2
%if %{with onlytinfo} %if %{with onlytinfo}
%global soname_tinfo tinfo %global soname_tinfo tinfo
@ -47,7 +48,9 @@ BuildRequires: pkg-config
BuildRequires: pkgconfig(libbsd) BuildRequires: pkgconfig(libbsd)
%endif %endif
BuildRequires: screen BuildRequires: screen
%if %{with usepcre2}
BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libpcre2-8)
%endif
%if 0%{?suse_version} > 1130 %if 0%{?suse_version} > 1130
BuildRequires: gpm-devel BuildRequires: gpm-devel
%else %else
@ -214,6 +217,9 @@ Provides: ncurses:%{_incdir}/ncurses.h
Requires: %{_bindir}/tack Requires: %{_bindir}/tack
Requires: libncurses6 = %{version}-%{release} Requires: libncurses6 = %{version}-%{release}
Requires: ncurses = %{version}-%{release} Requires: ncurses = %{version}-%{release}
%if %{with usepcre2}
Requires: pkgconfig(libpcre2-8)
%endif
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: ncurses-devel-64bit Obsoletes: ncurses-devel-64bit
@ -495,7 +501,9 @@ mv tack-* tack
--with-default-terminfo-dir=%{_datadir}/terminfo \ --with-default-terminfo-dir=%{_datadir}/terminfo \
--with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo \ --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo \
--with-xterm-kbs=del \ --with-xterm-kbs=del \
%if %{with usepcre2}
--with-pcre2 \ --with-pcre2 \
%endif
--disable-stripping \ --disable-stripping \
--disable-root-environ \ --disable-root-environ \
--disable-termcap \ --disable-termcap \
@ -665,8 +673,13 @@ mv tack-* tack
LIBS="$LDFLAGS" \ LIBS="$LDFLAGS" \
./configure --with-ncursesw --enable-widec --prefix=$PWD ./configure --with-ncursesw --enable-widec --prefix=$PWD
LD_LIBRARY_PATH=%{root}%{_libdir} \ LD_LIBRARY_PATH=%{root}%{_libdir} \
%if %{with usepcre2}
make %{?_smp_mflags} TEST_ARGS='-lformw -lmenuw -lpanelw -lncursesw -lticw -l%{soname_tinfo} -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8' make %{?_smp_mflags} TEST_ARGS='-lformw -lmenuw -lpanelw -lncursesw -lticw -l%{soname_tinfo} -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8'
make install TEST_ARGS='-lformw -lmenuw -lpanelw -lncursesw -lticw -l%{soname_tinfo} -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8' make install TEST_ARGS='-lformw -lmenuw -lpanelw -lncursesw -lticw -l%{soname_tinfo} -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8'
%else
make %{?_smp_mflags} TEST_ARGS='-lformw -lmenuw -lpanelw -lncursesw -lticw -l%{soname_tinfo} -Wl,--as-needed' TEST_LIBS='-lutil -lpthread'
make install TEST_ARGS='-lformw -lmenuw -lpanelw -lncursesw -lticw -l%{soname_tinfo} -Wl,--as-needed' TEST_LIBS='-lutil -lpthread'
%endif
mv bin binw mv bin binw
make distclean make distclean
popd popd
@ -800,8 +813,13 @@ includedir5=%{_incdir}/ncurses5' "$pc"
LIBS="$LDFLAGS" \ LIBS="$LDFLAGS" \
./configure --with-ncurses --disable-widec --prefix=$PWD ./configure --with-ncurses --disable-widec --prefix=$PWD
LD_LIBRARY_PATH=%{root}%{_libdir} \ LD_LIBRARY_PATH=%{root}%{_libdir} \
%if %{with usepcre2}
make %{?_smp_mflags} TEST_ARGS='-lform -lmenu -lpanel -lncurses -ltic -ltinfo -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8' make %{?_smp_mflags} TEST_ARGS='-lform -lmenu -lpanel -lncurses -ltic -ltinfo -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8'
make install TEST_ARGS='-lform -lmenu -lpanel -lncurses -ltic -ltinfo -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8' make install TEST_ARGS='-lform -lmenu -lpanel -lncurses -ltic -ltinfo -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8'
%else
make %{?_smp_mflags} TEST_ARGS='-lform -lmenu -lpanel -lncurses -ltic -ltinfo -Wl,--as-needed' TEST_LIBS='-lutil -lpthread'
make install TEST_ARGS='-lform -lmenu -lpanel -lncurses -ltic -ltinfo -Wl,--as-needed' TEST_LIBS='-lutil -lpthread'
%endif
make distclean make distclean
popd popd
%endif %endif