From c21a44733e40c63f4b100f148fad39adbb34c0a3 Mon Sep 17 00:00:00 2001
From: Chris Weyl <cweyl@fedoraproject.org>
Date: Mar 13 2010 05:34:29 +0000
Subject: - spec file touch-up


---

diff --git a/net-ssh2-0.18-perl5.10.patch b/net-ssh2-0.18-perl5.10.patch
deleted file mode 100644
index 0916f4f..0000000
--- a/net-ssh2-0.18-perl5.10.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ruN Net-SSH-0.18.orig/SSH2.xs Net-SSH-0.18/SSH2.xs
---- Net-SSH-0.18.orig/SSH2.xs	2007-11-10 17:53:25.000000000 -0800
-+++ Net-SSH-0.18/SSH2.xs	2008-06-10 03:38:52.000000000 -0700
-@@ -1006,7 +1006,7 @@
-                 debug("- [%d] = channel\n", i);
-                 pollfd[i].type = LIBSSH2_POLLFD_CHANNEL;
-                 pollfd[i].fd.channel =
--                 ((SSH2_CHANNEL*)SvIVX(SvRV(*handle)))->channel;
-+                 ((SSH2_CHANNEL*)SvIVX(GvSV((GV*)SvRV(*handle))))->channel;
-             } else if(strEQ(package, "Net::SSH2::Listener")) {
-                 debug("- [%d] = listener\n", i);
-                 pollfd[i].type = LIBSSH2_POLLFD_LISTENER;
-diff -ruN Net-SSH-0.18.orig/typemap Net-SSH-0.18/typemap
---- Net-SSH-0.18.orig/typemap	2007-02-24 07:15:23.000000000 -0800
-+++ Net-SSH-0.18/typemap	2008-06-10 01:42:42.000000000 -0700
-@@ -29,9 +29,9 @@
-     const char* name = form("_GEN_%ld", (long)net_ch_gensym++);
-     SvUPGRADE((SV*)gv, SVt_PVGV);
-     SvUPGRADE((SV*)io, SVt_PVIO);
--    SvIVX(gv) = PTR2IV($var);
-     gv_init(gv, gv_stashpv("Net::SSH2::Channel", 0/*create*/),
-      name, strlen(name), 0/*multi*/);
-+    GvSV(gv) = newSViv(PTR2IV($var));
-     GvIOp(gv) = io;
-     sv_magic((SV*)io, newRV((SV*)gv), PERL_MAGIC_tiedscalar, Nullch, 0);
-     }
-@@ -49,9 +49,9 @@
-     const char* name = form("_GEN_%ld", (long)net_fi_gensym++);
-     SvUPGRADE((SV*)gv, SVt_PVGV);
-     SvUPGRADE((SV*)io, SVt_PVIO);
--    SvIVX(gv) = PTR2IV($var);
-     gv_init(gv, gv_stashpv("Net::SSH2::File", 0/*create*/),
-      name, strlen(name), 0/*multi*/);
-+    GvSV(gv) = newSViv(PTR2IV($var));
-     GvIOp(gv) = io;
-     sv_magic((SV*)io, newRV((SV*)gv), PERL_MAGIC_tiedscalar, Nullch, 0);
-     }
-@@ -80,7 +80,7 @@
- 
- O_CHANNEL
-     if(sv_isobject($arg) && (SvTYPE(SvRV($arg)) == SVt_PVGV))
--        $var = ($type)SvIVX((SV*)SvRV($arg));
-+        $var = ($type)SvIVX(GvSV((GV*)SvRV($arg)));
-     else
-         croak(\"${Package}::$func_name() - invalid channel object\");
- 
-@@ -98,7 +98,7 @@
- 
- O_FILE
-     if(sv_isobject($arg) && (SvTYPE(SvRV($arg)) == SVt_PVGV))
--        $var = ($type)SvIVX((SV*)SvRV($arg));
-+        $var = ($type)SvIVX(GvSV((GV*)SvRV($arg)));
-     else
-         croak(\"${Package}::$func_name() - invalid SFTP file object\");
- 
diff --git a/perl-Net-SSH2.spec b/perl-Net-SSH2.spec
index 42617ce..18c3328 100644
--- a/perl-Net-SSH2.spec
+++ b/perl-Net-SSH2.spec
@@ -1,6 +1,6 @@
 Name:           perl-Net-SSH2
 Version:        0.28
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Support for the SSH 2 protocol via libSSH2
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -24,6 +24,7 @@ BuildRequires:  perl(Test::More)
 
 # don't "provide" private Perl libs
 %{?perl_default_filter}
+%{?perl_default_subpackage_tests}
 
 %description
 Net::SSH2 is a perl interface to the libssh2 (http://www.libssh2.org)
@@ -42,7 +43,7 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 
-make pure_install PERL_INSTALL_ROOT=%{buildroot}
+make pure_install DESTDIR=%{buildroot}
 
 find %{buildroot} -type f -name .packlist -exec rm -f {} +
 find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} +
@@ -60,12 +61,15 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README example/ t/
+%doc Changes README example/
 %{perl_vendorarch}/*
 %exclude %dir %{perl_vendorarch}/auto
 %{_mandir}/man3/*
 
 %changelog
+* Fri Mar 12 2010 Chris Weyl <cweyl@alumni.drew.edu> 0.28-2
+- spec file touch-up
+
 * Wed Jan 20 2010 Chris Weyl <cweyl@alumni.drew.edu> 0.28-1
 - auto-update to 0.28 (by cpan-spec-update 0.01)