--- rpms/smeserver-arkeia/contribs7/smeserver-arkeia.spec	2008/04/22 15:12:57	1.5
+++ rpms/smeserver-arkeia/contribs7/smeserver-arkeia.spec	2008/04/26 09:52:46	1.8
@@ -1,4 +1,4 @@
-# $Id: smeserver-arkeia.spec,v 1.4 2008/04/02 15:03:56 slords Exp $
+# $Id: smeserver-arkeia.spec,v 1.7 2008/04/26 09:36:39 snetram Exp $
 # Authority: slords
 # Name: Shad L. Lords
 
@@ -6,7 +6,7 @@ Summary: Mitel Server Integration for Ar
 %define name smeserver-arkeia
 Name: %{name}
 %define version 1.0
-%define release 11
+%define release 12
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -22,6 +22,8 @@ Patch7: smeserver-arkeia-1.0-rotate.patc
 Patch8: smeserver-arkeia-1.0-locale-2008-03-07.patch
 Patch9: smeserver-arkeia-1.0-locale-2008-04-01.patch
 Patch10: smeserver-arkeia-1.0-locale-2008-04-22.patch
+Patch11: smeserver-arkeia-1.0-add2general.patch
+Patch12: smeserver-arkeia-1.0-locale-2008-04-26.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base e-smith-lib e-smith-release >= 7.0 arkeia-light >= 5.2.28
@@ -39,6 +41,9 @@ Drive Used, Hard Drive Free, Uptime, Lat
 Ethernet Traffic. All the graphs are generated on demand.
 
 %changelog
+* Sat Apr 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-12
+- Take common <base> entries from e-smith-formmagick's general
+
 * Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-11
 - Added 22 April 2008 locale patch
 
@@ -93,6 +98,8 @@ Ethernet Traffic. All the graphs are gen
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p2
 
 %build
 /usr/bin/perl createlinks