From 81f4fe8d2dd5cc46d7b021af2aed1737fde06f2a Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: May 11 2012 17:20:57 +0000
Subject: Fixed conditional building with Oracle DB


Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

---

diff --git a/opensips.spec b/opensips.spec
index 63ba890..6c28f3f 100644
--- a/opensips.spec
+++ b/opensips.spec
@@ -18,7 +18,7 @@
 Summary:  Open Source SIP Server
 Name:     opensips
 Version:  1.7.2
-Release:  4%{?dist}
+Release:  5%{?dist}
 License:  GPLv2+
 Group:    System Environment/Daemons
 Source0:  http://opensips.org/pub/%{name}/%{version}/src/%{name}-%{version}_src.tar.gz
@@ -222,13 +222,13 @@ Requires: %{name} = %{version}-%{release}
 Mmgeoip is a lightweight wrapper for the MaxMind GeoIP API. It adds
 IP address-to-location lookup capability to OpenSIPS scripts.
 
-%if %{defined db_oracle}
+%if 0%{?_with_oracle}
 %package  oracle
 Summary:  Oracle Storage Support for the OpenSIPS
 Group:    System Environment/Daemons
 Requires: %{name} = %{version}-%{release}
 
-%description  oracle
+%description oracle
 The %{name}-oracle package contains the Oracle plugin for %{name}, which allows
 a Oracle-Database to be used for persistent storage.
 %endif
@@ -565,7 +565,7 @@ implementation for the Event Interface.
 %patch2 -p1 -b .permit_unknown
 
 %build
-LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \
+LOCALBASE=/usr CFLAGS="%{optflags}" %{?_with_oracle:ORAHOME="$ORACLE_HOME"} %{__make} all %{?_smp_mflags} TLS=1 \
   exclude_modules="%EXCLUDE_MODULES" \
   cfg-target=%{_sysconfdir}/opensips/ \
   modules-prefix=%{buildroot}/%{_prefix} \
@@ -688,7 +688,7 @@ chown -R opensips:opensips %{_sysconfdir}/opensips
 %dir %{_libdir}/opensips/
 %dir %{_libdir}/opensips/modules/
 %dir %{_libdir}/opensips/opensipsctl/
-%dir %{_libdir}/opensips/opensipsctl/dbtextdb
+%dir %{_libdir}/opensips/opensipsctl/dbtextdb/
 
 %if 0%{?fedora} > 16
 %{_unitdir}/%{name}.service
@@ -717,7 +717,13 @@ chown -R opensips:opensips %{_sysconfdir}/opensips
 %config(noreplace) %{_sysconfdir}/opensips/tls/user/user-cert_req.pem
 %config(noreplace) %{_sysconfdir}/opensips/tls/user/user-privkey.pem
 
-%{_libdir}/opensips/opensipsctl/opensipsctl.*
+%{_libdir}/opensips/opensipsctl/opensipsctl.base
+%{_libdir}/opensips/opensipsctl/opensipsctl.ctlbase
+%{_libdir}/opensips/opensipsctl/opensipsctl.dbtext
+%{_libdir}/opensips/opensipsctl/opensipsctl.fifo
+%{_libdir}/opensips/opensipsctl/opensipsctl.sqlbase
+%{_libdir}/opensips/opensipsctl/opensipsctl.unixsock
+
 %{_libdir}/opensips/opensipsctl/opensipsdbctl.base
 %{_libdir}/opensips/opensipsctl/opensipsdbctl.dbtext
 %{_libdir}/opensips/opensipsctl/dbtextdb/dbtextdb.py*
@@ -893,6 +899,7 @@ chown -R opensips:opensips %{_sysconfdir}/opensips
 %defattr(-,root,root,-)
 %{_sbindir}/bdb_recover
 %{_libdir}/opensips/modules/db_berkeley.so
+%{_libdir}/opensips/opensipsctl/opensipsctl.db_berkeley
 %{_libdir}/opensips/opensipsctl/opensipsdbctl.db_berkeley
 %dir %{_datadir}/opensips/db_berkeley
 %dir %{_datadir}/opensips/db_berkeley/opensips
@@ -934,16 +941,20 @@ chown -R opensips:opensips %{_sysconfdir}/opensips
 %files mysql
 %defattr(-,root,root,-)
 %{_libdir}/opensips/modules/db_mysql.so
+%{_libdir}/opensips/opensipsctl/opensipsctl.mysql
 %{_libdir}/opensips/opensipsctl/opensipsdbctl.mysql
 %dir %{_datadir}/opensips/mysql
 %{_datadir}/opensips/mysql/*.sql
 %doc docdir/README.db_mysql
 
-%if %{defined db_oracle}
+%if 0%{?_with_oracle}
 %files oracle
 %defattr(-,root,root,-)
-%{_libdir}/opensips/modules/db_oracle.db
+%{_sbindir}/opensips_orasel
+%{_libdir}/opensips/modules/db_oracle.so
+%{_libdir}/opensips/opensipsctl/opensipsctl.oracle
 %{_libdir}/opensips/opensipsctl/opensipsdbctl.oracle
+%{_libdir}/opensips/opensipsctl/opensipsdbfunc.oracle
 %dir %{_datadir}/opensips/oracle
 %{_datadir}/opensips/oracle/*
 %doc docdir/README.db_oracle
@@ -992,6 +1003,7 @@ chown -R opensips:opensips %{_sysconfdir}/opensips
 %files postgresql
 %defattr(-,root,root,-)
 %{_libdir}/opensips/modules/db_postgres.so
+%{_libdir}/opensips/opensipsctl/opensipsctl.pgsql
 %{_libdir}/opensips/opensipsctl/opensipsdbctl.pgsql
 %dir %{_datadir}/opensips/postgres
 %{_datadir}/opensips/postgres/*.sql
@@ -1120,6 +1132,9 @@ chown -R opensips:opensips %{_sysconfdir}/opensips
 %doc docdir/README.event_datagram
 
 %changelog
+* Fri May 11 2012 Peter Lemenkov <lemenkov@gmail.com> - 1.7.2-5
+- Fixed conditional building with Oracle DB
+
 * Sat Apr 28 2012 Peter Lemenkov <lemenkov@gmail.com> - 1.7.2-4
 - Fixes for systemd unit