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

Avoid private requirement due (lib)tinfo is used for both, normal and wide

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=458
This commit is contained in:
Dr. Werner Fink
2019-12-16 10:34:37 +00:00
committed by Git OBS Bridge
parent e63774fa2e
commit 83c1b6075d
4 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ncurses.spec
View File

@@ -602,13 +602,10 @@ mv tack-* tack
rm -vf %{root}%{_libdir}/pkgconfig/tic.pc
rm -vf %{root}%{_libdir}/pkgconfig/tinfo.pc
mv -vf %{root}%{_libdir}/pkgconfig/*.pc pc/
sed -ri 's@^(Requires.private: ).*@\1panelw, menuw, formw, ncursesw, tinfo@' \
pc/ncurses++w.pc
sed -ri 's@^(Requires.private: ).*@\1ncursesw, tinfo@' pc/{form,menu,panel}w.pc
sed -ri 's@^(Libs.private: .*)@\1 -lncursesw -ltinfo -ldl@' pc/{form,menu,panel}w.pc
sed -ri 's@^(Requires.private:).*@\1@' pc/*.pc
sh %{S:6} --cflags "$(pkg-config --cflags ncursesw)" --libs "$(pkg-config --libs ncursesw)" \
%{root}%{_bindir}/ncursesw6-config
#
# Some tests
#
@@ -695,14 +692,9 @@ mv tack-* tack
sed -ri 's@^(libdir=).*@\1%{_libdir}/ncurses5@' "$pc"
sed -ri 's@^(Libs: )(.*)@\1-L${libdir}\2@' "$pc"
mv -f $pc pc/${base}5.pc
sed -ri 's@^(Cflags:.*)@\1-I%{_incdir}/ncurses5 @' pc/${base}5.pc
sed -ri 's@^(Requires.private:).*@\1@' pc/${base}5.pc
done
sed -ri 's@^(Requires.private: ).*@\1panel5, menu5, form5, ncurses5, tinfo5@' \
pc/ncurses++5.pc
sed -ri 's@^(Requires.private: ).*@\1ncurses5, tinfo5@' pc/{form,menu,panel}5.pc
sed -ri 's@^(Libs.private: .*)@\1 -lncurses -ltinfo -ldl@' pc/{form,menu,panel}5.pc
sed -ri 's@^(Requires.private: ).*@\1tinfo5@' pc/tic5.pc
sed -ri 's@^(Libs.private: .*)@\1 -ltinfo@' pc/tic5.pc
sh %{S:6} --cflags "$(pkg-config --cflags ncurses5)" --libs "$(pkg-config --libs ncurses5)" \
%{root}%{_bindir}/ncurses5-config
@@ -752,13 +744,7 @@ mv tack-* tack
sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1
popd
mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/
sed -ri 's@^(Requires.private: ).*@\1panel, menu, form, ncurses, tinfo@' \
pc/ncurses++.pc
sed -ri 's@^(Requires.private: ).*@\1ncurses, tinfo@' pc/{form,menu,panel}.pc
sed -ri 's@^(Libs.private: .*)@\1 -lncurses -ltinfo -ldl@' pc/{form,menu,panel}.pc
sed -ri 's@^(Requires.private: ).*@\1tinfo@' pc/tic.pc
sed -ri 's@^(Libs.private: .*)@\1 -ltinfo@' pc/tic.pc
sed -ri 's@^(Requires.private:).*@\1@' pc/*.pc
sh %{S:6} --cflags "$(pkg-config --cflags ncurses)" --libs "$(pkg-config --libs ncurses)" \
%{root}%{_bindir}/ncurses6-config
#
@@ -843,12 +829,9 @@ mv tack-* tack
sed -ri 's@^(libdir=).*@\1%{_libdir}/ncurses5@' "$pc"
sed -ri 's@^(Libs: )(.*)@\1-L${libdir}\2@' "$pc"
mv -f $pc pc/${base}5.pc
sed -ri 's@^(Cflags:.*)@\1-I%{_incdir}/ncurses5 @' pc/${base}5.pc
sed -ri 's@^(Requires.private:).*@\1@' pc/${base}5.pc
done
sed -ri 's@^(Requires.private: ).*@\1panelw5, menuw5, formw5, ncursesw5, tinfo5@' \
pc/ncurses++w5.pc
sed -ri 's@^(Requires.private: ).*@\1ncursesw5, tinfo5@' pc/{form,menu,panel}w5.pc
sed -ri 's@^(Libs.private: .*)@\1 -lncursesw -ltinfo -ldl@' pc/{form,menu,panel}w5.pc
sh %{S:6} --cflags "$(pkg-config --cflags ncursesw5)" --libs "$(pkg-config --libs ncursesw5)" \
%{root}%{_bindir}/ncursesw5-config