[omniORB/f16] enable openssl support by default (RHBZ #795184)

Haïkel Guémar hguemar at fedoraproject.org
Mon Feb 20 14:46:47 UTC 2012


commit 062f96f0feb53f1fea088c8c30ed6c43ceaec33b
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Mon Feb 20 11:21:54 2012 +0100

    enable openssl support by default (RHBZ #795184)

 omniORB.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/omniORB.spec b/omniORB.spec
index cadbd11..b5849bd 100644
--- a/omniORB.spec
+++ b/omniORB.spec
@@ -8,9 +8,12 @@
 %global with_systemd 1
 %endif
 
+# openssl enabled by default, add conditional --without openssl
+%bcond_without openssl
+
 Name:           omniORB
 Version:        4.1.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A robust high performance CORBA ORB for C++ and Python
 
 Group:          System Environment/Libraries
@@ -25,7 +28,7 @@ Source4:        omniNames.service
 Patch0:         %{name}-4.1.6-fsf-address.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
-BuildRequires:  openssl-devel
+%{!?_without_openssl:BuildRequires:  openssl-devel}
 %if 0%{?with_systemd}
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -96,7 +99,7 @@ developing applications that use %{name}.
 %patch0 -p1
 
 %build
-%configure --disable-static
+%configure --disable-static %{?with_openssl:--with-openssl=%{_prefix}}
 make %{?_smp_mflags}
 
 
@@ -250,6 +253,10 @@ fi
 
 
 %changelog
+* Mon Feb 20 2012 Haïkel Guémar <hguemar at fedoraproject.org> - 4.1.6-2
+- enable openssl support
+- fix typo in omniNames.service
+
 * Wed Jul 13 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 4.1.6-1
 - upstream 4.1.6
 - use systemd for fedora >= 15


More information about the scm-commits mailing list