--- rpms/smeserver-support/sme9/smeserver-support.spec 2013/02/08 03:21:38 1.6 +++ rpms/smeserver-support/sme9/smeserver-support.spec 2013/10/12 03:09:35 1.20 @@ -1,10 +1,10 @@ -# $Id: smeserver-support.spec,v 1.5 2013/02/02 19:44:17 slords Exp $ +# $Id: smeserver-support.spec,v 1.19 2013/10/12 03:01:13 wellsi Exp $ Summary: SME Server module to display support and licensing information %define name smeserver-support Name: %{name} %define version 2.4.0 -%define release 4 +%define release 18 # These packages come from CentOS, but wee need to use care when # updating them - either we've patched them, or we need to do something @@ -21,6 +21,9 @@ Group: Networking/Daemons Source: %{name}-%{version}.tar.xz Source1: smeserver_logo.jpg Source2: smeserver_logo.gif +Source3: btn_donateCC_LG.gif +Patch1: smeserver-support-2.4.0-SystemRelease.patch +Patch2: smeserver-support-2.4.0-donation.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch @@ -54,12 +57,21 @@ Obsoletes: libghttp Obsoletes: perl-HTTP-GHTTP Obsoletes: perl-Net_SSLeay.pm Obsoletes: pythonabi +Obsoletes: centos-release-notes <= 5.9 +Obsoletes: gettext <= 0.17 +Obsoletes: hmaccalc <= 0.9.6 +Obsoletes: libgomp <= 4.4.7-1.el5 +Obsoletes: libvolume_id <= 095 +Obsoletes: libxml2-python <= 2.6.26 +Obsoletes: dosfstools <= 2.11 +Obsoletes: gpm <= 1.20.1 +Obsoletes: audit-libs-python <= 1.8 +Obsoletes: libselinux-python <= 1.33.4 # Remove packages no longer needed or provided in COS5 Obsoletes: comps Obsoletes: fonts-xorg-base Obsoletes: pine -Obsoletes: system-config-keyboard Obsoletes: system-config-mouse Obsoletes: VFlib2 Obsoletes: xorg-x11-Mesa-libGL @@ -71,9 +83,6 @@ Obsoletes: kmod-appletalk-smp Obsoletes: kmod-appletalk-xenU Obsoletes: netatalk -# SF: 1357548 -Conflicts: selinux-policy-targeted - # XXX - FIXME - pam should require this, shouldn't it? Requires: audit-libs @@ -82,6 +91,12 @@ Requires: smolt Requires: screen Requires: smeserver-yum Obsoletes: yum = 1.0.3-6.0.7.x.esmith +Obsoletes: m2crypto <= 0.16 +Obsoletes: mcstrans <= 0.2.11 +Obsoletes: net-snmp <= 5.3.2.2 +Obsoletes: net-snmp-utils <= 5.3.2.2 +Obsoletes: postgresql-libs <= 8.1.23 +Obsoletes: sysklogd <= 1.4.1 Requires: smeserver-clamav Requires: e-smith-spamassassin Requires: smeserver-audittools @@ -136,6 +151,10 @@ Requires: smeserver-locale-tr Requires: smeserver-locale-zh_CN Requires: smeserver-locale-zh_TW +# Obsolete old versions of aspell +Obsoletes: aspell <= 12:0.60.3 +Obsoletes: aspell-en <= 50:6.0 + # These should be re-pulled by other e-smith packages. Obsoletes: perl-File-MMagic = 1.22-1 Obsoletes: perl-gettext = 1.01-10 @@ -273,6 +292,48 @@ Conflicts: dungog-mailblocking Obsoletes: rkhunter <= 1.3.4-7.el5.sme %changelog +* Fri Oct 11 2013 Ian Wells 2.4.0-18.sme +- Renew donation text, by John Crisp [SME: 7896] + +* Fri Oct 11 2013 Ian Wells 2.4.0-17.sme +- Add donation graphic, by John Crisp [SME: 7897] + +* Sun May 05 2013 Ian Wells 2.4.0-16.sme +- Fix /etc/system-release [SME: 7476] + +* Sat Mar 16 2013 Shad L. Lords 2.4.0-15.sme +- Fix libgomp obsoletes to not obsolete el6 version [SME: 7481] + +* Mon Mar 11 2013 Shad L. Lords 2.4.0-14.sme +- Hopefully last set of el5 obsoletes [SME: 7273] + +* Mon Mar 11 2013 Shad L. Lords 2.4.0-13.sme +- Even more el5 package dependencies removed [SME: 7273] + +* Mon Mar 11 2013 Shad L. Lords 2.4.0-12.sme +- Another el5 package dependency removed [SME: 7273] + +* Mon Mar 11 2013 Shad L. Lords 2.4.0-11.sme +- Revert perl Bzip2 compress modules [SME: 7273] + +* Mon Mar 11 2013 Shad L. Lords 2.4.0-10.sme +- Obsolete el5 version of old el5 dependencies [SME: 7273] + +* Mon Mar 11 2013 Shad L. Lords 2.4.0-9.sme +- Fix Obsolete el5 version of aspell [SME: 7273] + +* Mon Mar 11 2013 Shad L. Lords 2.4.0-8.sme +- Obsolete el5 version of aspell [SME: 7273] + +* Mon Mar 11 2013 Shad L. Lords 2.4.0-7.sme +- Obsolete el5 version of sysklogd [SME: 7413] + +* Mon Mar 11 2013 Shad L. Lords 2.4.0-6.sme +- Obsolete el5 version of some pacakges [SME: 7273] + +* Fri Feb 8 2013 Shad L. Lords 2.4.0-5.sme +- Remove system-config-keyboard and selinux-policy-targeted so installer builds correctly + * Thu Feb 7 2013 Ian Wells 2.4.0-4.sme - Obsolete only older php-mcrypt versions <= 5.3 [SME: 7320] @@ -954,6 +1015,9 @@ SME Server module to display support and %setup cp %{SOURCE1} root/etc/e-smith/web/common cp %{SOURCE2} root/etc/e-smith/web/common +cp %{SOURCE3} root/etc/e-smith/web/common +%patch1 -p1 +%patch2 -p1 %build perl createlinks