--- rpms/e-smith-base/sme8/e-smith-base.spec 2008/08/12 16:43:23 1.60 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2009/10/24 20:35:32 1.77 @@ -1,33 +1,25 @@ +# $Id: e-smith-base.spec,v 1.76 2009/10/20 13:59:20 filippocarletti Exp $ + Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} -%define version 4.18.1 -%define release 21 +%define version 5.2.0 +%define release 8 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.gz -Patch1: e-smith-base-4.18.1-fixgettext.patch -Patch2: e-smith-base-4.18.1-deleteorder.patch -Patch3: e-smith-base-4.18.1-insertmode.patch -Patch4: e-smith-base-4.18.1-freebusy.patch -Patch5: e-smith-base-4.18.1-frames.patch -Patch6: e-smith-base-4.18.1-quitconsole.patch -Patch7: e-smith-base-4.18.1-freebusy.patch2 -Patch8: e-smith-base-4.18.1-dateManip.patch -Patch9: e-smith-base-4.18.1-ethernetlist.patch -Patch10: e-smith-base-4.18.1-add2general.patch -Patch11: e-smith-base-4.18.1-get_raid_details_cciss.patch -Patch12: e-smith-base-4.18.1-RevertInvalidLocaleReversion.patch -Patch13: e-smith-base-4.18.1-FixAndMoveRESET_PASSWORD_TITLE.patch -Patch14: e-smith-base-4.18.1-removeInvalidEntryTag.patch -Patch15: e-smith-base-4.18.1-fixPASSWORD_VERIFY_ERROR.patch -Patch16: e-smith-base-4.18.1-fixPASSWORD_VERIFY_NEW.patch -Patch17: e-smith-base-4.18.1-ip-down.race.patch +Patch1: e-smith-base-5.2.0-sambaRole.patch +Patch2: e-smith-base-5.2.0-smartd40.patch +Patch3: e-smith-base-5.2.0-usbRev70drive.patch +Patch4: e-smith-base-5.2.0-FixLabelArray.patch +Patch5: e-smith-base-5.2.0-straysymlink.patch +Patch6: e-smith-base-5.2.0-nonetworkdrivers.patch +Patch7: e-smith-base-5.2.0-checkIPOverlap.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external -Requires: e-smith-lib >= 1.18.0-19 +Requires: e-smith-lib >= 2.2.0-2 Requires: server-manager-images, server-manager Requires: e-smith-formmagick >= 1.4.0-12 Requires: initscripts >= 6.67-1es17 @@ -54,9 +46,7 @@ Obsoletes: rlinetd, e-smith-mod_ssl Obsoletes: e-smith-serial-console Obsoletes: sshell Obsoletes: e-smith-rp-pppoe -%if "%{?rhel}" == "5" Obsoletes: perl-Data-UUID -%endif BuildRequires: perl, perl(Test::Inline) >= 0.12 BuildRequires: e-smith-devtools >= 1.13.1-03 BuildRequires: gettext @@ -71,6 +61,51 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Sat Oct 24 2009 Jonathan Martens 5.2.0-8.sme +- Prevent IP conflicts between local and external interface in server gateway mode [SME: 5501] + +* Tue Oct 20 2009 Filippo Carletti 5.2.0-7.sme +- Clean up: remove unused nonetworkdrivers [SME: 5521] + +* Sat Jun 6 2009 Shad L. Lords 5.2.0-6.sme +- Clean up stray symlinks in /lib/modules before depmod [SME: 5336] + +* Mon May 18 2009 Gavin Weight 5.2.0-5.sme +- Allow for different mdadm output formats for DeviceSize. [SME: 5230] + +* Sat Feb 14 2009 Jonathan Martens 5.2.0-4.sme +- Auto-mount USB REV70-drive as usbdisk [SME: 5006] + +* Sat Oct 25 2008 Stephen Noble 5.2.0-3.sme +- create service link for smartd [SME: 1445] + +* Mon Oct 13 2008 Shad L. Lords 5.2.0-2.sme +- Add patch to support multiple samba roles [SME: 4172] + +* Tue Oct 7 2008 Shad L. Lords 5.2.0-1.sme +- Roll new stream to separate sme7/sme8 trees [SME: 4633] + +* Tue Sep 23 2008 Stephen Noble 4.19.0-6 +- Add locale tags for email in review panel [SME: 4267] + +* Sat Sep 20 2008 Shad L. Lords 4.19.0-5 +- Correct gettext type during build process [SME: 570] + +* Mon Sep 15 2008 Shad L. Lords 4.19.0-4 +- Fix screen corruption in console [SME: 4155] + +* Sat Sep 13 2008 Shad L. Lords 4.19.0-3 +- Fix detection of xen instance against newer kernels [SME: 4555] + +* Thu Aug 28 2008 Jonathan Martens 4.19.0-2 +- Fixed warnings generated during build process [SME: 570] + +* Wed Aug 20 2008 Shad L. Lords 4.19.0-1 +- Roll new dev stream. + +* Sun Aug 17 2008 Gavin Weight 4.18.1-22 +- Add gettext to creating backup file title for localization. [SME: 4467] + * Mon Aug 11 2008 Charlie Brady 4.18.1-21 - Fix race condition in VPN ip-down handling which could cause loss of LAN connectivity. [SME: 4405] @@ -1271,23 +1306,11 @@ e-smith server and gateway software - ba %setup %patch1 -p1 %patch2 -p1 -%if "%{?rhel}" == "5" %patch3 -p1 -%endif %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ] @@ -1352,7 +1375,7 @@ ln -s /etc/rc.d/rc7.d root/etc/rc7.d mkdir -p root/etc/rc.d/rc1.d mkdir -p root/usr/share/locale/en_US/LC_MESSAGES -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 mkdir -p root/etc/e-smith/locale # Make the fr-ca link in %pre to ease upgrades @@ -1397,7 +1420,6 @@ rm root/service/{syslog,klogd} mkdir -p root/etc/e-smith/events/local mkdir -p root/etc/e-smith/events/user-modify-admin mkdir -p root/home/e-smith/db -touch root/home/e-smith/db/configuration mkdir -p root/etc/e-smith/pam mkdir -p root/home/e-smith/ssl.key @@ -1409,8 +1431,6 @@ mkdir -p root/var/state/e-smith for file in %{dbfiles} do mkdir -p root/etc/e-smith/db/$file/{defaults,migrate,force} - # Create ghost file for rpm - touch root/home/e-smith/db/$file done mkdir -p root/etc/tcprules