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

Addd missing space between two include options for ABI 5 package configuration

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=459
This commit is contained in:
Dr. Werner Fink 2019-12-17 09:05:36 +00:00 committed by Git OBS Bridge
parent 83c1b6075d
commit 12696e09fb
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ncurses.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 17 09:03:41 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Addd missing space between two include options for ABI 5
package configuration
-------------------------------------------------------------------
Mon Dec 16 10:15:37 UTC 2019 - Dr. Werner Fink <werner@suse.de>

14
ncurses.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ncurses
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2019 SUSE LLC.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -688,11 +688,13 @@ mv tack-* tack
test -e "$pc" || break
base=${pc%%.pc}
base=${base##*/}
sed -ri 's@^(includedir=).*@\1%{_incdir}/ncurses5/ncurses@' "$pc"
sed -ri '\@includedir=@i\
includedir5=%{_incdir}/ncurses5' "$pc"
sed -ri 's@^(includedir=).*@\1${includedir5}/ncurses@' "$pc"
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@^(Cflags:.*)(-I.*)@\1-I${includedir5} \2@' pc/${base}5.pc
sed -ri 's@^(Requires.private:).*@\1@' pc/${base}5.pc
done
sh %{S:6} --cflags "$(pkg-config --cflags ncurses5)" --libs "$(pkg-config --libs ncurses5)" \
@ -825,11 +827,13 @@ mv tack-* tack
test -e "$pc" || break
base=${pc%%.pc}
base=${base##*/}
sed -ri 's@^(includedir=).*@\1%{_incdir}/ncurses5/ncursesw@' "$pc"
sed -ri '\@includedir=@i\
includedir5=%{_incdir}/ncurses5' "$pc"
sed -ri 's@^(includedir=).*@\1${includedir5}/ncurses@' "$pc"
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@^(Cflags:.*)(-I.*)@\1-I${includedir5} \2@' pc/${base}5.pc
sed -ri 's@^(Requires.private:).*@\1@' pc/${base}5.pc
done
sh %{S:6} --cflags "$(pkg-config --cflags ncursesw5)" --libs "$(pkg-config --libs ncursesw5)" \