--- rpms/smeserver-dar2/contribs7/smeserver-dar2.spec	2008/04/21 00:13:34	1.1
+++ rpms/smeserver-dar2/contribs7/smeserver-dar2.spec	2008/06/25 19:50:25	1.19
@@ -1,8 +1,12 @@
+# $Id: smeserver-dar2.spec,v 1.18 2008/06/25 19:44:40 snetram Exp $
+# Authority: darrellmay
+# Name: Darrell May
+
 Summary: Disk ARchive for SME Server
 %define name smeserver-dar2
 Name: %{name}
 %define version 0.0.1
-%define release 4
+%define release 16
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -10,16 +14,65 @@ Group: SME/addon
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-dar2-0.0.1-2.patch
 Patch1: smeserver-dar2-0.0.1-3.patch
+Patch2: smeserver-dar2-0.0.1-transfix.patch
+Patch3: smeserver-dar2-0.0.1-locale-2008-04-20.patch
+Patch4: smeserver-dar2-0.0.1-locale-2008-04-22.patch
+Patch5: smeserver-dar2-0.0.1-locale-2008-04-23.patch
+Patch6: smeserver-dar2-0.0.1-add2general.patch
+Patch7: smeserver-dar2-0.0.1-locale-2008-04-26.patch
+Patch8: smeserver-dar2-0.0.1-locale-2008-05-05.patch
+Patch9: smeserver-dar2-0.0.1-locale-2008-05-21.patch
+Patch10: smeserver-dar2-0.0.1-locale-2008-05-30.patch
+Patch11: smeserver-dar2-0.0.1-locale-2008-06-25.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: dar => 2.3.1
 Requires: smeserver-release => 7.0
-Requires: perl-CGI-FormMagick => 0.92-08
+Requires: e-smith-formmagick >= 1.4.0-12
+BuildRequires: e-smith-devtools >= 1.13.1-03
 %description
 SME Server implementation of Disk ARchive (http://dar.linux.free.fr)
 based on smeserver-backup2.
 
 %changelog
+* Wed Jun 25 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.0.1-16
+- Actually apply 25 Jun 2008 locale patch, forgot to commit patch
+
+* Wed Jun 25 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.0.1-15
+- Apply 25 Jun 2008 locale patch
+
+* Fri May 30 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.0.1-14
+- Apply 30 May 2008 locale patch
+
+* Thu May 21 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.0.1-13
+- Apply 21 May 2008 locale patch
+
+* Mon May 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.0.1-12
+- Apply 5 May 2008 locale patch
+- Updated e-smith-formmagick requirement
+
+* Mon Apr 28 2008 Shad L. Lords <slords@mail.com> 0.0.1-11
+- Bump release to rebuild
+
+* Sat Apr 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.0.1-10
+- Take common <base> entries from e-smith-formmagick's general
+
+* Wed Apr 23 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.0.1-9
+- Fix changelog day
+
+* Wed Apr 23 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.0.1-8
+- Apply Mar 23 2008 translation patch
+
+* Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.0.1-7
+- Apply Mar 22 2008 translation patch
+
+* Sun Apr 20 2008 Shad L. Lords <slords@mail.com> 0.0.1-6
+- Remove scripts (not needed anymore)
+
+* Sun Apr 20 2008 Shad L. Lords <slords@mail.com> 0.0.1-5
+- Clean up translations to work with pootle
+- Apply Mar 20 2008 translation patches
+
 * Wed Aug 22 2007 Shad L. Lords <slords@mail.com> 0.0.1-4
 - Clean up spec so package can be built by koji/plague
 - Update to new release naming.  No functional changes.
@@ -104,6 +157,16 @@ based on smeserver-backup2.
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 /usr/bin/perl createlinks
@@ -121,12 +184,3 @@ based on smeserver-backup2.
 %clean
 /bin/rm -rf $RPM_BUILD_ROOT
 
-%pre
-
-%post
-/etc/e-smith/events/actions/initialize-default-databases > /dev/null 2>&1
-/etc/e-smith/events/actions/navigation-conf > /dev/null 2>&1
-
-%preun
-
-%postun