--- rpms/e-smith-base/sme9/e-smith-base.spec	2013/02/03 22:19:59	1.7
+++ rpms/e-smith-base/sme9/e-smith-base.spec	2013/02/06 21:20:24	1.8
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.6 2013/02/02 19:39:33 slords Exp $
+# $Id: e-smith-base.spec,v 1.7 2013/02/03 22:19:59 vip-ire Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.4.0
-%define release 6
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,7 +12,9 @@ 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
 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
@@ -49,9 +51,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
@@ -60,6 +59,9 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* 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]
 
@@ -1506,6 +1508,7 @@ e-smith server and gateway software - ba
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %pre
 /sbin/e-smith/create-system-user smelog 1002 \
@@ -1517,12 +1520,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)