RPM build: Obsolete the eurephia-iptables RPM package

This is really not needed to split out in a separate RPM.  It can
be shipped together with the eurephia plug-in.

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

1 files changed, 8 insertions, 17 deletions

diff --git a/eurephia.spec b/eurephia.spec
index e74f924..9c7583e 100644
--- a/eurephia.spec
+++ b/eurephia.spec
@@ -1,6 +1,6 @@
 Name:           eurephia
-Version:        1.0.0
-Release:        8%{?betatag:.%{betatag}}%{?dist}
+Version:        1.0.1
+Release:        2%{?betatag:.%{betatag}}%{?dist}
 Summary:        An advanced and flexible OpenVPN user authentication plug-in
 
 Group:          Applications/Internet
@@ -15,6 +15,8 @@ BuildRequires:  cmake >= 2.6.1
 BuildRequires:  sqlite-devel >= 3.0.0
 Requires:       openvpn
 Requires:       eurephia-sqlite3 = %{version}-%{release}
+Obsoletes:      eurephia-iptables < 1.0.1-2
+Provides:       eurephia-iptables >= 1.0.1-2
 
 %description
 This plug-in enhances OpenVPN by adding user name and password
@@ -34,16 +36,6 @@ Summary: The eurephia SQLite3 database driver
 %description sqlite3
 This package contains the SQLite3 database driver for eurephia
 
-%package iptables
-Group:   Applications/Internet
-Summary: The eurephia iptables interface module
-Requires: eurephia = %{version}-%{release}
-
-%description iptables
-To enable the firewall integration in eurephia, this module must be
-available for eurephia.  Use the eurephia-init package to setup
-configuration.
-
 %package admin
 Group:   Applications/Internet
 Summary: The eurephia command line administration utility
@@ -109,6 +101,7 @@ rm -rf %{buildroot}
 %{_libdir}/eurephia/eurephia-auth.so
 %{_mandir}/man7/eurephia-auth.7.gz
 %{_mandir}/man7/eurephia-variables.7.gz
+%{_libdir}/eurephia/efw-iptables.so
 
 %files sqlite3
 %defattr(-,root,root,-)
@@ -118,11 +111,6 @@ rm -rf %{buildroot}
 %{_localstatedir}/lib/eurephia/
 %{_mandir}/man7/edb-sqlite.7.gz
 
-%files iptables
-%defattr(-,root,root,-)
-%doc LICENSE.txt CREDITS.txt
-%{_libdir}/eurephia/efw-iptables.so
-
 %files init
 %defattr(-,root,root,-)
 %doc LICENSE.txt CREDITS.txt
@@ -146,6 +134,9 @@ rm -rf %{buildroot}
 %{_mandir}/man7/eurephia_saltdecode.7.gz
 
 %changelog
+* Wed Oct 20 2010 David Sommerseth <dazo@users.sourceforge.net> - 1.0.1-2
+- Obsolete the eurephia-iptables RPM and move efw-iptables into eurephia.rpm
+
 * Thu Jul 15 2010 David Sommerseth <davids@redhat.com> - 1.0.0-8
 - Fixed silly mistakes
   - Forgot to move over /usr/lib/eurephia from eurephia to eurephia-sqlite3