dist-git conversion

- drop old patch0
- be more aggressive about keeping .deps from intruding into -docs

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: libssh2
-# $Id$
-NAME := libssh2
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

libssh2.spec

@@ -1,18 +1,19 @@
 Name:           libssh2
-Version:        1.2 
-Release:        2%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 Summary:        A library implementing the SSH2 protocol
 
 Group:          System Environment/Libraries
 License:        BSD
-URL:            http://www.libssh2.org/
-Source0:        http://libssh2.org/download/libssh2-%{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)
 
-Patch0:         transport_c_7a9d369.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
@@ -25,12 +26,13 @@ SECSH-DHGEX(04), and SECSH-NUMBERS(10).
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 
 %description    devel
 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}
@@ -42,7 +44,6 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
 
 # make sure things are UTF-8...
 for i in ChangeLog NEWS ; do
@@ -60,16 +61,17 @@ 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 
+find example/ -type d -name .deps -exec rm -rf {} +
 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}
@@ -92,11 +94,35 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING 
+%doc COPYING
 %{_includedir}/*
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Mar 12 2010 Chris Weyl <cweyl@alumni.drew.edu> 1.2.4-1
+- update to 1.2.4
+- drop old patch0
+- be more aggressive about keeping .deps from intruding into -docs
+
+* Wed Jan 20 2010 Chris Weyl <cweyl@alumni.drew.edu> 1.2.2-5
+- pkgconfig dep should be with -devel, not -docs
+
+* Mon Jan 18 2010 Chris Weyl <cweyl@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@alumni.drew.edu> 1.2.2-3
+- patch w/1aba38cd7d2658146675ce1737e5090f879f306; not yet in a GA release
+
+* Thu Jan 14 2010 Chris Weyl <cweyl@alumni.drew.edu> 1.2.2-2
+- correct bad file entry under -devel
+
+* Thu Jan 14 2010 Chris Weyl <cweyl@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@alumni.drew.edu> 1.2-2
 - patch based on 683aa0f6b52fb1014873c961709102b5006372fc
 - disable tests (*sigh*)

sources

@@ -1 +1 @@
-751f4b5b5d8091f84cfe25fa52226cf9  libssh2-1.2.tar.gz
+4d65a66d5f232e5bb1d05b311e43d46d  libssh2-1.2.4.tar.gz