--- rpms/smeserver-trac/contribs7/smeserver-trac.spec	2008/04/23 18:34:48	1.10
+++ rpms/smeserver-trac/contribs7/smeserver-trac.spec	2008/04/28 23:21:45	1.13
@@ -1,10 +1,10 @@
-# $Id: smeserver-trac.spec,v 1.9 2008/04/22 09:32:03 snetram Exp $
+# $Id: smeserver-trac.spec,v 1.12 2008/04/26 15:24:29 slords Exp $
 # Authority: marcohess
 # Name: Marco Hess
 
 %define name smeserver-trac
 %define version 0.4
-%define release 40
+%define release 42
 
 Name: %{name}
 Summary: Trac for SME Server
@@ -17,6 +17,8 @@ Patch1: smeserver-trac-0.4-lexicon-spell
 Patch2: smeserver-trac-0.4-locale-2008-04-01.patch
 Patch3: smeserver-trac-0.4-locale-2008-04-22.patch
 Patch4: smeserver-trac-0.4-locale-2008-04-23.patch
+Patch5: smeserver-trac-0.4-newlines.patch
+Patch6: smeserver-trac-0.4-add2general.patch
 BuildArch: noarch
 BuildRequires: e-smith-devtools
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
@@ -30,13 +32,20 @@ Requires: smeserver-subversion >= 1.2
 Requires: subversion-python 
 Requires: smeserver-release >= 7
 Requires: httpd >= 2
-Requires: e-smith-formmagick >= 1.4.0-10
+Requires: e-smith-formmagick >= 1.4.0-12
 
 
 %description
 Trac project environments integration for SME Server 7
 
 %changelog
+* Sat Apr 26 2008 Shad L. Lords <slords@mail.com> 0.4-42
+- Fix patch to not include locales
+- Add patch to fix newlines
+
+* Sat Apr 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.4-41
+- Add common <base> tags to e-smith-formmagick's general
+
 * Wed Apr 23 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.4-40
 - Apply 23 April 2008 locale patch
 
@@ -178,6 +187,8 @@ Trac project environments integration fo
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks