Revision: 48598
Author: river
Date: 2009-03-19 19:12:16 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
TSopenssh: convert to new build system; put /opt/ts/bin in front of default
path for scp etc
Modified Paths:
--------------
trunk/tools/ts-specs/TSopenssh.spec
Modified: trunk/tools/ts-specs/TSopenssh.spec
===================================================================
--- trunk/tools/ts-specs/TSopenssh.spec 2009-03-19 19:11:33 UTC (rev 48597)
+++ trunk/tools/ts-specs/TSopenssh.spec 2009-03-19 19:12:16 UTC (rev 48598)
@@ -38,39 +38,28 @@
%build
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
- CPUS=1
-fi
+%include stdenv.inc
+%_configure --with-solaris-contracts \
+ --with-zlib=/usr/sfw \
+ --with-audit=bsm \
+ --with-ssl-dir=/usr/sfw \
+ --with-pam \
+ --with-privsep-user=daemon \
+ --with-privsep-path=/var/opt/ts/ssh/empty \
+ --with-xauth=/usr/openwin/bin/xauth \
+ --sysconfdir=/etc/opt/ts/ssh \
+ --libexecdir=/opt/ts/lib/openssh \
+ --with-libedit \
+ --with-default-path=/opt/ts/bin:/usr/bin:/sbin:/usr/sbin
-export CC="cc"
-export CXX="CC"
-export CFLAGS="%optflags"
-export LDFLAGS="%{_ldflags} -L/opt/ts/lib -L/usr/sfw/lib
-R/opt/ts/lib:/usr/sfw/lib"
-export CPPFLAGS="-I/opt/ts/include -I/usr/sfw/include"
+%_make
-./configure \
- --prefix=%{_prefix} \
- --mandir=%{_mandir} \
- --sysconfdir=%{_sysconfdir} \
- --with-solaris-contracts \
- --with-zlib=/usr/sfw \
- --with-audit=bsm \
- --with-ssl-dir=/usr/sfw \
- --with-pam \
- --with-privsep-user=daemon \
- --with-privsep-path=/var/opt/ts/ssh/empty \
- --with-xauth=/usr/openwin/bin/xauth \
- --sysconfdir=/etc/opt/ts/ssh \
- --libexecdir=/opt/ts/lib/openssh \
- --with-libedit
-
-gmake -j$CPUS
-
%install
rm -rf $RPM_BUILD_ROOT
-gmake install DESTDIR=$RPM_BUILD_ROOT
+%include stdenv.inc
+%_make install DESTDIR=$RPM_BUILD_ROOT
+
mkdir -p $RPM_BUILD_ROOT/var/svc/manifest/network
cp %SOURCE2 $RPM_BUILD_ROOT/var/svc/manifest/network
mkdir -p $RPM_BUILD_ROOT/lib/svc/method
@@ -80,60 +69,33 @@
rm -rf $RPM_BUILD_ROOT
%files
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
+%defattr (-, root, root)
%{_bindir}/*
-%dir %attr (0755, root, bin) %{_libdir}
-%dir %attr (0755, root, bin) %{_libdir}/openssh
%{_libdir}/openssh/ssh-keysign
-%dir %attr (0755, root, sys) %{_datadir}
-%dir %attr (0755, root, bin) %{_mandir}
-%dir %attr (0755, root, bin) %{_mandir}/man1
%{_mandir}/man1/*
-%dir %attr (0755, root, bin) %{_mandir}/man5
%{_mandir}/man5/ssh_config.5
-%dir %attr (0755, root, bin) %{_mandir}/man8
%{_mandir}/man8/ssh-keysign.8
%files root
-%defattr (-, root, bin)
-%dir %attr (0755, root, sys) /etc
-%dir %attr (0755, root, sys) /etc/opt
-%dir %attr (0755, root, sys) /etc/opt/ts
-%dir %attr (0755, root, sys) /etc/opt/ts/ssh
+%defattr (-, root, sys)
%class(preserve) /etc/opt/ts/ssh/ssh_config
%files server
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_sbindir}
+%defattr (-, root, root)
%{_sbindir}/*
-%dir %attr (0755, root, bin) %{_libdir}
-%dir %attr (0755, root, bin) %{_libdir}/openssh
%{_libdir}/openssh/sftp-server
-%dir %attr (0755, root, sys) %{_datadir}
%{_datadir}/Ssh.bin
-%dir %attr (0755, root, bin) %{_mandir}
-%dir %attr (0755, root, bin) %{_mandir}/man5
%{_mandir}/man5/sshd_config.5
%{_mandir}/man5/moduli.5
-%dir %attr (0755, root, bin) %{_mandir}/man8
%{_mandir}/man8/sshd.8
%{_mandir}/man8/sftp-server.8
%files server-root
-%defattr (-, root, bin)
-%dir %attr (0755, root, sys) /etc
-%dir %attr (0755, root, sys) /etc/opt
-%dir %attr (0755, root, sys) /etc/opt/ts
-%dir %attr (0755, root, sys) /etc/opt/ts/ssh
+%defattr (-, root, sys)
%class(preserve) /etc/opt/ts/ssh/sshd_config
%class(preserve) /etc/opt/ts/ssh/moduli
-%dir %attr (0755, root, sys) /var
-%dir %attr (0755, root, sys) /var/svc
-%dir %attr (0755, root, sys) /var/svc/manifest
-%dir %attr (0755, root, sys) /var/svc/manifest/network
%class(manifest) /var/svc/manifest/network/TSopenssh.xml
-%dir %attr (0755, root, sys) /var/opt
+%dir /var/opt
%dir %attr (0755, root, root) /var/opt/ts
%dir %attr (0755, root, root) /var/opt/ts/ssh
%dir %attr (0755, root, root) /var/opt/ts/ssh/empty
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
