More updates to eurephia.spec

- Added missing Group tags
- Added stricter cmake version requirement
- Fixed rpmlint complaints
- Added -p when calling install
- Changed $RPM_BUILD_ROOT to %{buildroot} for consistency

1 files changed, 26 insertions, 9 deletions

diff --git a/eurephia.spec b/eurephia.spec
index 5fa8be8..bfb4089 100644
--- a/eurephia.spec
+++ b/eurephia.spec
@@ -1,6 +1,6 @@
 Name:           eurephia
 Version:        1.0.0
-Release:        1%{?betatag:.%{betatag}}%{?dist}
+Release:        3%{?betatag:.%{betatag}}%{?dist}
 Summary:        An advanced and flexible OpenVPN user authentication plug-in
 
 Group:          Applications/Internet
@@ -10,7 +10,8 @@ Source0:        http://downloads.sourceforge.net/project/eurephia/eurephia/v1.0/
 Source1:        http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn/openvpn-plugin.h
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}{?betatag:_%{betatag}}-root-%(%{__id_u} -n)
 
-BuildRequires:  cmake libxml2-devel libxslt-devel
+BuildRequires:  libxml2-devel libxslt-devel openssl-devel
+BuildRequires:  cmake >= 2.6.1
 BuildRequires:  sqlite-devel >= 3.0.0
 Requires:       openvpn eurephia-sqlite3
 
@@ -26,12 +27,14 @@ on too many failed attempts and it supports dynamic update of iptables rules
 which restricts network access per connection.
 
 %package sqlite3
+Group:   Applications/Internet
 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
 
@@ -41,6 +44,7 @@ available for eurephia.  Use the eurephia-init package to setup
 configuration.
 
 %package admin
+Group:   Applications/Internet
 Summary: The eurephia command line administration utility
 Requires: eurephia-sqlite3
 
@@ -49,6 +53,7 @@ This package contains the command line utility to administer and configure
 eurephia
 
 %package init
+Group:   Applications/Internet
 Summary: Utility for initializing a new eurephia database
 Requires: eurephia-sqlite3
 
@@ -60,6 +65,7 @@ and initialized eurephia, this package should be removed from the
 system.
 
 %package utils
+Group:   Applications/Internet
 Summary: Misc. eurephia utilities
 
 %description utils
@@ -71,23 +77,27 @@ hash salt.
 
 %prep 
 %setup -q -b0 -n %{name}-%{version}%{?betatag:_%{betatag}}
+
 # This is needed to ship extra until openvpn-plugin.h becomes part of the OpenVPN RPM
 cp -v %{_sourcedir}/openvpn-plugin.h %{_builddir}/%{name}-%{version}%{?betatag:_%{betatag}}/
 
 %build
+# The configure script is not an autotools script, but a cmake wrapper script.
 CFLAGS="%{optflags}" ./configure --prefix %{_prefix} --bin-dir %{_bindir} --xslt-path %{_datadir}/eurephia/xslt --plug-in-dir %{_libdir}/eurephia --plug-in --openvpn-src . --fw-iptables --db-sqlite3 --sqlite3-path %{_localstatedir}/lib/eurephia --eurephiadm
 make VERBOSE=1
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-install -m 755 utils/eurephia_init $RPM_BUILD_ROOT/%{_bindir}
-install -m 755 utils/eurephia_saltdecode $RPM_BUILD_ROOT/%{_bindir}
-install -m 644 utils/eurephia_init.7 $RPM_BUILD_ROOT/%{_mandir}/man7/
-install -m 644 utils/eurephia_saltdecode.7 $RPM_BUILD_ROOT/%{_mandir}/man7/
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+# These files are not installed by default, but we want to package them for Fedora/RHEL
+install -p -m 755 utils/eurephia_init %{buildroot}/%{_bindir}
+install -p -m 755 utils/eurephia_saltdecode %{buildroot}/%{_bindir}
+install -p -m 644 utils/eurephia_init.7 %{buildroot}/%{_mandir}/man7/
+install -p -m 644 utils/eurephia_saltdecode.7 %{buildroot}/%{_mandir}/man7/
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -130,6 +140,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/eurephia_saltdecode.7.gz
 
 %changelog
+* Thu Jul  8 2010 David Sommerseth <davids@redhat.com> - 1.0.0-3
+- Added missing Group tags
+- Added stricter cmake version requirement
+
+* Thu Jul  8 2010 David Sommerseth <davids@redhat.com> - 1.0.0-2
+- Added missing build dependency for openssl-devel
+
 * Wed Jun 30 2010 David Sommerseth <dazo@users.sourceforge.net> - 1.0.0-1
 - Updated and prepared for the eurephia-1.0.0 release