--- rpms/smeserver-support/sme8/smeserver-support.spec 2010/06/29 14:47:51 1.36 +++ rpms/smeserver-support/sme8/smeserver-support.spec 2015/09/25 16:49:41 1.50 @@ -1,10 +1,10 @@ -# $Id: smeserver-support.spec,v 1.35 2010/06/28 15:33:08 charliebrady Exp $ +# $Id: smeserver-support.spec,v 1.49 2015/09/04 20:03:34 stephdl Exp $ Summary: SME Server module to display support and licensing information %define name smeserver-support Name: %{name} %define version 2.2.0 -%define release 17 +%define release 30 # 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 @@ -12,17 +12,13 @@ Name: %{name} # TODO: check mkinitrd,mdadm to see if needed %define centos_excludes initscripts,libgsf -%define centos_remove kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm +%define centos_remove kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm,openssl Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons -Source: %{name}-%{version}.tar.gz -Source1: smeserver_logo.jpg -Source2: smeserver_logo.gif -Patch0: smeserver-support.bug5656.patch -Patch1: smeserver-support-2.2.0-migrate_excludes.patch +Source: smeserver-support-2.2.0.26.tar.gz BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch @@ -31,6 +27,8 @@ Conflicts: ServiceLink-support Obsoletes: e-smith-blades Obsoletes: e-smith-keys Obsoletes: e-smith-support +Patch0: smeserver-support-2.2.0.bz8972.motd_donation_message.patch +Patch1: smeserver-support-2.2.0.bz8972.redhat-release-template.patch AutoReqProv: no # remove old kernels that prevent upgrades @@ -132,6 +130,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 @@ -201,6 +200,9 @@ 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 @@ -267,6 +269,48 @@ Conflicts: dungog-mailblocking Obsoletes: rkhunter <= 1.3.4-7.el5.sme %changelog +* Fri Sep 25 2015 stephane de labrusse 2.2.0-30.sme +- created a template for /etc/redhat-release [SME: 8972] +- added smeserver-support-2.2.0.bz8972.redhat-release-template.patch + +* Fri Jul 3 2015 stephane de labrusse 2.2.0-29.sme +- enabled the motd message [SME: 8972] +- Code done by John Crisp and +- Stefano Zamboni + +* Fri May 15 2015 Daniel Berteaud 2.2.0-28.sme +- Switch back to upstream openssl build [SME: 8925] + +* Tue Feb 18 2014 Ian Wells 2.2.0-27.sme +- Exclude openssl from upstream updates [SME: 8208] + +* Tue Feb 18 2014 Ian Wells 2.2.0-26.sme +- Remove old images and roll new tarball [SME: 8213] + +* Sun Nov 3 2013 Ian Wells 2.2.0-25.sme +- Update footer copyright [SME: 7970] + +* Sun Nov 3 2013 Ian Wells 2.2.0-24.sme +- Renew full copyright text, by Greg Zartman [SME: 7941] + +* 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] @@ -924,8 +968,6 @@ SME Server module to display support and %setup %patch0 -p1 %patch1 -p1 -cp %{SOURCE1} root/etc/e-smith/web/common -cp %{SOURCE2} root/etc/e-smith/web/common %build perl createlinks