--- 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/23 13:28:29 1.8 @@ -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.7 2016/03/18 14:27:13 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 6 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 @@ -21,10 +22,11 @@ Requires: e-smith-daemontools >= 1.7.1-0 Requires: perl(Locale::gettext) Requires: perl(Crypt::Cracklib) Requires: perl(Date::Manip) -Requires: perl(Data::UUID) +#Requires: perl(Data::UUID) Requires: perl(Net::IPv4Addr) +Requires: perl(Digest::SHA1) Requires: /usr/sbin/irqbalance -Requires: /usr/sbin/cpuspeed +#Requires: /usr/sbin/cpuspeed Requires: /usr/sbin/smartd Requires: dbus Requires: acpid @@ -34,17 +36,18 @@ 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 Obsoletes: e-smith-serial-console Obsoletes: sshell Obsoletes: e-smith-rp-pppoe -Obsoletes: perl-Data-UUID +#Obsoletes: perl-Data-UUID BuildRequires: perl, perl(Test::Inline) >= 0.12 BuildRequires: e-smith-devtools >= 1.13.1-03 BuildRequires: gettext @@ -56,6 +59,16 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Wed Mar 23 2016 Jean-Philipe Pialasse 5.8.0-6.sme +- add Requires perl(Digest::SHA1) for console [SME: 9372] + +* Fri Mar 18 2016 Jean-Philipe Pialasse 5.8.0-5.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 +1802,8 @@ e-smith server and gateway software - ba %prep %setup +%patch0 -p1 + %pre /sbin/e-smith/create-system-user smelastsys 2999 \