--- rpms/e-smith-base/sme9/e-smith-base.spec	2013/02/02 17:53:28	1.5
+++ rpms/e-smith-base/sme9/e-smith-base.spec	2013/02/10 06:39:22	1.11
@@ -1,17 +1,21 @@
-# $Id: e-smith-base.spec,v 1.4 2013/02/02 15:00:59 slords Exp $
+# $Id: e-smith-base.spec,v 1.10 2013/02/07 15:45:50 wellsi Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.4.0
-%define release 4
+%define release 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch0: e-smith-base-5.4.0-runlevel_4.patch
+Patch1: e-smith-base-5.4.0-local_event.patch
+Patch2: e-smith-base-5.4.0-noapmd.patch
+Patch3: e-smith-base-5.4.0-rsysloglink.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
 Requires: mod_auth_external
 Requires: e-smith-lib >= 2.2.0-2
 Requires: server-manager-images, server-manager
@@ -38,6 +42,7 @@ Requires: mdadm
 Requires: pv
 Requires: pam_abl
 Requires: nss-pam-ldapd
+Obsoletes: nss_ldap < 254
 Requires: cpu >= 1.4.3
 Obsoletes: rlinetd, e-smith-mod_ssl
 Obsoletes: e-smith-serial-console
@@ -47,9 +52,6 @@ Obsoletes: perl-Data-UUID
 BuildRequires: perl, perl(Test::Inline) >= 0.12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 BuildRequires: gettext
-%ifarch i386
-Requires: apmd
-%endif
 
 %define dbfiles accounts configuration domains hosts networks
 AutoReqProv: no
@@ -58,6 +60,22 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Sat Feb 9 2013 Ian Wells <esmith@wellsi.com> 5.4.0-9.sme
+- Update symlink to not conflict with /etc/init.d [SME: 7322]
+
+* Thu Feb 7 2013 Ian Wells <esmith@wellsi.com> 5.4.0-8.sme
+- Add symbolic links from rsyslog to syslog to start the 
+  the transition from syslog to rsyslog [SME: 7322]
+
+* Wed Feb 6 2013 Shad L. Lords <slords@mail.com> 5.4.0-7.sme
+- Remove apmd service and change package to noarch [SME: 7312]
+
+* Sun Feb 3 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-6.sme
+- Add a daemontools service to run signal-event local [SME: 7230]
+
+* Sat Feb 2 2013 Shad L. Lords <slords@mail.com> 5.4.0-5.sme
+- Obsolete nss_ldap so upgrades work [SME: 7273]
+
 * Sat Feb 2 2013 Shad L. Lords <slords@mail.com> 5.4.0-4.sme
 - Helps to spell requirements correctly
 
@@ -1497,6 +1515,9 @@ e-smith server and gateway software - ba
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %pre
 /sbin/e-smith/create-system-user smelog 1002 \
@@ -1508,12 +1529,6 @@ e-smith server and gateway software - ba
 
 %build
 
-%if "%_build_arch" == "i386"
-echo "enabled" >  root/etc/e-smith/db/configuration/defaults/apmd/status
-%else
-echo "disabled" >  root/etc/e-smith/db/configuration/defaults/apmd/status
-%endif
-
 LEXICONS=$(find root/etc/e-smith/web/{functions,panels/password/cgi-bin} \
     -type f | grep -v CVS)
 
@@ -1581,6 +1596,7 @@ rm -rf $RPM_BUILD_ROOT
     --dir /var/service/ippp/log/supervise 'attr(0700,root,root)' \
     --dir /var/log/ippp 'attr(2750,smelog,smelog)' \
     --dir /etc/e-smith/skel/user/.ssh 'attr(0700,root,root)' \
+    --file /var/service/local/run 'attr(0750,root,root)' \
     > %{name}-%{version}-%{release}-filelist
 
 mkdir -p $RPM_BUILD_ROOT/home/e-smith/db