--- 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/04/02 21:26:05 1.45 @@ -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 8 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -10,6 +10,9 @@ 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 1.18.0-19 @@ -57,6 +60,22 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* 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 +1215,11 @@ e-smith server and gateway software - ba %setup %patch1 -p1 %patch2 -p1 +%if "%{?rhel}" == "5" +%patch3 -p1 +%endif +%patch4 -p1 +%patch5 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]