diff --git a/.cvsignore b/.cvsignore
index a1bf35c..d914988 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-perl-ldap-0.31.tar.gz
+perl-ldap-0.3202.tar.gz
diff --git a/perl-LDAP.spec b/perl-LDAP.spec
index 3bf1ac6..e56d846 100644
--- a/perl-LDAP.spec
+++ b/perl-LDAP.spec
@@ -1,55 +1,65 @@
-Summary: LDAP Perl module
-Name: perl-LDAP
-Version: 0.31
-Release: 6
-License: GPL or Artistic
-Group: Development/Libraries
-URL: http://search.cpan.org/dist/perl-ldap/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArch: noarch
-BuildRequires: perl >= 2:5.8.0
-Requires: %(perl -MConfig -le 'if (defined $Config{useithreads}) { print "perl(:WITH_ITHREADS)" } else { print "perl(:WITHOUT_ITHREADS)" }')
-Requires: %(perl -MConfig -le 'if (defined $Config{usethreads}) { print "perl(:WITH_THREADS)" } else { print "perl(:WITHOUT_THREADS)" }')
-Requires: %(perl -MConfig -le 'if (defined $Config{uselargefiles}) { print "perl(:WITH_LARGEFILES)" } else { print "perl(:WITHOUT_LARGEFILES)" }')
-Source0: perl-ldap-0.31.tar.gz
-BuildRequires: perl-Convert-ASN1
-Requires: perl-Convert-ASN1
+Name:           perl-LDAP
+Version:        0.3202
+Release:        1
+Summary:        LDAP Perl module
+
+Group:          Development/Libraries
+License:        GPL or Artistic
+URL:            http://search.cpan.org/dist/perl-ldap/
+Source0:      http://www.cpan.org/authors/id/G/GB/GBARR/perl-ldap-0.3202.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  perl >= 2:5.8.0
+BuildRequires:  perl(Convert::ASN1)
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+#Wish list
+#Requires:       perl(IO::Socket::SSL), perl(Authen::SASL)
 
 %description
-%{summary}.
+Net::LDAP is a collection of modules that implements a LDAP services API
+for Perl programs. The module may be used to search directories or perform
+maintenance functions such as adding, deleting or modifying entries.
+
 
 %prep
 %setup -q -n perl-ldap-%{version}
+chmod 644 bin/* contrib/*
+%{__perl} -pi -e 's|^#!/usr/local/bin/perl\b|#!%{__perl}|' contrib/*
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix} INSTALLDIRS=vendor < /dev/null
-make OPTIMIZE="$RPM_OPT_FLAGS"
-make test
+%{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-eval `perl '-V:installarchlib'`
-mkdir -p $RPM_BUILD_ROOT$installarchlib
-%makeinstall
-rm -f `find $RPM_BUILD_ROOT -type f -name perllocal.pod -o -name .packlist`
-
-find $RPM_BUILD_ROOT%{_prefix} -type f -print | \
-	sed "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-%{release}-filelist
-if [ "$(cat %{name}-%{version}-%{release}-filelist)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"
-    exit 1
-fi
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
+chmod -R u+w $RPM_BUILD_ROOT/*
 
+%check || :
+mv t/0-signature.t t/0-signature.t.skip
+make test
+ 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}-%{version}-%{release}-filelist
+
+%files
 %defattr(-,root,root,-)
-%doc CREDITS ChangeLog README TODO
+%doc Changes CREDITS README TODO
+%doc contrib/ bin/
+%{perl_vendorlib}/Bundle/
+%{perl_vendorlib}/LWP/
+%{perl_vendorlib}/Net/
+%{_mandir}/man3/*.3*
+
 
 %changelog
-* Wed Mar 30 2005 Warren Togami <wtogami@redhat.com>
-- remove brp-compress
+* Sat Apr 02 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.3202-1
+- Update to 0.3202.
+- Specfile cleanup. (#153766)
 
 * Wed Sep 22 2004 Chip Turner <cturner@redhat.com> 0.31-5
 - rebuild
diff --git a/sources b/sources
index 78e88d2..df94d72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b3107452e2bb4d74d4b9892d61d50137  perl-ldap-0.31.tar.gz
+57dc6214d06b4e9e2a3b0f778aa40261  perl-ldap-0.3202.tar.gz