OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Aug-2007 11:01:54
Branch: HEAD Handle: 2007082610015300
Modified files:
openpkg-src/libssh2 libssh2.patch libssh2.spec
Log:
remove Perl binding as it now lives in the new perl-ssh package
Summary:
Revision Changes Path
1.11 +0 -23 openpkg-src/libssh2/libssh2.patch
1.18 +4 -32 openpkg-src/libssh2/libssh2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libssh2/libssh2.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 libssh2.patch
--- openpkg-src/libssh2/libssh2.patch 26 Jun 2007 06:19:32 -0000 1.10
+++ openpkg-src/libssh2/libssh2.patch 26 Aug 2007 09:01:53 -0000 1.11
@@ -1,26 +1,3 @@
-Index: Net-SSH2-0.10/Makefile.PL
---- Net-SSH2-0.10/Makefile.PL.orig 2005-11-19 19:03:08 +0100
-+++ Net-SSH2-0.10/Makefile.PL 2006-06-24 21:50:09 +0200
-@@ -10,8 +10,8 @@
- my @define = $win32 ? (DEFINE => '-DLIBSSH2_WIN32') : ();
-
- # override library and include directory here if desired
--my $lib = '';
--my $inc = '';
-+my $lib = '../src';
-+my $inc = '../include';
-
- # try to find libSSH2 if we're not given a location
- unless($lib and $inc) {
-@@ -39,7 +39,7 @@
- die "Quitting since I can't find $missing";
- }
-
--$lib = "-L$lib -lssh2";
-+$lib = "-L$lib -lssh2 -lcrypto -lz -lm";
- $inc = "-I$inc";
- print "Net::SSH2: using library $lib and include path $inc.\n";
-
Index: libssh-0.2/include/libssh/priv.h
--- libssh-0.2/include/libssh/priv.h.orig 2006-12-29 16:03:59 +0100
+++ libssh-0.2/include/libssh/priv.h 2007-01-09 17:44:24 +0100
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libssh2/libssh2.spec
============================================================================
$ cvs diff -u -r1.17 -r1.18 libssh2.spec
--- openpkg-src/libssh2/libssh2.spec 7 Aug 2007 05:25:32 -0000 1.17
+++ openpkg-src/libssh2/libssh2.spec 26 Aug 2007 09:01:53 -0000 1.18
@@ -25,7 +25,6 @@
# package version
%define V_libssh2 0.17
%define V_libssh 0.2
-%define V_net_ssh2 0.10
# package information
Name: libssh2
@@ -34,11 +33,11 @@
Vendor: Sara Golemon
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
-Class: EVAL
+Class: PLUS
Group: SSH
License: BSD-style
Version: %{V_libssh2}
-Release: 20070807
+Release: 20070826
# package options
%option with_perl no
@@ -46,7 +45,6 @@
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/libssh2/libssh2-%{V_libssh2}.tar.gz
Source1: http://0xbadc0de.be/libssh/libssh-%{V_libssh}.tgz
-Source2:
http://www.cpan.org/authors/id/D/DB/DBROBINS/Net-SSH2-%{V_net_ssh2}.tar.gz
Patch0: libssh2.patch
# build information
@@ -56,18 +54,13 @@
PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: openssl, zlib
PreReq: openssl, zlib
-%if "%{with_perl}" == "yes"
-BuildPreReq: perl, perl-openpkg
-PreReq: perl
-%endif
AutoReq: no
AutoReqProv: no
%description
This package contains both libssh2, a C library implementing the
SSH2 protocol, and libssh, an independent C library implementing the
- SSH1 and SSH2 protocols. Additionally, Net::SSH2, the Perl bindings
- to libssh2, is optionally provided, too.
+ SSH1 and SSH2 protocols.
%track
prog libssh2 = {
@@ -80,16 +73,10 @@
url = http://0xbadc0de.be/wiki/libssh:libssh
regex = libssh-(__VER__)\.tgz
}
- prog libssh2:perl = {
- version = %{V_net_ssh2}
- url = http://www.cpan.org/authors/id/D/DB/DBROBINS/
- regex = Net-SSH2-(__VER__)\.tar\.gz
- }
%prep
%setup -q -c
%setup -q -T -D -a 1
- %setup -q -T -D -a 2
%patch -p0
%build
@@ -116,14 +103,6 @@
--disable-shared
%{l_make} %{l_mflags}
) || exit $?
-%if "%{with_perl}" == "yes"
- %{l_shtool} subst \
- -e 's:inc = \(.\).*\(.;\):inc =
\1../libssh2-%{V_libssh2}/include\2:' \
- -e 's:lib = \(.\).*\(.;\):lib = \1../libssh2-%{V_libssh2}/src\2:' \
- Net-SSH2-%{V_net_ssh2}/Makefile.PL
- %{l_prefix}/bin/perl-openpkg prepare
- %{l_prefix}/bin/perl-openpkg -d Net-SSH2-%{V_net_ssh2} configure build
-%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -133,14 +112,7 @@
( cd libssh-%{V_libssh}
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
) || exit $?
-%if "%{with_perl}" == "yes"
- %{l_prefix}/bin/perl-openpkg -d Net-SSH2-%{V_net_ssh2} install
- %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
-%else
- >perl-openpkg-files
-%endif
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
- %{l_files_std} `cat perl-openpkg-files`
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
