rpms/libssh2/F-11 libssh2.spec,1.7,1.8 sources,1.3,1.4

[Chris Weyl]

Author: cweyl

Update of /cvs/extras/rpms/libssh2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5880

Modified Files:
	libssh2.spec sources 
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/F-11/libssh2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libssh2.spec	25 Feb 2009 19:06:30 -0000	1.7
+++ libssh2.spec	20 Jan 2010 02:33:30 -0000	1.8
@@ -1,16 +1,22 @@
 Name:           libssh2
-Version:        1.0 
-Release:        2%{?dist}
+Version:        1.2.2
+Release:        4%{?dist}
 Summary:        A library implementing the SSH2 protocol
 
 Group:          System Environment/Libraries
 License:        BSD
-URL:            http://www.libssh2.org/
-Source0:        http://downloads.sourceforge.net/libssh2/%{name}-%{version}.tar.gz
+URL:            http://www.libssh2.org
+Source0:        http://libssh2.org/download/libssh2-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# aka commit 1aba38cd7d2658146675ce1737e5090f879f306
+Patch0:         libssh2-1.2.2-padding.patch
+
 BuildRequires:  openssl-devel
-BuildRequires:  zlib-devel   
+BuildRequires:  zlib-devel
+
+# tests
+BuildRequires:  openssh-server
 
 %description
 libssh2 is a library implementing the SSH2 protocol as defined by
@@ -28,10 +34,11 @@ Requires:       %{name} = %{version}-%{r
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-%package        docs 
+%package        docs
 Summary:        Documentation for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 
 %description    docs
 The %{name}-docs package contains man pages and examples for
@@ -40,6 +47,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+%patch0 -p1
 
 # make sure things are UTF-8...
 for i in ChangeLog NEWS ; do
@@ -57,14 +65,16 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} INSTALL="install -p"
-find %{buildroot} -name '*.la' -exec rm -f {} + 
+find %{buildroot} -name '*.la' -exec rm -f {} +
 
 # clean things up a bit for packaging
 ( cd example && make clean )
-rm -rf example/simple/.deps 
+rm -rf example/simple/.deps
 find example/ -type f '(' -name '*.am' -o -name '*.in' ')' -exec rm -v {} +
 
 %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
@@ -88,11 +98,40 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING 
+%doc COPYING
 %{_includedir}/*
 %{_libdir}/*.so
+%{_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
+
+* Thu Jan 14 2010 Chris Weyl <cweyl at alumni.drew.edu> 1.2.2-2
+- correct bad file entry under -devel
+
+* Thu Jan 14 2010 Chris Weyl <cweyl at alumni.drew.edu> 1.2.2-1
+- update to 1.2.2
+- drop old patch now in upstream
+- add new pkgconfig file to -devel
+
+* Mon Sep 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.2-2
+- patch based on 683aa0f6b52fb1014873c961709102b5006372fc
+- disable tests (*sigh*)
+
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.2-1
+- update to 1.2
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-4
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libssh2/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Feb 2009 04:43:59 -0000	1.3
+++ sources	20 Jan 2010 02:33:31 -0000	1.4
@@ -1 +1 @@
-c3602adae912702ba9cbefbe813b7b5b  libssh2-1.0.tar.gz
+fa8d9cd425bdd62f57244fc61fb54da7  libssh2-1.2.2.tar.gz