--- rpms/e-smith-base/sme10/e-smith-base.spec 2016/03/18 06:50:59 1.4 +++ rpms/e-smith-base/sme10/e-smith-base.spec 2016/03/18 14:22:01 1.6 @@ -1,15 +1,16 @@ -# $Id: e-smith-base.spec,v 1.3 2016/03/18 06:46:46 unnilennium Exp $ +# $Id: e-smith-base.spec,v 1.5 2016/03/18 12:01:01 unnilennium Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.8.0 -%define release 2 +%define release 4 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz +Patch0: e-smith-base-5.8.0-cpuspeed.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -24,7 +25,7 @@ Requires: perl(Date::Manip) Requires: perl(Data::UUID) Requires: perl(Net::IPv4Addr) Requires: /usr/sbin/irqbalance -Requires: /usr/sbin/cpuspeed +#Requires: /usr/sbin/cpuspeed Requires: /usr/sbin/smartd Requires: dbus Requires: acpid @@ -34,10 +35,11 @@ Requires: vconfig Requires: e-smith-bootloader Requires: mdadm Requires: pv -Requires: pam_abl +#Requires: pam_abl Requires: diald Requires: /usr/bin/passwd Requires: nss-pam-ldapd +Requires: uuid-perl Obsoletes: nss_ldap < 254 Requires: cpu >= 1.4.3 Obsoletes: rlinetd, e-smith-mod_ssl @@ -56,6 +58,13 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Fri Mar 18 2016 Jean-Philipe Pialasse 5.8.0-4.sme +- fix conflict perl-Data-UUID vs uuid-perl [SME: 9344] + +* Fri Mar 18 2016 Jean-Philipe Pialasse 5.8.0-3.sme +- remove cpuspeed Requires and support [SME: 9337] +- remove pam_abl Requires [SME: 9341] + * Fri Mar 18 2016 Jean-Philipe Pialasse 5.8.0-2.sme - Remove Requires: hal [SME: 9342] - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, @@ -1789,6 +1798,8 @@ e-smith server and gateway software - ba %prep %setup +%patch0 -p1 + %pre /sbin/e-smith/create-system-user smelastsys 2999 \