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

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

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

Revision 1.55 by snetram, Mon Aug 4 20:04:32 2008 UTC Revision 1.105 by slords, Mon Oct 11 21:56:51 2010 UTC
# Line 1  Line 1 
1    # $Id: e-smith-base.spec,v 1.104 2010/10/11 17:19:05 vip-ire Exp $
2    
3  Summary: e-smith server and gateway - base module  Summary: e-smith server and gateway - base module
4  %define name e-smith-base  %define name e-smith-base
5  Name: %{name}  Name: %{name}
6  %define version 4.18.1  %define version 5.2.0
7  %define release 16  %define release 35
8  Version: %{version}  Version: %{version}
9  Release: %{release}%{?dist}  Release: %{release}%{?dist}
10  License: GPL  License: GPL
11  Group: Networking/Daemons  Group: Networking/Daemons
12  Source: %{name}-%{version}.tar.gz  Source: %{name}-%{version}.tar.gz
13  Patch1: e-smith-base-4.18.1-fixgettext.patch  Patch1: e-smith-base-5.2.0-sambaRole.patch
14  Patch2: e-smith-base-4.18.1-deleteorder.patch  Patch2: e-smith-base-5.2.0-smartd40.patch
15  Patch3: e-smith-base-4.18.1-insertmode.patch  Patch3: e-smith-base-5.2.0-usbRev70drive.patch
16  Patch4: e-smith-base-4.18.1-freebusy.patch  Patch4: e-smith-base-5.2.0-FixLabelArray.patch
17  Patch5: e-smith-base-4.18.1-frames.patch  Patch5: e-smith-base-5.2.0-straysymlink.patch
18  Patch6: e-smith-base-4.18.1-quitconsole.patch  Patch6: e-smith-base-5.2.0-nonetworkdrivers.patch
19  Patch7: e-smith-base-4.18.1-freebusy.patch2  Patch7: e-smith-base-5.2.0-checkIPOverlap.patch
20  Patch8: e-smith-base-4.18.1-dateManip.patch  Patch8: e-smith-base-5.2.0-adapter-translation-fixes.patch
21  Patch9: e-smith-base-4.18.1-ethernetlist.patch  Patch9: e-smith-base-5.2.0-FixLocale_External.patch
22  Patch10: e-smith-base-4.18.1-add2general.patch  Patch10: e-smith-base-5.2.0-perform_restore-hal.patch
23  Patch11: e-smith-base-4.18.1-get_raid_details_cciss.patch  Patch11: e-smith-base-5.2.0-generate-2048-bits-keys.patch
24    Patch12: e-smith-base-5.2.0-perform_backup-hal.patch
25    Patch13: e-smith-base-5.2.0-hwaddress.patch
26    Patch14: e-smith-base-5.2.0-sha1.patch
27    Patch15: e-smith-base-5.2.0-fix-template-expansion-error.patch
28    Patch16: e-smith-base-5.2.0-gettext.patch
29    Patch17: e-smith-base-5.2.0-remove-freebusy-references.patch
30    Patch18: e-smith-base-5.2.0-no-nic.patch
31    Patch19: e-smith-base-5.2.0-fix-local-nic-string-in-console.patch
32    Patch20: e-smith-base-5.2.0-freebusy-user-modify-fix.patch
33    Patch21: e-smith-base-5.2.0-condrestart.patch
34    Patch22: e-smith-base-5.2.0-condrestart.patch2
35    Patch23: e-smith-base-5.2.0-cpuspeed.patch
36    Patch24: e-smith-base-5.2.0-nss_ldap.patch
37    Patch25: e-smith-base-5.2.0-ibay_groups.patch
38    Patch26: e-smith-base-5.2.0-keep_external.patch
39    Patch27: e-smith-base-5.2.0-checkMaxUsers.patch
40    Patch28: e-smith-base-5.2.0-apmd64bit.patch
41    Patch29: e-smith-base-5.2.0-relocate_dhclient_conf.patch
42    Patch30: e-smith-base-5.2.0-echo-options.patch
43  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
44  Requires: mod_auth_external  Requires: mod_auth_external
45  Requires: e-smith-lib >= 1.18.0-19  Requires: e-smith-lib >= 2.2.0-2
46  Requires: server-manager-images, server-manager  Requires: server-manager-images, server-manager
47  Requires: e-smith-formmagick >= 1.4.0-12  Requires: e-smith-formmagick >= 1.4.0-12
48  Requires: initscripts >= 6.67-1es17  Requires: initscripts >= 6.67-1es17
# Line 34  Requires: perl(Net::IPv4Addr) Line 55  Requires: perl(Net::IPv4Addr)
55  Requires: /usr/sbin/irqbalance  Requires: /usr/sbin/irqbalance
56  Requires: /usr/sbin/cpuspeed  Requires: /usr/sbin/cpuspeed
57  Requires: /sbin/microcode_ctl  Requires: /sbin/microcode_ctl
58    Requires: /usr/sbin/smartd
59  Requires: dbus  Requires: dbus
60  Requires: hal  Requires: hal
61  Requires: acpid  Requires: acpid
 Requires: whiptail  
62  Requires: rssh  Requires: rssh
63  Requires: bridge-utils  Requires: bridge-utils
64  Requires: vconfig  Requires: vconfig
# Line 45  Requires: e-smith-bootloader Line 66  Requires: e-smith-bootloader
66  Requires: mdadm  Requires: mdadm
67  Requires: pv  Requires: pv
68  Requires: pam_abl  Requires: pam_abl
69    Requires: nss_ldap
70  Obsoletes: rlinetd, e-smith-mod_ssl  Obsoletes: rlinetd, e-smith-mod_ssl
71  Obsoletes: e-smith-serial-console  Obsoletes: e-smith-serial-console
72  Obsoletes: sshell  Obsoletes: sshell
73  Obsoletes: e-smith-rp-pppoe  Obsoletes: e-smith-rp-pppoe
 %if "%{?rhel}" == "5"  
74  Obsoletes: perl-Data-UUID  Obsoletes: perl-Data-UUID
 %endif  
75  BuildRequires: perl, perl(Test::Inline) >= 0.12  BuildRequires: perl, perl(Test::Inline) >= 0.12
76  BuildRequires: e-smith-devtools >= 1.13.1-03  BuildRequires: e-smith-devtools >= 1.13.1-03
77  BuildRequires: gettext  BuildRequires: gettext
# Line 66  AutoReqProv: no Line 86  AutoReqProv: no
86  e-smith server and gateway software - base module.  e-smith server and gateway software - base module.
87    
88  %changelog  %changelog
89    * Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-35.sme
90    - Make lcp options configurable [SME: 6277]
91    
92    * Mon Oct 11 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-34.sme
93    - Relocate dhclient conf file [SME: 5833]
94    
95    * Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-33.sme
96    - Disable apmd on 64-bit arch [SME: 6170]
97    
98    * Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-32.sme
99    - Remove check for maxUsers [SME: 5537]
100    
101    * Wed Oct 6 2010 Shad L. Lords <slords@mail.com> 5.2.0-31.sme
102    - Try and keep same external address for pppoe connections [SME: 6263]
103    
104    * Mon Sep 27 2010 Shad L. Lords <slords@mail.com> 5.2.0-30.sme
105    - Add ibay groups to group membership [SME: 6247]
106    
107    * Thu Sep 23 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-29.sme
108    - Prepare nss_ldap [SME: 6227]
109    
110    * Sun Aug 8 2010 Ian Wells <esmith@wellsi.com> 5.2.0-28.sme
111    - Enable cpuspeed by default [SME: 6066]
112    
113    * Sun Jul 25 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-27.sme
114    - Fix syntax error in last patch. [SME: 5830]
115    
116    * Mon Jul 19 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-26.sme
117    - Don't exit 99 from e-smith-service script when called with 'condrestart'
118      and service is disabled. [SME: 5830]
119    
120    * Fri Jun 11 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-25.sme
121    - FreeBusy patch fix (save account changes) [SME: 5941]
122    
123    * Fri Jun 11 2010 Ian Wells <esmith@wellsi.com>  5.2.0-24.sme
124    - Remove checkMaxUsers patch due to regression. [SME: 5537]
125    
126    * Tue Jun  8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-23.sme
127    - Fix translation of local nic string in console [SME: 5571]
128    
129    * Sun Jun  6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-22.sme
130    - Handle no network interface scenario in console [SME: 6023]
131    
132    * Sat Jun 5 2010 Ian Wells <esmith@wellsi.com>  5.2.0-21.sme
133    - Remove checkMaxUsers(). [SME: 5537]
134    
135    * Mon May 10 2010 John H. Bennett III <bennettj@johnbennettservices.com> 5.2.0-20.sme
136    - Patch that will remove all FreeBusy references from e-smith-base. [SME: 5941]
137    
138    * Wed Mar  3 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-19.sme
139    - Restate smartd dependency. [SME: 5814]
140    
141    * Mon Mar 1 2010 Shad L. Lords <slords@mail.com> 5.2.0-18.sme
142    - Fix gettext errors in WAN/LAN subnet error message [SME: 5501]
143    
144    * Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-17.sme
145    - Really fix template expansion error [SME: 4528]
146    
147    * Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-16.sme
148    - Fix template expansion error [SME: 4528]
149    
150    * Mon Feb 8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-15.sme
151    - Improve security by using SHA1 algorithm for certificate signing [SME: 5737]
152    
153    * Fri Feb 5 2010 Stephen Noble <support@dungog.net> 5.2.0-14.sme
154    - Fix eth? swapping [SME: 4528]
155    
156    * Sun Jan 31 2010 Stephen Noble <support@dungog.net> 5.2.0-13.sme
157    - Fix console backup from removable media [SME: 4809]
158    
159    * Sat Jan 30 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-12.sme
160    - Bump certificate encryption from 1024 bits to 2048 bits [SME: 5735]
161    
162    * Thu Jan 14 2010 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-11.sme
163    - Fix console restore from removable media (Federico Simoncelli) [SME: 4809]
164    
165    * Mon Nov 23 2009 Gavin Weight <gweight@gmail.com> 5.2.0-10.sme
166    - Add a dummy call so xgettext can pull translated $ifName in console configuration pages. [SME: 5571]
167    
168    * Fri Nov 6 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-9.sme
169    - Translate $ifName in console configuration pages [SME: 5571]
170    
171    * Sat Oct 24 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-8.sme
172    - Prevent IP conflicts between local and external interface in server gateway mode [SME: 5501]
173    
174    * Tue Oct 20 2009 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-7.sme
175    - Clean up: remove unused nonetworkdrivers [SME: 5521]
176    
177    * Sat Jun 6 2009 Shad L. Lords <slords@mail.com> 5.2.0-6.sme
178    - Clean up stray symlinks in /lib/modules before depmod [SME: 5336]
179    
180    * Mon May 18 2009 Gavin Weight <gweight@gmail.com> 5.2.0-5.sme
181    - Allow for different mdadm output formats for DeviceSize. [SME: 5230]
182    
183    * Sat Feb 14 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-4.sme
184    - Auto-mount USB REV70-drive as usbdisk [SME: 5006]
185    
186    * Sat Oct 25 2008 Stephen Noble <support@dungog.net> 5.2.0-3.sme
187    - create service link for smartd [SME: 1445]
188    
189    * Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 5.2.0-2.sme
190    - Add patch to support multiple samba roles [SME: 4172]
191    
192    * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.2.0-1.sme
193    - Roll new stream to separate sme7/sme8 trees [SME: 4633]
194    
195    * Tue Sep 23 2008 Stephen Noble <support@dungog.net> 4.19.0-6
196    - Add locale tags for email in review panel [SME: 4267]
197    
198    * Sat Sep 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-5
199    - Correct gettext type during build process [SME: 570]
200    
201    * Mon Sep 15 2008 Shad L. Lords <slords@mail.com> 4.19.0-4
202    - Fix screen corruption in console [SME: 4155]
203    
204    * Sat Sep 13 2008 Shad L. Lords <slords@mail.com> 4.19.0-3
205    - Fix detection of xen instance against newer kernels [SME: 4555]
206    
207    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.19.0-2
208    - Fixed warnings generated during build process [SME: 570]
209    
210    * Wed Aug 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-1
211    - Roll new dev stream.
212    
213    * Sun Aug 17 2008 Gavin Weight <gweight@gmail.com> 4.18.1-22
214    - Add gettext to creating backup file title for localization. [SME: 4467]
215    
216    * Mon Aug 11 2008 Charlie Brady <charlie_brady@mitel.com> 4.18.1-21
217    - Fix race condition in VPN ip-down handling which could cause loss of
218      LAN connectivity. [SME: 4405]
219    
220    * Sat Aug 9 2008 Shad L. Lords <slords@mail.com> 4.18.1-20
221    - Remove requires for whiptail.  No longer needed [SME: 4491]
222    
223    * Fri Aug  8 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-19
224    - Change userpassword panel to use PASSWORD_VERIFY_NEW instead of PASSWORD_NEW_VERIFY [SME: 4487]
225    
226    * Thu Aug  7 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-18
227    - Revert locale key PASSWORD_RESET_TITLE to RESET_PASSWORD_TITLE and move it
228      to e-smith-formmagick's general [SME: 4475]
229    - Reverting all *PASSWORD_NO_MATCH to *PASSWORD_VERIFY_ERROR locale keys [SME: 4476]
230    - Remove invalid entry tag from userpassword's locale file preventing the
231      form from displaying properly [SME: 4479]
232    
233    * Tue Aug  5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-17
234    - Revert previous invalid locale changes (reverting to 4.18.1-15) [SME: 4472]
235    
236  * Mon Aug  4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-16  * Mon Aug  4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-16
237  - Revert some locale changes  - Revert some locale changes
238    
# Line 1246  e-smith server and gateway software - ba Line 1413  e-smith server and gateway software - ba
1413  %setup  %setup
1414  %patch1 -p1  %patch1 -p1
1415  %patch2 -p1  %patch2 -p1
 %if "%{?rhel}" == "5"  
1416  %patch3 -p1  %patch3 -p1
 %endif  
1417  %patch4 -p1  %patch4 -p1
1418  %patch5 -p1  %patch5 -p1
1419  %patch6 -p1  %patch6 -p1
# Line 1257  e-smith server and gateway software - ba Line 1422  e-smith server and gateway software - ba
1422  %patch9 -p1  %patch9 -p1
1423  %patch10 -p1  %patch10 -p1
1424  %patch11 -p1  %patch11 -p1
1425    %patch12 -p1
1426    %patch13 -p1
1427    %patch14 -p1
1428    %patch15 -p1
1429    %patch16 -p1
1430    %patch17 -p1
1431    %patch18 -p1
1432    %patch19 -p1
1433    %patch20 -p1
1434    %patch21 -p1
1435    %patch22 -p1
1436    %patch23 -p1
1437    %patch24 -p1
1438    %patch25 -p1
1439    %patch26 -p1
1440    %patch27 -p1
1441    %patch28 -p1
1442    %patch29 -p1
1443    %patch30 -p1
1444    
1445  %pre  %pre
1446  if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]  if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]
# Line 1321  ln -s /etc/rc.d/rc7.d root/etc/rc7.d Line 1505  ln -s /etc/rc.d/rc7.d root/etc/rc7.d
1505  mkdir -p root/etc/rc.d/rc1.d  mkdir -p root/etc/rc.d/rc1.d
1506    
1507  mkdir -p root/usr/share/locale/en_US/LC_MESSAGES  mkdir -p root/usr/share/locale/en_US/LC_MESSAGES
1508  xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console  xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console
1509    
1510  mkdir -p root/etc/e-smith/locale  mkdir -p root/etc/e-smith/locale
1511  # Make the fr-ca link in %pre to ease upgrades  # Make the fr-ca link in %pre to ease upgrades
# Line 1336  mkdir -p root/etc/e-smith/templates/etc/ Line 1520  mkdir -p root/etc/e-smith/templates/etc/
1520  ln -s /etc/e-smith/templates-default/template-begin-shell \  ln -s /etc/e-smith/templates-default/template-begin-shell \
1521        root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin        root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin
1522    
1523    mkdir -p root/etc/e-smith/templates/etc/ldap.secret/
1524    touch root/etc/e-smith/templates/etc/ldap.secret/template-begin
1525    
1526  for file in imap login passwd pwauth system-auth  for file in imap login passwd pwauth system-auth
1527  do  do
1528      mkdir -p root/etc/e-smith/templates/etc/pam.d/$file      mkdir -p root/etc/e-smith/templates/etc/pam.d/$file
# Line 1366  rm root/service/{syslog,klogd} Line 1553  rm root/service/{syslog,klogd}
1553  mkdir -p root/etc/e-smith/events/local  mkdir -p root/etc/e-smith/events/local
1554  mkdir -p root/etc/e-smith/events/user-modify-admin  mkdir -p root/etc/e-smith/events/user-modify-admin
1555  mkdir -p root/home/e-smith/db  mkdir -p root/home/e-smith/db
 touch root/home/e-smith/db/configuration  
1556    
1557  mkdir -p root/etc/e-smith/pam  mkdir -p root/etc/e-smith/pam
1558  mkdir -p root/home/e-smith/ssl.key  mkdir -p root/home/e-smith/ssl.key
# Line 1378  mkdir -p root/var/state/e-smith Line 1564  mkdir -p root/var/state/e-smith
1564  for file in %{dbfiles}  for file in %{dbfiles}
1565  do  do
1566      mkdir -p root/etc/e-smith/db/$file/{defaults,migrate,force}      mkdir -p root/etc/e-smith/db/$file/{defaults,migrate,force}
     # Create ghost file for rpm  
     touch root/home/e-smith/db/$file  
1567  done  done
1568    
1569  mkdir -p root/etc/tcprules  mkdir -p root/etc/tcprules


Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed