--- rpms/smeserver-support/sme8/smeserver-support.spec 2010/05/17 18:45:54 1.31 +++ rpms/smeserver-support/sme8/smeserver-support.spec 2013/10/12 02:24:51 1.42 @@ -1,10 +1,18 @@ -# $Id: smeserver-support.spec,v 1.30 2009/12/09 20:27:12 charliebrady Exp $ +# $Id: smeserver-support.spec,v 1.41 2013/10/12 00:36:35 wellsi Exp $ Summary: SME Server module to display support and licensing information %define name smeserver-support Name: %{name} %define version 2.2.0 -%define release 12 +%define release 23 + +# 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 +# prior to taking the update + +# TODO: check mkinitrd,mdadm to see if needed +%define centos_excludes initscripts,libgsf +%define centos_remove kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm Version: %{version} Release: %{release}%{?dist} @@ -13,7 +21,11 @@ Group: Networking/Daemons Source: %{name}-%{version}.tar.gz Source1: smeserver_logo.jpg Source2: smeserver_logo.gif +Source3: btn_donateCC_LG.gif Patch0: smeserver-support.bug5656.patch +Patch1: smeserver-support-2.2.0-migrate_excludes.patch +Patch2: smeserver-support-2.2.0-obsolete-php5-ibay-property.patch +Patch3: smeserver-support-2.2.0-donation.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch @@ -106,6 +118,7 @@ Requires: smeserver-locale-el Requires: smeserver-locale-es Requires: smeserver-locale-et Requires: smeserver-locale-fr +Requires: smeserver-locale-he Requires: smeserver-locale-hu Requires: smeserver-locale-id Requires: smeserver-locale-it @@ -122,6 +135,7 @@ Requires: smeserver-locale-sv Requires: smeserver-locale-th Requires: smeserver-locale-tr Requires: smeserver-locale-zh_CN +Requires: smeserver-locale-zh_TW # These should be re-pulled by other e-smith packages. Obsoletes: perl-File-MMagic = 1.22-1 @@ -179,6 +193,22 @@ Conflicts: e-smith-userpanel Obsoletes: dmc-mitel-mailrules Conflicts: dmc-mitel-mailrules +Obsoletes: php5-cgi +Conflicts: php5-cgi +Obsoletes: php5-cgi-imap +Conflicts: php5-cgi-imap +Obsoletes: php5-cgi-ldap +Conflicts: php5-cgi-ldap +Obsoletes: php5-cgi-mysql +Conflicts: php5-cgi-mysql +Obsoletes: php5-cgi-pear +Conflicts: php5-cgi-pear +Obsoletes: php5-cgi-xmlrpc +Conflicts: php5-cgi-xmlrpc +Obsoletes: smeserver-php5-cgi + +Obsoletes: php-mcrypt + # This block used to be in the SMEServer RPM. Many are probably # redundant or should be elsewhere or removed # [SF: 1356225] @@ -244,6 +274,39 @@ Conflicts: dungog-mailblocking Obsoletes: rkhunter <= 1.3.4-7.el5.sme %changelog +* Fri Oct 11 2013 Ian Wells 2.2.0-23.sme +- Renew donation text, by John Crisp [SME: 7880] + +* Fri Oct 11 2013 Ian Wells 2.2.0-22.sme +- Add donation graphic, by John Crisp [SME: 7879] + +* Tue Jan 24 2012 Jonathan Martens 2.2.0-21.sme +- Obsolete smeserver-php5-cgi [SME: 6652] + +* Thu Jan 19 2012 Jonathan Martens 2.2.0-20.sme +- Obsolete php-mcrypt [SME: 6814] + +* Wed Sep 28 2011 Jonathan Martens 2.2.0-19.sme +- Remove php5 property for ibays [SME: 6652] + +* Tue Jul 13 2010 Shad L. Lords - 2.2.0-18.sme +- Add support for Chinese (Taiwan) (zh_TW). [SME: 6106] + +* Tue Jun 29 2010 Charlie Brady 2.2.0-17.sme +- Add Obsoletes for php5-cgi-{imap,ldap,mysql,pear,xmlrpc}. [SME: 6089] + +* Mon Jun 28 2010 Charlie Brady 2.2.0-16.sme +- Add Obsoletes for php5-cgi. [SME: 6089] + +* Tue May 25 2010 Shad L. Lords - 2.2.0-15.sme +- Add support for Hebrew (he). [SME: 5971] + +* Mon May 17 2010 Shad L. Lords 2.2.0-14.sme +- Add migrate fragment for centos excludes [SME: 5960] + +* Mon May 17 2010 Jonathan Martens 2.2.0-13.sme +- Reverting previous change [SME: 5962] + * Mon May 17 2010 Jonathan Martens 2.2.0-12.sme - Migrate CentOS Exclude property default values to smeserver-yum [SME: 5962] @@ -885,14 +948,27 @@ SME Server module to display support and %prep %setup %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 cp %{SOURCE1} root/etc/e-smith/web/common cp %{SOURCE2} root/etc/e-smith/web/common +cp %{SOURCE3} root/etc/e-smith/web/common %build perl createlinks ln -s initial.cgi root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/index.cgi +YUM_REPOS=root/etc/e-smith/db/yum_repositories/ +for dir in base updates +do + mkdir -p $YUM_REPOS/defaults/$dir + echo %{centos_excludes} > $YUM_REPOS/defaults/$dir/Exclude +done +sed -i 's/CENTOS_EXCLUDES/%{centos_excludes}/' $YUM_REPOS/migrate/25CentOSExcludes +sed -i 's/CENTOS_REMOVE/%{centos_remove}/' $YUM_REPOS/migrate/25CentOSExcludes + %install rm -rf $RPM_BUILD_ROOT (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)