diff --git a/.cvsignore b/.cvsignore
index 3bedd0e..c78a038 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1 @@
-DBD-Pg-1.31.tar.gz
-DBD-Pg-1.32.tar.gz
-DBD-Pg-1.40.tar.gz
+DBD-Pg-1.41.tar.gz
diff --git a/perl-DBD-Pg.spec b/perl-DBD-Pg.spec
index fcf3d06..f79b493 100644
--- a/perl-DBD-Pg.spec
+++ b/perl-DBD-Pg.spec
@@ -1,60 +1,64 @@
-%define _use_internal_dependency_generator 0
+Name:           perl-DBD-Pg
+Version:        1.41
+Release:        1
+Summary:        A PostgresSQL interface for perl
 
-Summary: A PostgresSQL interface for perl
-Name: perl-DBD-Pg
-Version: 1.40
-Release: 2
-License: distributable
-Group: Applications/Databases
-Source: DBD-Pg-%{version}.tar.gz
-Patch: perl-DBD-1.31-fixver.patch
-Url: http://search.cpan.org/search?query=dbd%3A%3Apg
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: perl-DBI
+Group:          Development/Libraries
+License:        GPL or Artistic
+URL:            http://search.cpan.org/dist/DBD-Pg/
+Source0:     http://www.cpan.org/authors/id/D/DB/DBDPG/DBD-Pg-%{version}.tar.gz
+Patch:          perl-DBD-1.31-fixver.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl-DBI >= 1.38, postgresql-devel >= 7.2
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires: postgresql-devel >= 7.1, perl >= 5.6.0-3, perl-DBI
+Requires:       perl-DBI >= 1.38
 
 %description 
 An implementation of DBI for PostgreSQL for Perl.
 
-# Provide perl-specific find-{provides,requires}.
-%define __find_provides /usr/lib/rpm/find-provides.perl
-%define __find_requires /usr/lib/rpm/find-requires.perl
 
 %prep
 %setup -q -n DBD-Pg-%{version}
 %patch0 -p1
 
 %build
-export POSTGRES_INCLUDE=/usr/include/pgsql
-export POSTGRES_LIB=%{_libdir}
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor
-make
-
-%clean 
-rm -rf $RPM_BUILD_ROOT
+CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install
+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 f -name '*.bs' -empty -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
+chmod -R u+w $RPM_BUILD_ROOT/*
 
-[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+%check || :
+# Full test coverage requires a live PostgreSQL database (see the README file)
+#export DBI_DSN=dbi:Pg:dbname=<database>
+#export DBI_USER=<username>
+#export DBI_PASS=<password>
+#make test
 
-find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-find $RPM_BUILD_ROOT/usr -type f -print | \
-        sed "s@^$RPM_BUILD_ROOT@@g" | \
-        grep -v perllocal.pod | \
-        grep -v "\.packlist" > %{name}-%{version}-filelist
-if [ "$(cat %{name}-%{version}-filelist)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"
-    exit -1
-fi
 
-%files -f %{name}-%{version}-filelist
-%defattr(-,root,root)
+%files
+%defattr(-,root,root,-)
+%{perl_vendorarch}/DBD/
+%{perl_vendorarch}/auto/DBD/
+%{_mandir}/man3/*.3*
+
 
 %changelog
+* Wed  Apr 13 2005 Jose Pedro Oliveira <jpo@di.uminho.pt> - 1.41-1
+- Update to 1.41.
+- Updated the requirements versions.
+- Specfile cleanup. (#154203)
+
 * Wed Apr 13 2005 Joe Orton <jorton@redhat.com> 1.40-2
 - rebuild for new libpq soname
 
diff --git a/sources b/sources
index b38f987..d73ab59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef28fba65de006dcfb4b94df1fbd8cc4  DBD-Pg-1.40.tar.gz
+3f58b53877954f5a07a08e64f6a67287  DBD-Pg-1.41.tar.gz