rpms/libssh2/devel libssh2.spec,1.14,1.15

[Chris Weyl]

Author: cweyl

Update of /cvs/extras/rpms/libssh2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25423

Modified Files:
	libssh2.spec 
Log Message:
* Mon Jan 18 2010 Chris Weyl <cweyl at alumni.drew.edu> 1.2.2-4
- enable tests; conditionalize sshd test, which fails with a funky SElinux
  error when run locally



Index: libssh2.spec
===================================================================
RCS file: /cvs/extras/rpms/libssh2/devel/libssh2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libssh2.spec	19 Jan 2010 05:34:11 -0000	1.14
+++ libssh2.spec	19 Jan 2010 06:18:57 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           libssh2
 Version:        1.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A library implementing the SSH2 protocol
 
 Group:          System Environment/Libraries
@@ -15,6 +15,9 @@ Patch0:         libssh2-1.2.2-padding.pa
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
 
+# tests
+BuildRequires:  openssh-server
+
 %description
 libssh2 is a library implementing the SSH2 protocol as defined by
 Internet Drafts: SECSH-TRANS(22), SECSH-USERAUTH(25),
@@ -70,8 +73,9 @@ rm -rf example/simple/.deps
 find example/ -type f '(' -name '*.am' -o -name '*.in' ')' -exec rm -v {} +
 
 %check
-# tests are currently not doing so well under rpmbuild
-#(cd tests && make check)
+# sshd/loopback test fails under local build, with selinux enforcing 
+%{?_without_sshd_tests:echo "Skipping sshd tests" ; echo "exit 0" > tests/ssh2.sh }
+(cd tests && make check)
 
 %clean
 rm -rf %{buildroot}
@@ -100,6 +104,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Jan 18 2010 Chris Weyl <cweyl at alumni.drew.edu> 1.2.2-4
+- enable tests; conditionalize sshd test, which fails with a funky SElinux
+  error when run locally
+
 * Mon Jan 18 2010 Chris Weyl <cweyl at alumni.drew.edu> 1.2.2-3
 - patch w/1aba38cd7d2658146675ce1737e5090f879f306; not yet in a GA release