--- rpms/e-smith-base/sme10/e-smith-base.spec 2016/03/18 14:22:01 1.6 +++ rpms/e-smith-base/sme10/e-smith-base.spec 2016/04/11 19:41:29 1.11 @@ -1,16 +1,18 @@ -# $Id: e-smith-base.spec,v 1.5 2016/03/18 12:01:01 unnilennium Exp $ +# $Id: e-smith-base.spec,v 1.10 2016/04/11 19:04:48 vip-ire Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.8.0 -%define release 4 +%define release 9 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz Patch0: e-smith-base-5.8.0-cpuspeed.patch +Patch1: e-smith-base-5.8.0-remove_obsolete_services.patch +Patch2: e-smith-base-5.8.0-remove_ctrlaltdel.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -22,10 +24,9 @@ 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(Net::IPv4Addr) +Requires: perl(Digest::SHA1) Requires: /usr/sbin/irqbalance -#Requires: /usr/sbin/cpuspeed Requires: /usr/sbin/smartd Requires: dbus Requires: acpid @@ -35,7 +36,7 @@ Requires: vconfig Requires: e-smith-bootloader Requires: mdadm Requires: pv -#Requires: pam_abl +Requires: dhcp Requires: diald Requires: /usr/bin/passwd Requires: nss-pam-ldapd @@ -46,7 +47,6 @@ Obsoletes: rlinetd, e-smith-mod_ssl Obsoletes: e-smith-serial-console Obsoletes: sshell Obsoletes: e-smith-rp-pppoe -Obsoletes: perl-Data-UUID BuildRequires: perl, perl(Test::Inline) >= 0.12 BuildRequires: e-smith-devtools >= 1.13.1-03 BuildRequires: gettext @@ -58,7 +58,19 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog -* Fri Mar 18 2016 Jean-Philipe Pialasse 5.8.0-4.sme +* Mon Apr 11 2016 Daniel Berteaud 5.8.0-9.sme +- Remove ctrlaltdel service entry [SME: 9437] + +* Mon Apr 11 2016 Daniel Berteaud 5.8.0-8.sme +- Remove obsolete services [SME: 9420] + +* Tue Mar 29 2016 Jean-Philipe Pialasse 5.8.0-7.sme +- added requires dhcp [SME: 9392] + +* 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 @@ -1799,7 +1811,8 @@ e-smith server and gateway software - ba %prep %setup %patch0 -p1 - +%patch1 -p1 +%patch2 -p1 %pre /sbin/e-smith/create-system-user smelastsys 2999 \