--- smeserver-ipsec/F/smeserver-ipsec.spec	2006/01/04 00:54:32	1.4
+++ smeserver-ipsec/F/smeserver-ipsec.spec	2006/12/07 23:23:49	1.8
@@ -2,13 +2,16 @@ Summary: IPSEC support for SME Server
 %define name smeserver-ipsec
 Name: %{name}
 %define version 0.0.2
-%define release 02
+%define release 6
 Version: %{version}
-Release: %{release}
+Release: %smerelease %{release}
+Packager: %{_packager}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-ipsec-0.0.1-relocatemastemplates.patch
+Patch1: smeserver-ipsec-0.0.1-dbdefaults.patch
+Patch2: smeserver-ipsec-modulehack.patch
 BuildRoot: /var/tmp/e-smith-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-release >= 7
@@ -18,6 +21,22 @@ Obsoletes: dmc-mitel-freeswan
 Obsoletes: devinfo-freeswan
 
 %changelog
+* Thu Dec 07 2006 Shad L. Lords <slords@mail.com>
+- Update to new release naming.  No functional changes.
+- Make Packager generic
+
+* Wed Jan 4 2006 Gordon Rowell <gordonr@gormand.com.au> 0.0.2-05
+- Add a hack to the local event to force loading of the af_key module
+  until we work out why it isn't being loaded automatically
+
+* Wed Jan 4 2006 Gordon Rowell <gordonr@gormand.com.au> 0.0.2-04
+- Comment out createlinks in build for now, until the old freeswan 
+  based ones are removed/updated. Thankfully we don't need to do most
+  of this with SME7 and ipsec-tools
+
+* Wed Jan 4 2006 Gordon Rowell <gordonr@gormand.com.au> 0.0.2-03
+- Add db defaults ipsec=service|status|disabled
+
 * Wed Jan 4 2006 Gordon Rowell <gordonr@gormand.com.au> 0.0.2-02
 - Relocate masq fragments to templates from templates-custom
 
@@ -176,16 +195,20 @@ through the web manager
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-perl createlinks
+# perl createlinks
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 rm -f e-smith-%{version}-filelist
-/sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist
+/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+	  --file /etc/e-smith/events/local/ipsec-module-hack 'attr(0755,root,root)' \
+	> %{name}-%{version}-filelist
 %files -f %{name}-%{version}-filelist
 
 %defattr(-,root,root)