--- rpms/smeserver-trac/contribs7/smeserver-trac.spec	2008/03/12 04:19:48	1.3
+++ rpms/smeserver-trac/contribs7/smeserver-trac.spec	2008/04/26 15:24:29	1.12
@@ -1,6 +1,10 @@
+# $Id: smeserver-trac.spec,v 1.11 2008/04/26 14:48:45 snetram Exp $
+# Authority: marcohess
+# Name: Marco Hess
+
 %define name smeserver-trac
 %define version 0.4
-%define release 36
+%define release 42
 
 Name: %{name}
 Summary: Trac for SME Server
@@ -9,6 +13,12 @@ Release: %{release}%{?dist}
 License: GPL
 Group: Applications/Internet
 Source: %{name}-%{version}.tgz
+Patch1: smeserver-trac-0.4-lexicon-spelling-update.patch
+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
@@ -22,13 +32,32 @@ Requires: smeserver-subversion >= 1.2
 Requires: subversion-python 
 Requires: smeserver-release >= 7
 Requires: httpd >= 2
+Requires: e-smith-formmagick >= 1.4.0-10
 
-Patch01: smeserver-trac-0.4-lexicon-spelling-update.patch
 
 %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
+
+* Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.4-39
+- Fix commit date in changelog entry
+
+* Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.4-38
+- Apply 22 April 2008 locale patch
+
+* Tue Apr 1 2008 Shad L. Lords <slords@mail.com> 0.4-37
+- Update to UTF-8 translations
+
 * Wed Mar 12 2008 Marco Hess <marco.hess@through-ip.com>
 - 0.4-36
   Update the trac lexicon file for some minor spelling errors and
@@ -154,8 +183,12 @@ Trac project environments integration fo
 %prep
 
 %setup
-
-%patch01 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks