- up to 3.2

- added fixes from debian

diff --git a/Makefile.patch b/Makefile.patch
new file mode 100644 (file)
index 0000000..1a4793e
--- /dev/null
+++ b/Makefile.patch
@@ -0,0 +1,55 @@
+Description: Remove prompts in Makefile;
+ find libdir and includedir with pkg-config
+Forwarded: no
+Author: Damyan Ivanov <dmn@debian.org>
+Reviewed-By: Xavier Guimard <x.guimard@free.fr>
+ gregor herrmann <gregoa@debian.org>
+Last-Update: 2013-11-03
+
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -6,20 +6,24 @@ my ($define, $ccfl);
+ ($^O =~ m/AIX/i) ? ($ccfl = '-qcpluscmt') : ($ccfl = '');
+ 
+ # path libsmbclient.h
+-my $include = try_to_find("libsmbclient.h");
+-$include = prompt("Where can I find libsmbclient.h ?", $include);
+-warn_user("$include/libsmbclient.h") if (!-r "$include/libsmbclient.h");
++#my $include = try_to_find("libsmbclient.h");
++#$include = prompt("Where can I find libsmbclient.h ?", $include);
++#warn_user("$include/libsmbclient.h") if (!-r "$include/libsmbclient.h");
++my $include = qx/pkg-config --variable=includedir smbclient/;
+ 
+ # path libsmbclient.so
+-my $lib = try_to_find("libsmbclient.so");
+-$lib = prompt("Where can I find libsmbclient.so ?",$lib);
+-warn_user("libsmbclient.so") if (!-r "$lib/libsmbclient.so");
++#my $lib = try_to_find("libsmbclient.so");
++#$lib = prompt("Where can I find libsmbclient.so ?",$lib);
++#warn_user("libsmbclient.so") if (!-r "$lib/libsmbclient.so");
++my $lib = qx/pkg-config --variable=libdir smbclient/;
+ 
+ # tests demande ?
+-my $ans = 
+-  prompt("Do you want make tests ?(you will be prompted for server / \n".
+-         "worgroup / share / user / password to make read write access.",
+-         "yes");
++#my $ans =
++#  prompt("Do you want make tests ?(you will be prompted for server / \n".
++#        "worgroup / share / user / password to make read write access.",
++#        "yes");
++my $ans = 'n';
++
+ if ($ans =~ /^y(es)?$/i) 
+   {
+     my $server = prompt("Server ?","localhost");
+@@ -33,7 +37,8 @@ if ($ans =~ /^y(es)?$/i)
+   }
+ 
+ # Trace for debug
+-$ans = prompt("Compile module with trace to STDERR ?", "no");
++#$ans = prompt("Compile module with trace to STDERR ?", "no");
++$ans = 'n';
+ if ($ans =~ /^y(es)?$/i) { $define = "-DVERBOSE"; }
+ 
+ # Create config.h for alloca via configure

diff --git a/perl-Filesys-SmbClient.spec b/perl-Filesys-SmbClient.spec
index 01067d783578aeb9e77b6a5395faf007f6a50623..8a8b05d0c32290fe94e38eab88f1b54ede20d0c3 100644 (file)
--- a/perl-Filesys-SmbClient.spec
+++ b/perl-Filesys-SmbClient.spec
@@ -10,13 +10,15 @@
 Summary:       Filesys::SmbClient - interface for access Samba filesystem
 Summary(pl.UTF-8):     Filesys::SmbClient - interfejs dostępu do systemu plików Samby
 Name:          perl-Filesys-SmbClient
-Version:       1.5
-Release:       9
+Version:       3.2
+Release:       1
 License:       GPL or Artistic
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/modules/by-module/Filesys/%{pdir}-%{pnam}-%{version}.tar.gz
-# Source0-md5: d5fdb54c7a36053bbf0e4f77c17fc885
+# Source0-md5: 8a4205fe748aac7f43fb2a0e8ef502b2
 URL:           http://search.cpan.org/dist/Filesys-SmbClient/
+Patch0:                Makefile.patch
+Patch1:                samba4.patch
 BuildRequires: autoconf
 BuildRequires: libsmbclient-devel
 BuildRequires: perl-devel >= 1:5.8.0
@@ -36,6 +38,8 @@ systemu plików Samby.
 
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__autoconf}
@@ -46,7 +50,7 @@ systemu plików Samby.
        INSTALLDIRS=vendor
 %{__make} \
        CC="%{__cc}" \
-       OPTIMIZE="%{rpmcflags}"
+       OPTIMIZE="%{rpmcflags} `pkg-config --cflags smbclient`"
 
 %{?with_tests:%{__make} test}
 

diff --git a/samba4.patch b/samba4.patch
new file mode 100644 (file)
index 0000000..de6ddfe
--- /dev/null
+++ b/samba4.patch
@@ -0,0 +1,20 @@
+Description: close() in gone from libsmbclient.h in samba 4.0 apparently
+Origin: vendor
+Forwarded: no
+Author: gregor herrmann <gregoa@debian.org>
+Last-Update: 2013-11-03
+
+--- a/SmbClient.xs
++++ b/SmbClient.xs
+@@ -454,11 +454,7 @@
+  * Close file desriptor fd
+  *
+  */
+-#ifdef HAVE_CLOSEFN
+   RETVAL=context->close_fn(context, fd);
+-#else
+-  RETVAL=context->close(context, fd);
+-#endif
+ OUTPUT:
+   RETVAL
+