- up to 1.64

diff --git a/perl-DBD-Oracle-instantclient.patch b/perl-DBD-Oracle-instantclient.patch
index 50161a63fd8c71f0335fb8f4bf71113263f2e55a..6874f09e11b3022d18c1bca661bde96ffde43b9c 100644 (file)
--- a/perl-DBD-Oracle-instantclient.patch
+++ b/perl-DBD-Oracle-instantclient.patch
@@ -5,9 +5,9 @@
         "$OH/sdk/include",
         # --- Oracle RPM Instant Client locations
 +       "/usr/include/oracle/client", # Instant Client for PLD
-        "/usr/include/oracle/$client_version_full/client", # Instant Client for RedHat FC4
-        "/usr/include/oracle/$client_version_trim/client", # Instant Client for RedHat FC4
-        "/include/oracle/$client_version_full/client", # Instant Client for RedHat FC3
+        map { ( $_, $_."64"   ) }
+        map { ( $_, "/usr$_" ) }
+        map { "/include/oracle/$_/client" }
 @@ -1572,6 +1572,11 @@
            print $_;
        }

diff --git a/perl-DBD-Oracle.spec b/perl-DBD-Oracle.spec
index 3d9ee23ed091a633093e4d81cedb3ca06c57f9d4..897a7b976c33c15fabbe05afcef91e0823eda43c 100644 (file)
--- a/perl-DBD-Oracle.spec
+++ b/perl-DBD-Oracle.spec
@@ -8,13 +8,13 @@
 Summary:       DBD::Oracle - an Oracle interface for Perl
 Summary(pl.UTF-8):     DBD::Oracle - interfejs Oracle'a dla Perla
 Name:          perl-DBD-Oracle
-Version:       1.28
+Version:       1.64
 Release:       1
 # same as perl 5
 License:       GPL v1+ or Artistic
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/modules/by-module/DBD/%{pdir}-%{pnam}-%{version}.tar.gz
-# Source0-md5: 1279e3820fb6b52488453cb3c716a2a5
+# Source0-md5: dad5ae20cbe8454dbce49e0fd89881fe
 Patch0:                %{name}-instantclient.patch
 URL:           http://search.cpan.org/dist/DBD-Oracle/
 %{?with_instantclient:BuildRequires:   oracle-instantclient-devel}
@@ -58,10 +58,8 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install -p Oracle.ex/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install -p examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-# those are needed to run oraperl scripts for perl4
-rm $RPM_BUILD_ROOT%{perl_vendorarch}/{Oraperl.pm,oraperl.ph}
 # makefile defs
 rm $RPM_BUILD_ROOT%{perl_vendorarch}/auto/DBD/Oracle/mk.pm
 
@@ -70,8 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Changes README README.[cels]* README.help.txt Todo
-%attr(755,root,root) %{_bindir}/ora_explain
+%doc Changes README* Todo
 %{perl_vendorarch}/DBD/Oracle.pm
 %{perl_vendorarch}/DBD/Oracle
 %dir %{perl_vendorarch}/auto/DBD/Oracle
@@ -80,6 +77,5 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorarch}/auto/DBD/Oracle/Oracle.h
 %{perl_vendorarch}/auto/DBD/Oracle/dbdimp.h
 %{perl_vendorarch}/auto/DBD/Oracle/ocitrace.h
-%{_mandir}/man1/ora_explain.1*
 %{_mandir}/man3/*
 %{_examplesdir}/%{name}-%{version}