--- rpms/e-smith-base/sme9/e-smith-base.spec 2014/05/11 18:29:08 1.72 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2015/01/03 19:57:34 1.81 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.71 2014/05/06 18:20:45 stephdl Exp $ +# $Id: e-smith-base.spec,v 1.80 2015/01/03 19:54:34 stephdl Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.6.0 -%define release 7 +%define release 15 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -15,6 +15,11 @@ Patch2: e-smith-base-5.6.0_added_verific Patch3: e-smith-base-5.6.0_console_verification_dhcp_vs_pptp.patch Patch4: e-smith-base-5.6.0_remove_10runparts_for_anacron_compatibility.patch Patch5: e-smith-base-5.6.0-mdevent.patch +Patch6: e-smith-base-5.6.0-pppoe_after_post_upgrade.patch +Patch7: e-smith-base-5.6.0-symlink_udev-post.patch +Patch8: e-smith-base-5.6.0-detect_conf_change_single_nic.patch +Patch9: e-smith-base-5.6.0-service_runlevel_4.patch +Patch10: e-smith-base-5.6.0-ensure_apache_alias_www.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -30,7 +35,6 @@ Requires: perl(Data::UUID) Requires: perl(Net::IPv4Addr) Requires: /usr/sbin/irqbalance Requires: /usr/sbin/cpuspeed -Requires: /sbin/microcode_ctl Requires: /usr/sbin/smartd Requires: dbus Requires: hal @@ -63,6 +67,28 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Sat Jan 3 2015 Stephane de Labrusse 5.6.0-15.sme +- Modified the patch of daniel e-smith-base-5.6.0-ensure_apache_alias_www.patch +- Ensure www group exists and that apache is an alias of www [SME: 8549] + +* Sun Nov 2 2014 Daniel Berteaud 5.6.0-13.sme +- Ensure www group exists and that apache is an alias of www [SME: 8549] + +* Sun Nov 2 2014 Daniel Berteaud 5.6.0-12.sme +- Check were running runlevel 4, not 7 in service wrapper [SME: 8637] + +* Sun Sep 21 2014 Daniel Berteaud 5.6.0-11.sme +- Correctly update NIC configuration on single NIC systems [SME: 8561] + +* Wed Sep 10 2014 Daniel Berteaud 5.6.0-10.sme +- Symlink udev-post service in rc7 [SME: 8542] + +* Fri Jul 25 2014 Daniel Berteaud 5.6.0-9.sme +- Fix PPPoE after a post-upgrade [SME: 8493] + +* Thu Jul 3 2014 Ian Wells 5.6.0-8.sme +- Remove dependency on microcode_ctl [SME: 8468] + * Sun May 11 2014 stephane de Labrusse 5.6.0-7.sme - Prevent emailing about the normal, weekly, checks of RAID arrays, by Mark Casey - [SME: 7748] @@ -1714,6 +1740,11 @@ e-smith server and gateway software - ba %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 %pre /sbin/e-smith/create-system-user smelastsys 2999 \ 'sme last system user marker' /tmp /bin/false