--- rpms/e-smith-samba+ldap/sme7/e-smith-samba+ldap.spec 2008/07/25 19:07:12 1.5 +++ rpms/e-smith-samba+ldap/sme7/e-smith-samba+ldap.spec 2008/08/03 09:40:17 1.6 @@ -2,7 +2,7 @@ Summary: e-smith specific Samba configur %define name e-smith-samba+ldap Name: %{name} %define version 1.15.1 -%define release 5 +%define release 6 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -14,6 +14,7 @@ Patch3: e-smith-samba-1.15.1-ldap.patch Patch4: e-smith-samba-1.14.1-unix_extensions.patch Patch5: e-smith-samba+ldap-1.15.1-machine_accounts_and_pass_sync.patch Patch6: e-smith-samba+ldap-1.15.1-merge_users_and_people.patch +Patch7: e-smith-samba-1.15.1-osLevel.patch Obsoletes: e-smith-netlogon Obsoletes: e-smith-samba BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot @@ -30,6 +31,9 @@ Provides: e-smith-samba = 1.15.1-01 AutoReqProv: no %changelog +* Sun Aug 3 2008 Jonathan Martens 1.15.1-6 +- Fix oslevel template expansion. [SME: 4470] + * Thu Jun 05 2008 Daniel B. 1.15.1-5 - use /etc/cpu-machine.conf to create machine accounts. [SME: 4396] @@ -1010,6 +1014,7 @@ Configuration files and templates for th %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build mkdir -p root/etc/e-smith/tests