--- rpms/e-smith-base/sme8/e-smith-base.spec 2008/03/26 21:01:12 1.41 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2008/09/15 15:09:57 1.61.2.3 @@ -2,7 +2,7 @@ Summary: e-smith server and gateway - ba %define name e-smith-base Name: %{name} %define version 4.18.1 -%define release 3 +%define release 25 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -10,11 +10,29 @@ 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 +Patch18: e-smith-base-4.18.1-FixLocalizedTitle.patch +Patch19: e-smith-base-4.18.1-xenfix.patch +Patch20: e-smith-base-4.18.1-profile.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 1.18.0-19 Requires: server-manager-images, server-manager -Requires: e-smith-formmagick >= 1.4.0-9 +Requires: e-smith-formmagick >= 1.4.0-12 Requires: initscripts >= 6.67-1es17 Requires: e-smith-daemontools >= 1.7.1-04 Requires: perl(Locale::gettext) @@ -28,7 +46,6 @@ Requires: /sbin/microcode_ctl Requires: dbus Requires: hal Requires: acpid -Requires: whiptail Requires: rssh Requires: bridge-utils Requires: vconfig @@ -57,6 +74,79 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Mon Sep 15 2008 Shad L. Lords 4.18.1-25 +- Fix screen corruption in console [SME: 4155] + +* Sat Sep 13 2008 Shad L. Lords 4.18.1-24 +- Fix detection of xen instance against newer kernels [SME: 4555] + +* Thu Aug 28 2008 Jonathan Martens 4.18.1-23 +- Fixed warnings generated during build process [SME: 570] + +* 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] + +* Sat Aug 9 2008 Shad L. Lords 4.18.1-20 +- Remove requires for whiptail. No longer needed [SME: 4491] + +* Fri Aug 8 2008 Jonathan Martens 4.18.1-19 +- Change userpassword panel to use PASSWORD_VERIFY_NEW instead of PASSWORD_NEW_VERIFY [SME: 4487] + +* Thu Aug 7 2008 Jonathan Martens 4.18.1-18 +- Revert locale key PASSWORD_RESET_TITLE to RESET_PASSWORD_TITLE and move it + to e-smith-formmagick's general [SME: 4475] +- Reverting all *PASSWORD_NO_MATCH to *PASSWORD_VERIFY_ERROR locale keys [SME: 4476] +- Remove invalid entry tag from userpassword's locale file preventing the + form from displaying properly [SME: 4479] + +* Tue Aug 5 2008 Jonathan Martens 4.18.1-17 +- Revert previous invalid locale changes (reverting to 4.18.1-15) [SME: 4472] + +* Mon Aug 4 2008 Jonathan Martens 4.18.1-16 +- Revert some locale changes + +* Tue Jul 22 2008 Gavin Weight 4.18.1-15 +- Add regex to support cciss device names in manageRAID.pl. [SME: 4455] + +* Sat Jul 5 2008 Jonathan Martens 4.18.1-14 +- Add common tags to e-smith-formmagick's general [SME: 4279] + +* Sun Apr 27 2008 Jonathan Martens 4.18.1-13 +- Add common tags to e-smith-formmagick's general [SME: 4279] + +* Wed Apr 23 2008 Shad L. Lords 4.18.1-12 +- Fix for > 5 nics detected [SME: 4232] + +* Tue Apr 22 2008 Shad L. Lords 4.18.1-11 +- Remove use of Date::Manip from ssl.crt [SME: 3155] + +* Sat Apr 19 2008 Shad L. Lords 4.18.1-10 +- Fix FreeBusy param when disabled [SME: 1806] +- Remove .orig file [SME: 4228] + +* Wed Apr 2 2008 Shad L. Lords 4.18.1-9 +- Remove quitConsole from menu [SME: 4154] + +* Wed Apr 2 2008 Shad L. Lords 4.18.1-8 +- Really fix free/busy in usermanager [SME: 4157] + +* Wed Apr 2 2008 Shad L. Lords 4.18.1-7 +- Use frames in elinks [SME: 4156] +- Set homepage for elinks [SME: 4160] + +* Wed Apr 2 2008 Shad L. Lords 4.18.1-6 +- Fix free/busy field in useraccounts [SME: 4157] + +* Tue Apr 1 2008 Shad L. Lords 4.18.1-5 +- Add free/busy URL entry to help kronolith contribs [SME: 1806] + +* Fri Mar 28 2008 Shad L. Lords 4.18.1-4 +- Fix insert_mode for elinks on el5 platform [SME: 4127] + * Wed Mar 26 2008 Shad L. Lords 4.18.1-3 - Set accounts to deleted before template expansion [SME: 4122] @@ -1196,6 +1286,26 @@ 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 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ] @@ -1260,7 +1370,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 shell -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 @@ -1305,7 +1415,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 @@ -1317,8 +1426,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