--- rpms/e-smith-base/sme9/e-smith-base.spec 2013/02/02 14:59:33 1.3 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2013/02/03 22:19:59 1.7 @@ -1,16 +1,17 @@ -# $Id: e-smith-base.spec,v 1.2 2013/01/31 17:55:53 vip-ire Exp $ +# $Id: e-smith-base.spec,v 1.6 2013/02/02 19:39:33 slords Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.4.0 -%define release 3 +%define release 6 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz Patch0: e-smith-base-5.4.0-runlevel_4.patch +Patch1: e-smith-base-5.4.0-local_event.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -37,7 +38,8 @@ Requires: e-smith-bootloader Requires: mdadm Requires: pv Requires: pam_abl -Requires: nss_pam_ldapd +Requires: nss-pam-ldapd +Obsoletes: nss_ldap < 254 Requires: cpu >= 1.4.3 Obsoletes: rlinetd, e-smith-mod_ssl Obsoletes: e-smith-serial-console @@ -58,7 +60,16 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog -* Sat Feb 2 2013 Daniel Berteaud 5.4.0-3.sme +* Sun Feb 3 2013 Daniel Berteaud 5.4.0-6.sme +- Add a daemontools service to run signal-event local [SME: 7230] + +* Sat Feb 2 2013 Shad L. Lords 5.4.0-5.sme +- Obsolete nss_ldap so upgrades work [SME: 7273] + +* Sat Feb 2 2013 Shad L. Lords 5.4.0-4.sme +- Helps to spell requirements correctly + +* Sat Feb 2 2013 Shad L. Lords 5.4.0-3.sme - Change nss_ldap to nss-pam-ldapd [SME: 7272] * Thu Jan 31 2013 Daniel Berteaud 5.4.0-2.sme @@ -1494,6 +1505,7 @@ e-smith server and gateway software - ba %prep %setup %patch0 -p1 +%patch1 -p1 %pre /sbin/e-smith/create-system-user smelog 1002 \ @@ -1578,6 +1590,7 @@ rm -rf $RPM_BUILD_ROOT --dir /var/service/ippp/log/supervise 'attr(0700,root,root)' \ --dir /var/log/ippp 'attr(2750,smelog,smelog)' \ --dir /etc/e-smith/skel/user/.ssh 'attr(0700,root,root)' \ + --file /var/service/local/run 'attr(0750,root,root)' \ > %{name}-%{version}-%{release}-filelist mkdir -p $RPM_BUILD_ROOT/home/e-smith/db