backend/spacewalk-backend.spec

Jan Pazdziora adelton at fedoraproject.org
Tue Jun 5 08:39:42 UTC 2012


 backend/spacewalk-backend.spec |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit f45171d6bb693cf526914836c4011a551b096ca4
Author: Jan Pazdziora <jpazdziora at redhat.com>
Date:   Tue Jun 5 09:55:02 2012 +0200

    No longer building spacewalk-backend-sql-oracle on Fedora 17+.

diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index a91f86e..1bb6d00 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -63,6 +63,7 @@ Requires: %{name}-sql-virtual = %{version}-%{release}
 This package contains the basic code that provides SQL connectivity for
 the Spacewalk backend modules.
 
+%if 0%{?fedora} < 17
 %package sql-oracle
 Summary: Oracle backend for Spacewalk
 Group: Applications/Internet
@@ -72,6 +73,7 @@ Provides: %{name}-sql-virtual = %{version}-%{release}
 %description sql-oracle
 This package contains provides Oracle connectivity for the Spacewalk backend
 modules.
+%endif
 
 %package sql-postgresql
 Summary: Postgresql backend for Spacewalk
@@ -288,6 +290,10 @@ export PYTHON_MODULE_VERSION=%{version}
 
 rm -v $RPM_BUILD_ROOT/%{apacheconfd}/zz-spacewalk-server-python.conf
 
+%if 0%{?fedora} > 16
+rm -rf $RPM_BUILD_ROOT%{pythonrhnroot}/server/rhnSQL/driver_cx_Oracle.py*
+%endif
+
 %find_lang %{name}-server
 
 %clean
@@ -375,9 +381,11 @@ rm -f %{rhnconf}/rhnSecret.py*
 %{pythonrhnroot}/server/rhnSQL/__init__.py*
 %{pythonrhnroot}/server/rhnSQL/sql_*.py*
 
+%if 0%{?fedora} < 17
 %files sql-oracle
 %doc LICENSE
 %{pythonrhnroot}/server/rhnSQL/driver_cx_Oracle.py*
+%endif
 
 %files sql-postgresql
 %doc LICENSE




More information about the spacewalk-commits mailing list