packages: perl-DBD-Oracle/perl-DBD-Oracle.spec - up to 1.24 - instantclient...

[baggins]

Author: baggins                      Date: Fri Sep 10 16:37:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.24
- instantclient build

---- Files affected:
packages/perl-DBD-Oracle:
   perl-DBD-Oracle.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/perl-DBD-Oracle/perl-DBD-Oracle.spec
diff -u packages/perl-DBD-Oracle/perl-DBD-Oracle.spec:1.25 packages/perl-DBD-Oracle/perl-DBD-Oracle.spec:1.26
--- packages/perl-DBD-Oracle/perl-DBD-Oracle.spec:1.25	Thu Jul 29 20:30:09 2010
+++ packages/perl-DBD-Oracle/perl-DBD-Oracle.spec	Fri Sep 10 18:37:48 2010
@@ -1,18 +1,25 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	instantclient		# build with instant-client-devel
+#
 %include	/usr/lib/rpm/macros.perl
 %define		pdir	DBD
 %define		pnam	Oracle
 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.16
+Version:	1.24
 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:	9711550ed0ebfc743920a6a357ed717c
+Source0:	http://www.cpan.org/modules/by-module/DBD/%{pdir}-%{pnam}-%{version}b.tar.gz
+# Source0-md5:	f3855675d6ebfccce3113dc838110520
+# http://duberga.net/dbd_oracle_instantclient_linux/Makefile-instantclient.PL
+Patch0:		%{name}-instantclient.patch
 URL:		http://search.cpan.org/dist/DBD-Oracle/
+%{?with_instantclient:BuildRequires:	oracle-instantclient-devel}
 BuildRequires:	perl-Class-Fields
 BuildRequires:	perl-DBI >= 1.20
 BuildRequires:	rpm-perlprov >= 4.1-13
@@ -30,13 +37,18 @@
 
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
+%patch0 -p1
 
 %build
+%if %{with instantclient}
+export ORACLE_HOME=%{_libdir}
+%else
+%{?oracledir:export ORACLE_HOME=%{oracledir}}
+%endif
+
 %{__perl} Makefile.PL \
 	INSTALLDIRS=vendor
 
-%{?oracledir:ORACLE_HOME="%{oracledir}"; export ORACLE_HOME}
-#" vim
 %{__make} \
 	CC="%{__cc}" \
 	OPTIMIZE="%{rpmcflags}"
@@ -48,14 +60,19 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install Oracle.ex/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install -p Oracle.ex/* $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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Changes README README.[cels]* README.help Todo
+%doc Changes README README.[cels]* README.help.txt Todo
 %attr(755,root,root) %{_bindir}/ora_explain
 %{perl_vendorarch}/DBD/Oracle.pm
 %{perl_vendorarch}/DBD/Oracle
@@ -63,6 +80,8 @@
 %attr(755,root,root) %{perl_vendorarch}/auto/DBD/Oracle/Oracle.so
 %{perl_vendorarch}/auto/DBD/Oracle/Oracle.bs
 %{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}
@@ -73,6 +92,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2010/09/10 16:37:48  baggins
+- up to 1.24
+- instantclient build
+
 Revision 1.25  2010/07/29 18:30:09  baggins
 - we need ORACLE_HOME env here
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-DBD-Oracle/perl-DBD-Oracle.spec?r1=1.25&r2=1.26&f=u