r48170 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r48169‎ | r48170 | r48171 >
Date:17:38, 8 March 2009
Author:river
Status:deferred
Tags:
Comment:
TSlibedit: fix package name
TSopenssh: build with TSlibedit to get command line editing in sftp
Modified paths:
  • /trunk/tools/ts-specs/TSopenssh.spec (modified) (history)
  • /trunk/tools/ts-specs/base-specs/libedit.spec (modified) (history)

Diff [purge]

Index: trunk/tools/ts-specs/TSopenssh.spec
@@ -8,6 +8,9 @@
99 Source2: TSopenssh.xml
1010 Patch1: openssh-01-hpn.diff
1111
 12+Requires: TSlibedit
 13+BuildRequires: TSlibedit
 14+
1215 SUNW_BaseDir: %{_basedir}
1316 BuildRoot: %{_tmppath}/%{name}-%{version}-build
1417 %include default-depend.inc
@@ -43,8 +46,8 @@
4447 export CC="cc"
4548 export CXX="CC"
4649 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"
4952
5053 ./configure \
5154 --prefix=%{_prefix} \
@@ -59,7 +62,8 @@
6063 --with-privsep-path=/var/opt/ts/ssh/empty \
6164 --with-xauth=/usr/openwin/bin/xauth \
6265 --sysconfdir=/etc/opt/ts/ssh \
63 - --libexecdir=/opt/ts/lib/openssh
 66+ --libexecdir=/opt/ts/lib/openssh \
 67+ --with-libedit
6468
6569 gmake -j$CPUS
6670
Index: trunk/tools/ts-specs/base-specs/libedit.spec
@@ -1,4 +1,4 @@
2 -Name: TSedit
 2+Name: TSlibedit
33 Summary: BSD editline
44 Version: 20090111-3.0
55 Source: http://thrysoee.dk/editline/libedit-%{version}.tar.gz

Status & tagging log