Conditionalize NM subpackage as NM on EL6 is too old

This commit is contained in:
Jamie Nguyen
2013-07-15 23:30:42 +01:00
parent 3da0616101
commit 2949ac3d94

View File

@@ -1,5 +1,11 @@
%global hardened_build 1 %global hardened_build 1
%if 0%{?rhel} <= 6
%global enable_nm 0
%else
%global _enable_nm --enable-nm
%endif
Name: strongswan Name: strongswan
Version: 5.0.4 Version: 5.0.4
Release: 4%{?dist} Release: 4%{?dist}
@@ -21,12 +27,16 @@ BuildRequires: gmp-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: NetworkManager-devel
BuildRequires: NetworkManager-glib-devel
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: trousers-devel BuildRequires: trousers-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
%if 0%{?enable_nm}
BuildRequires: NetworkManager-devel
BuildRequires: NetworkManager-glib-devel
%else
Obsoletes: %{name}-NetworkManager < 5.0.0-3.git20120619
%endif
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
BuildRequires: systemd BuildRequires: systemd
@@ -43,12 +53,14 @@ The strongSwan IPsec implementation supports both the IKEv1 and IKEv2 key
exchange protocols in conjunction with the native NETKEY IPsec stack of the exchange protocols in conjunction with the native NETKEY IPsec stack of the
Linux kernel. Linux kernel.
%if 0%{enable_nm}
%package NetworkManager %package NetworkManager
Summary: NetworkManager plugin for Strongswan Summary: NetworkManager plugin for Strongswan
Group: System Environment/Daemons Group: System Environment/Daemons
%description NetworkManager %description NetworkManager
NetworkManager plugin integrates a subset of Strongswan capabilities NetworkManager plugin integrates a subset of Strongswan capabilities
to NetworkManager. to NetworkManager.
%endif
%package tnc-imcvs %package tnc-imcvs
Summary: Trusted network connect (TNC)'s IMC/IMV functionality Summary: Trusted network connect (TNC)'s IMC/IMV functionality
@@ -95,7 +107,6 @@ echo "For migration from 4.6 to 5.0 see http://wiki.strongswan.org/projects/stro
--enable-eap-mschapv2 \ --enable-eap-mschapv2 \
--enable-farp \ --enable-farp \
--enable-dhcp \ --enable-dhcp \
--enable-nm \
--enable-sqlite \ --enable-sqlite \
--enable-imc-test \ --enable-imc-test \
--enable-imv-test \ --enable-imv-test \
@@ -113,7 +124,8 @@ echo "For migration from 4.6 to 5.0 see http://wiki.strongswan.org/projects/stro
--enable-tnc-imv \ --enable-tnc-imv \
--enable-eap-radius \ --enable-eap-radius \
--enable-curl \ --enable-curl \
--enable-eap-identity --enable-eap-identity \
%{?_enable_nm}
#make %%{?_smp_mflags} IPSEC_CONFDIR=%%{_sysconfdir}/%%{name} #make %%{?_smp_mflags} IPSEC_CONFDIR=%%{_sysconfdir}/%%{name}
@@ -267,9 +279,11 @@ done
%{_libexecdir}/%{name}/pacman %{_libexecdir}/%{name}/pacman
%if 0%{?enable_nm}
%files NetworkManager %files NetworkManager
%doc COPYING %doc COPYING
%{_libexecdir}/%{name}/charon-nm %{_libexecdir}/%{name}/charon-nm
%endif
%post %post
@@ -314,6 +328,8 @@ fi
- invocation of "ipsec scepclient" is broken as ipsec is renamed - invocation of "ipsec scepclient" is broken as ipsec is renamed
to strongswan in this package to strongswan in this package
- add /etc/strongswan/ipsec.d and missing subdirectories - add /etc/strongswan/ipsec.d and missing subdirectories
- conditionalize building of strongswan-NetworkManager subpackage as the
version of NetworkManager in EL6 is too old (#984497)
* Fri Jun 28 2013 Avesh Agarwal <avagarwa@redhat.com> - 5.0.4-3 * Fri Jun 28 2013 Avesh Agarwal <avagarwa@redhat.com> - 5.0.4-3
- Patch to fix a major crash issue when Freeradius loads - Patch to fix a major crash issue when Freeradius loads