/[smeserver]/rpms/e-smith-base/sme8/e-smith-base.spec

Diff of /rpms/e-smith-base/sme8/e-smith-base.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.88 by slords,
Mon Mar  1 19:02:20 2010 UTC
+Revision 1.112 by slords,
Wed Nov  3 18:55:06 2010 UTC
 Line 1
- # $Id: e-smith-base.spec,v 1.87 2010/02/14 19:42:41 snetram Exp $
+ # $Id: e-smith-base.spec,v 1.111 2010/11/03 14:00:42 slords Exp $
  Summary: e-smith server and gateway - base module
  %define name e-smith-base
  Name: %{name}
  %define version 5.2.0
- %define release 18
+ %define release 44
  Version: %{version}
  Release: %{release}%{?dist}
  License: GPL
 Line 26 
 Patch13: e-smith-base-5.2.0-hwaddress.pa
  Patch14: e-smith-base-5.2.0-sha1.patch
  Patch15: e-smith-base-5.2.0-fix-template-expansion-error.patch
  Patch16: e-smith-base-5.2.0-gettext.patch
+ Patch17: e-smith-base-5.2.0-remove-freebusy-references.patch
+ Patch18: e-smith-base-5.2.0-no-nic.patch
+ Patch19: e-smith-base-5.2.0-fix-local-nic-string-in-console.patch
+ Patch20: e-smith-base-5.2.0-freebusy-user-modify-fix.patch
+ Patch21: e-smith-base-5.2.0-condrestart.patch
+ Patch22: e-smith-base-5.2.0-condrestart.patch2
+ Patch23: e-smith-base-5.2.0-cpuspeed.patch
+ Patch24: e-smith-base-5.2.0-nss_ldap.patch
+ Patch25: e-smith-base-5.2.0-ibay_groups.patch
+ Patch26: e-smith-base-5.2.0-keep_external.patch
+ Patch27: e-smith-base-5.2.0-checkMaxUsers.patch
+ Patch28: e-smith-base-5.2.0-apmd64bit.patch
+ Patch29: e-smith-base-5.2.0-relocate_dhclient_conf.patch
+ Patch30: e-smith-base-5.2.0-echo-options.patch
+ Patch31: e-smith-base-5.2.0-migrateHWaddr.patch
+ Patch32: e-smith-base-5.2.0-relocate_dhcpd_leases_file.patch
+ Patch33: e-smith-base-5.2.0-fix_empty_file_test.patch
+ Patch34: e-smith-base-5.2.0-cpu-conf.patch
+ Patch35: e-smith-base-5.2.0-ldap-auth.patch
+ Patch36: e-smith-base-5.2.0-enable-cpu.patch
+ Patch37: e-smith-base-5.2.0-better-ldap.patch
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  Requires: mod_auth_external
  Requires: e-smith-lib >= 2.2.0-2
-Line 41 
 Requires: perl(Net::IPv4Addr)
+Line 62 
 Requires: perl(Net::IPv4Addr)
  Requires: /usr/sbin/irqbalance
  Requires: /usr/sbin/cpuspeed
  Requires: /sbin/microcode_ctl
+ Requires: /usr/sbin/smartd
  Requires: dbus
  Requires: hal
  Requires: acpid
-Line 51 
 Requires: e-smith-bootloader
+Line 73 
 Requires: e-smith-bootloader
  Requires: mdadm
  Requires: pv
  Requires: pam_abl
+ Requires: nss_ldap
+ Requires: cpu >= 1.4.3
  Obsoletes: rlinetd, e-smith-mod_ssl
  Obsoletes: e-smith-serial-console
  Obsoletes: sshell
-Line 70 
 AutoReqProv: no
+Line 94 
 AutoReqProv: no
  e-smith server and gateway software - base module.
  %changelog
+ * Wed Nov 3 2010 Shad L. Lords <slords@lordsfam.net 5.2.0-44.sme
+ - Fix cpu critical patch missing ' [SME: 6330]
+ * Wed Nov 3 2010 Shad L. Lords <slords@lordsfam.net 5.2.0-43.sme
+ - Make cpu calls critical only with ldap{Auth} is enabled [SME: 6330]
+ - Add cpu.conf and cpu-system.conf to post-upgrade event [SME: 6327]
+ * Tue Nov 2 2010 Shad L. Lords <slords@lordsfam.net 5.2.0-42.sme
+ - Always use cpu, do unix if ldap{Auth} is disabled [SME: 6328]
+ * Mon Nov 1 2010 Shad L. Lords <slords@lordsfam.net 5.2.0-41.sme
+ - Switch to cpu commands if ldap is master [SME: 6328]
+ * Mon Nov 1 2010 Shad L. Lords <slords@lordsfam.net 5.2.0-40.sme
+ - Add templates for ldap authentication if enabled [SME: 6329]
+ * Mon Nov 1 2010 Shad L. Lords <slords@lordsfam.net 5.2.0-39.sme
+ - Add cpu.conf and cpu-system.conf template/program to SME [SME: 6327]
+ * Thu Oct 14 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-38.sme
+ - Fix empty leases file test [SME: 6274]
+ * Tue Oct 12 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-37.sme
+ - Relocate dhcpd leases file [SME: 6274]
+ * Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-36.sme
+ - Add migrate script to add missing HWaddr to interface records [SME: 6267]
+ * Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-35.sme
+ - Make lcp options configurable [SME: 6277]
+ * Mon Oct 11 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-34.sme
+ - Relocate dhclient conf file [SME: 5833]
+ * Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-33.sme
+ - Disable apmd on 64-bit arch [SME: 6170]
+ * Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-32.sme
+ - Remove check for maxUsers [SME: 5537]
+ * Wed Oct 6 2010 Shad L. Lords <slords@mail.com> 5.2.0-31.sme
+ - Try and keep same external address for pppoe connections [SME: 6263]
+ * Mon Sep 27 2010 Shad L. Lords <slords@mail.com> 5.2.0-30.sme
+ - Add ibay groups to group membership [SME: 6247]
+ * Thu Sep 23 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-29.sme
+ - Prepare nss_ldap [SME: 6227]
+ * Sun Aug 8 2010 Ian Wells <esmith@wellsi.com> 5.2.0-28.sme
+ - Enable cpuspeed by default [SME: 6066]
+ * Sun Jul 25 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-27.sme
+ - Fix syntax error in last patch. [SME: 5830]
+ * Mon Jul 19 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-26.sme
+ - Don't exit 99 from e-smith-service script when called with 'condrestart'
+   and service is disabled. [SME: 5830]
+ * Fri Jun 11 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-25.sme
+ - FreeBusy patch fix (save account changes) [SME: 5941]
+ * Fri Jun 11 2010 Ian Wells <esmith@wellsi.com>  5.2.0-24.sme
+ - Remove checkMaxUsers patch due to regression. [SME: 5537]
+ * Tue Jun  8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-23.sme
+ - Fix translation of local nic string in console [SME: 5571]
+ * Sun Jun  6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-22.sme
+ - Handle no network interface scenario in console [SME: 6023]
+ * Sat Jun 5 2010 Ian Wells <esmith@wellsi.com>  5.2.0-21.sme
+ - Remove checkMaxUsers(). [SME: 5537]
+ * Mon May 10 2010 John H. Bennett III <bennettj@johnbennettservices.com> 5.2.0-20.sme
+ - Patch that will remove all FreeBusy references from e-smith-base. [SME: 5941]
+ * Wed Mar  3 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-19.sme
+ - Restate smartd dependency. [SME: 5814]
  * Mon Mar 1 2010 Shad L. Lords <slords@mail.com> 5.2.0-18.sme
  - Fix gettext errors in WAN/LAN subnet error message [SME: 5501]
-Line 1359 
 e-smith server and gateway software - ba
+Line 1463 
 e-smith server and gateway software - ba
  %patch14 -p1
  %patch15 -p1
  %patch16 -p1
+ %patch17 -p1
+ %patch18 -p1
+ %patch19 -p1
+ %patch20 -p1
+ %patch21 -p1
+ %patch22 -p1
+ %patch23 -p1
+ %patch24 -p1
+ %patch25 -p1
+ %patch26 -p1
+ %patch27 -p1
+ %patch28 -p1
+ %patch29 -p1
+ %patch30 -p1
+ %patch31 -p1
+ %patch32 -p1
+ %patch33 -p1
+ %patch34 -p1
+ %patch35 -p1
+ %patch36 -p1
+ %patch37 -p1
  %pre
  if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]
-Line 1438 
 mkdir -p root/etc/e-smith/templates/etc/
+Line 1563 
 mkdir -p root/etc/e-smith/templates/etc/
  ln -s /etc/e-smith/templates-default/template-begin-shell \
        root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin
+ mkdir -p root/etc/e-smith/templates/etc/ldap.secret/
+ touch root/etc/e-smith/templates/etc/ldap.secret/template-begin
  for file in imap login passwd pwauth system-auth
  do
      mkdir -p root/etc/e-smith/templates/etc/pam.d/$file

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1