diff --git a/ncurses-5.9.dif b/ncurses-5.9.dif index a21093f..1c3f9ba 100644 --- a/ncurses-5.9.dif +++ b/ncurses-5.9.dif @@ -990,3 +990,23 @@ #define CANCELLED_NUMERIC (-2) #define CANCELLED_STRING (char *)(-1) +--- package/ncursest.map ++++ package/ncursest.map 2015-01-21 14:41:45.809518532 +0000 +@@ -345,6 +345,7 @@ NCURSES_TINFO_5.7.20081102 { + _nc_screen_of; + _nc_set_no_padding; + _nc_set_tputs_trace; ++ _nc_sigprocmask; + _nc_stdscr; + _nc_strcodes; + _nc_strfnames; +--- package/ncursestw.map ++++ package/ncursestw.map 2015-01-21 14:42:04.281518331 +0000 +@@ -346,6 +346,7 @@ NCURSES_TINFO_5.7.20081102 { + _nc_screen_of; + _nc_set_no_padding; + _nc_set_tputs_trace; ++ _nc_sigprocmask; + _nc_stdscr; + _nc_strcodes; + _nc_strfnames; diff --git a/ncurses.changes b/ncurses.changes index 107e520..66f6185 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 21 15:58:08 UTC 2015 - werner@suse.de + +- Now with symbol version control + ------------------------------------------------------------------- Wed Jan 21 13:24:17 UTC 2015 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index 94480ea..1f21b69 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -17,7 +17,7 @@ %bcond_with hasheddb -%bcond_with symversion +%bcond_without symversion Name: ncurses #!BuildIgnore: terminfo @@ -454,19 +454,23 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src --mandir=%{_mandir} \ --includedir=%{_incdir} \ "${WITHCHTYPE}" \ - --disable-widec \ --disable-tic-depends \ --with-cxx-shared \ --with-ticlib=tic \ --with-pc-suffix \ --enable-pc-files \ %if %{with symversion} - --with-versioned-syms \ +%if %abi >= 6 + --with-versioned-syms=${PWD}/package/ncursest.map \ +%else + --with-versioned-syms=${PWD}/package/ncurses.map \ +%endif %endif %if %{with hasheddb} --with-hashed-db \ %endif --with-pkg-config-libdir=%{_libdir}/pkgconfig + sleep 1 kill $pid # # The configure line @@ -551,7 +555,16 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src # > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! - eval screen -L -D -m ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --disable-widec --disable-ext-colors --without-progs + eval screen -L -D -m ./${c#*./} --with-pthread \ + --enable-reentrant \ + --enable-ext-mouse \ + --disable-widec \ + --disable-ext-colors \ +%if %{with symversion} + --with-versioned-syms=${PWD}/package/ncursest.map \ +%endif + --without-progs + sleep 1 kill $pid find -name fallback.o | xargs -r rm -vf cp fallback.c.build ncurses/fallback.c @@ -582,10 +595,25 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! %if %abi >= 6 - eval screen -L -D -m ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --enable-widec --enable-ext-colors --without-progs -%else - eval screen -L -D -m ./${c#*./} --disable-ext-mouse --enable-widec --disable-ext-colors --without-progs + eval screen -L -D -m ./${c#*./} --with-pthread \ + --enable-reentrant \ + --enable-ext-mouse \ + --enable-widec \ + --enable-ext-colors \ +%if %{with symversion} + --with-versioned-syms=${PWD}/package/ncursestw.map \ %endif + --without-progs +%else + eval screen -L -D -m ./${c#*./} --disable-ext-mouse \ + --enable-widec \ + --disable-ext-colors \ +%if %{with symversion} + --with-versioned-syms=${PWD}/package/ncursesw.map \ +%endif + --without-progs +%endif + sleep 1 kill $pid find -name fallback.o | xargs -r rm -vf cp fallback.c.build ncurses/fallback.c @@ -613,7 +641,16 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src # > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! - eval screen -L -D -m ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --enable-widec --enable-ext-colors --without-progs + eval screen -L -D -m ./${c#*./} --with-pthread \ + --enable-reentrant \ + --enable-ext-mouse \ + --enable-widec \ + --enable-ext-colors \ +%if %{with symversion} + --with-versioned-syms=${PWD}/package/ncursestw.map \ +%endif + --without-progs + sleep 1 kill $pid find -name fallback.o | xargs -r rm -vf cp fallback.c.build ncurses/fallback.c