--- rpms/e-smith-base+ldap/sme7/e-smith-base+ldap.spec	2008/09/23 14:06:18	1.27
+++ rpms/e-smith-base+ldap/sme7/e-smith-base+ldap.spec	2009/02/14 20:15:16	1.33
@@ -1,42 +1,22 @@
+# $Id: e-smith-base+ldap.spec,v 1.32 2008/10/25 11:35:59 dungog Exp $
+
 Summary: e-smith server and gateway - base module
 %define name e-smith-base+ldap
 Name: %{name}
-%define version 4.19.1
-%define release 30
+%define version 5.0.0
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch1: e-smith-base+ldap-4.19.1-ldap.patch
-Patch2: e-smith-base-4.18.1-insertmode.patch
-Patch3: e-smith-base+ldap-4.19.1-freebusy.patch
-Patch4: e-smith-base-4.18.1-frames.patch
-Patch5: e-smith-base+ldap-4.19.1-convert_ldap-init-accounts_to_template.patch
-Patch6: e-smith-base+ldap-4.19.1-nss_policy-post_install-ssl_fix.patch
-Patch7: e-smith-base-4.18.1-quitconsole.patch
-Patch8: e-smith-base-4.18.1-freebusy.patch2
-Patch9: e-smith-base+ldap-4.19.1-ldap_fixes.patch
-Patch10: e-smith-base+ldap-4.19.1-import_fixes.patch
-Patch11: e-smith-base-4.18.1-dateManip.patch
-Patch12: e-smith-base-4.18.1-ethernetlist.patch
-Patch13: e-smith-base-4.18.1-add2general.patch
-Patch14: e-smith-base+ldap-4.19.1-change_domain_name.patch
-Patch15: e-smith-base+ldap-4.19.1-freebusy.patch2
-Patch16: e-smith-base+ldap-4.19.1-add2general.patch
-Patch17: e-smith-base+ldap-4.19.1-get_raid_details_cciss.patch
-Patch18: e-smith-base+ldap-4.19.1-merge_users_and_people.patch
-Patch19: e-smith-base+ldap-4.19.1-2739schema.patch
-Patch20: e-smith-base-4.18.1-PortFixesFromBase.patch
-Patch21: e-smith-base-4.18.1-fixPASSWORD_VERIFY_NEW.patch
-Patch22: e-smith-base-4.18.1-ip-down.race.patch
-Patch23: e-smith-base-4.18.1-FixLocalizedTitle.patch
-Patch24: e-smith-base-4.18.1-xenfix.patch
-Patch25: e-smith-base-4.18.1-profile.patch
-Patch26: e-smith-base-4.18.1-localeemail.patch
+Patch1: e-smith-base+ldap-5.0.0-sys_accounts.patch
+Patch2: e-smith-base+ldap-5.0.0-sambaRole.patch
+Patch3: e-smith-base+ldap-5.0.0-smartd40.patch
+Patch4: e-smith-base-5.0.0-usbRev70drive.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
-Requires: e-smith-lib >= 1.18.0-19
+Requires: e-smith-lib >= 2.0.0-2
 Requires: server-manager-images, server-manager
 Requires: e-smith-formmagick >= 1.4.0-12
 Requires: initscripts >= 6.67-1es17
@@ -72,9 +52,6 @@ Provides: e-smith-ldap = 4.12.0-9
 Requires: nss_ldap
 Requires: e-smith-samba+ldap
 Requires: cpu
-%if "%{?rhel}" == "5"
-Obsoletes: perl-Data-UUID
-%endif
 BuildRequires: perl, perl(Test::Inline) >= 0.12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 BuildRequires: gettext
@@ -89,6 +66,21 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Sat Feb 14 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.0.0-5.sme
+- Auto-mount USB REV70-drive as usbdisk [SME: 5006]
+
+* Sat Oct 25 2008 Stephen Noble <support@dungog.net> 5.0.0-4.sme
+- create service link for smartd [SME: 1445]
+
+* Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 5.0.0-3.sme
+- Add patch to support multiple samba roles [SME: 4172]
+
+* Wed Oct 8 2008 Daniel B. <daniel@firewall-services.com> 5.0.0-2.sme
+- do not import some system accounts/group in LDAP [SME: 4643]
+
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.0.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
 * Tue Sep 23 2008 Stephen Noble <support@dungog.net> 4.19.1-30
 - Add locale tags for email in review panel [SME: 4267]
 
@@ -147,10 +139,10 @@ e-smith server and gateway software - ba
 
 * Thu May 14 2008 Daniel B. <daniel@firewall-services.com> 4.19.1-16
 - Add calEntry in ldap-update so the attribute calFBURL is allowed and 
-  ou=People can be updated
+  ou=People can be updated [SME: 4358]
 
 * Mon Apr 28 2008 Daniel B. <daniel@firewall-services.com> 4.19.1-15
-- Fix run script when domain name has changed
+- Fix run script when domain name has changed [SME: 4293]
 
 * Mon Apr 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.19.1-14
 - Add common <base> tags to e-smith-formmagick's general [SME: 4279]
@@ -1206,33 +1198,9 @@ e-smith server and gateway software - ba
 %prep
 %setup
 %patch1 -p1
-%if "%{?rhel}" == "5"
 %patch2 -p1
-%endif
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]