--- rpms/smeserver-support/sme9/smeserver-support.spec 2013/03/11 22:23:09 1.13 +++ rpms/smeserver-support/sme9/smeserver-support.spec 2013/05/05 17:59:37 1.18 @@ -1,10 +1,10 @@ -# $Id: smeserver-support.spec,v 1.12 2013/03/11 21:57:55 slords Exp $ +# $Id: smeserver-support.spec,v 1.17 2013/03/16 15:24:29 slords Exp $ Summary: SME Server module to display support and licensing information %define name smeserver-support Name: %{name} %define version 2.4.0 -%define release 11 +%define release 16 # 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,7 @@ Group: Networking/Daemons Source: %{name}-%{version}.tar.xz Source1: smeserver_logo.jpg Source2: smeserver_logo.gif +Patch1: smeserver-support-2.4.0-SystemRelease.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch @@ -57,8 +58,13 @@ Obsoletes: pythonabi Obsoletes: centos-release-notes <= 5.9 Obsoletes: gettext <= 0.17 Obsoletes: hmaccalc <= 0.9.6 -Obsoletes: libgomp <= 4.4.7 +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 @@ -284,6 +290,21 @@ Conflicts: dungog-mailblocking Obsoletes: rkhunter <= 1.3.4-7.el5.sme %changelog +* 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] @@ -986,6 +1007,7 @@ SME Server module to display support and %setup cp %{SOURCE1} root/etc/e-smith/web/common cp %{SOURCE2} root/etc/e-smith/web/common +%patch1 -p1 %build perl createlinks