Index: trunk/tools/ts-specs/TSopenssh.spec |
— | — | @@ -8,6 +8,9 @@ |
9 | 9 | Source2: TSopenssh.xml |
10 | 10 | Patch1: openssh-01-hpn.diff |
11 | 11 | |
| 12 | +Requires: TSlibedit |
| 13 | +BuildRequires: TSlibedit |
| 14 | + |
12 | 15 | SUNW_BaseDir: %{_basedir} |
13 | 16 | BuildRoot: %{_tmppath}/%{name}-%{version}-build |
14 | 17 | %include default-depend.inc |
— | — | @@ -43,8 +46,8 @@ |
44 | 47 | export CC="cc" |
45 | 48 | export CXX="CC" |
46 | 49 | export CFLAGS="%optflags" |
47 | | -export LDFLAGS="%{_ldflags} -L/usr/sfw/lib -R/usr/sfw/lib" |
48 | | -export CPPFLAGS="-I/usr/sfw/include" |
| 50 | +export LDFLAGS="%{_ldflags} -L/opt/ts/lib -L/usr/sfw/lib -R/opt/ts/lib:/usr/sfw/lib" |
| 51 | +export CPPFLAGS="-I/opt/ts/include -I/usr/sfw/include" |
49 | 52 | |
50 | 53 | ./configure \ |
51 | 54 | --prefix=%{_prefix} \ |
— | — | @@ -59,7 +62,8 @@ |
60 | 63 | --with-privsep-path=/var/opt/ts/ssh/empty \ |
61 | 64 | --with-xauth=/usr/openwin/bin/xauth \ |
62 | 65 | --sysconfdir=/etc/opt/ts/ssh \ |
63 | | - --libexecdir=/opt/ts/lib/openssh |
| 66 | + --libexecdir=/opt/ts/lib/openssh \ |
| 67 | + --with-libedit |
64 | 68 | |
65 | 69 | gmake -j$CPUS |
66 | 70 | |
Index: trunk/tools/ts-specs/base-specs/libedit.spec |
— | — | @@ -1,4 +1,4 @@ |
2 | | -Name: TSedit |
| 2 | +Name: TSlibedit |
3 | 3 | Summary: BSD editline |
4 | 4 | Version: 20090111-3.0 |
5 | 5 | Source: http://thrysoee.dk/editline/libedit-%{version}.tar.gz |