--- rpms/smeserver-support/sme7/smeserver-support.spec 2008/08/07 14:58:28 1.16 +++ rpms/smeserver-support/sme7/smeserver-support.spec 2009/10/27 18:14:57 1.25 @@ -1,10 +1,10 @@ -# $Id: smeserver-support.spec,v 1.16 2008/08/07 13:33:24 charliebrady Exp $ +# $Id: smeserver-support.spec,v 1.24 2009/05/27 14:39:50 slords Exp $ Summary: SME Server module to display support and licensing information %define name smeserver-support Name: %{name} -%define version 1.6.0 -%define release 52 +%define version 2.0.0 +%define release 7 # 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 @@ -18,24 +18,6 @@ Group: Networking/Daemons Source: %{name}-%{version}.tar.gz Source1: smeserver_logo.jpg Source2: smeserver_logo.gif -Patch0: smeserver-support-1.6.0-centosrelease.patch -Patch1: smeserver-support-1.6.0-onlinemanuallocation.patch -Patch2: smeserver-support-1.6.0-statusreport.patch -Patch3: smeserver-support-1.6.0-statusreport.patch2 -Patch4: smeserver-support-1.6.0-statusreport.sleep.patch -Patch5: smeserver-support-1.6.0-logo.patch -Patch6: smeserver-support-1.6.0-statusreport.sleep.patch2 -Patch7: smeserver-support-1.6.0-initialtext.patch -Patch8: smeserver-support-1.6.0-initialtext.patch2 -Patch9: smeserver-support-1.6.0-initialtext.patch3 -Patch10: smeserver-support-1.6.0-initialtext.patch4 -Patch11: smeserver-support-1.6.0-cssStyling.patch -Patch12: smeserver-support-1.6.0-redhat-release.patch -Patch13: smeserver-support-1.6.0-smolt.patch -Patch14: smeserver-support-1.6.0-supportlexicon.patch -Patch15: smeserver-support-1.6.0-tags2general.patch -Patch16: smeserver-support-1.6.0-gettextNetConnectFail.patch -Patch17: smeserver-support-1.6.0-gettextConsole.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch @@ -46,40 +28,6 @@ Obsoletes: e-smith-keys Obsoletes: e-smith-support AutoReqProv: no -# SME8 section -%if "%{?rhel}" == "5" -# remove old kernels that prevent upgrades -Obsoletes: kernel < 2.6.17 -Obsoletes: kernel-smp < 2.6.17 -Obsoletes: kernel-xenU < 2.6.17 - -# Kernel modules now included in kernel -Obsoletes: kmod-slip -Obsoletes: kmod-slip-smp -Obsoletes: kmod-slip-xenU - -# Old dependencies from outdated atrpms/rpmforge packages -Obsoletes: libghttp -Obsoletes: perl-HTTP-GHTTP -Obsoletes: perl-Net_SSLeay.pm -Obsoletes: pythonabi - -# Remove packages no longer needed or provided in COS5 -Obsoletes: comps -Obsoletes: pine -Obsoletes: system-config-keyboard -Obsoletes: system-config-mouse -Obsoletes: xorg-x11-Mesa-libGL - -# remove netatalk and modules -Obsoletes: e-smith-netatalk -Obsoletes: kmod-appletalk -Obsoletes: kmod-appletalk-smp -Obsoletes: kmod-appletalk-xenU -Obsoletes: netatalk - -%else -# SME7 section Requires: slip-kmod # More packages which might have been installed via jhb's horde 3 script @@ -102,7 +50,6 @@ Obsoletes: php-snmp = 4.3.10-3eo Obsoletes: php-xmlrpc = 4.3.10-3eo Obsoletes: unixODBC = 2.2.0-5 Obsoletes: php-eaccelerator = 4.3.10_0.9.2a-1eo -%endif # SF: 1357548 Conflicts: selinux-policy-targeted @@ -112,7 +59,6 @@ Requires: audit-libs # New features that we want to pull in on upgrades Requires: smolt -Requires: rkhunter Requires: screen Requires: smeserver-yum Obsoletes: yum = 1.0.3-6.0.7.x.esmith @@ -144,22 +90,29 @@ Obsoletes: e-smith-samba = 2.1.0-10gjz Requires: e-smith-samba # Pull in locales so we have a smooth language upgrade [SF: 1309520] -#Requires: smeserver-locale-ca Requires: smeserver-locale-bg Requires: smeserver-locale-da Requires: smeserver-locale-de Requires: smeserver-locale-el Requires: smeserver-locale-es +Requires: smeserver-locale-et Requires: smeserver-locale-fr Requires: smeserver-locale-hu Requires: smeserver-locale-id Requires: smeserver-locale-it +Requires: smeserver-locale-ja +Requires: smeserver-locale-nb Requires: smeserver-locale-nl +Requires: smeserver-locale-pl Requires: smeserver-locale-pt Requires: smeserver-locale-pt_BR +Requires: smeserver-locale-ro +Requires: smeserver-locale-ru Requires: smeserver-locale-sl Requires: smeserver-locale-sv +Requires: smeserver-locale-th Requires: smeserver-locale-tr +Requires: smeserver-locale-zh_CN # These should be re-pulled by other e-smith packages. Obsoletes: perl-File-MMagic = 1.22-1 @@ -278,7 +231,37 @@ Conflicts: dungog-ssl Conflicts: dungog-deletedoublebounce Conflicts: dungog-mailblocking +# Remove rkhunter +Obsoletes: rkhunter <= 1.3.4-7.el4.sme + %changelog +* Tue Oct 27 2009 Shad L. Lords 2.0.0-7.sme +- Add support for Polish (pl). [SME: 5433] +- Add support for Thai (th). [SME: 5466] + +* Wed May 27 2009 Shad L. Lords 2.0.0-6.sme +- Add support for Romanian (ro). [SME: 5268] + +* Wed May 27 2009 Shad L. Lords 2.0.0-5.sme +- Obsoletes: rkhunter to remove from default install [SME: 5172] + +* Wed Apr 29 2009 Gavin Weight 2.0.0-4.sme +- Add support for Estonian (et). [SME: 5203] + +* Tue Mar 3 2009 Shad L. Lords 2.0.0-3.sme +- Add support for Norwegian Bokmal (nb) [SME: 5002 ] +- Add support for Russian (ru) [SME: 5002] +- Add support for Chinese China (zh_CN) [SME: 5002] + +* Mon Oct 13 2008 Shad L. Lords 2.0.0-2.sme +- Add support for Japanese (ja) [SME: 4637] + +* Tue Oct 7 2008 Shad L. Lords 2.0.0-1.sme +- Roll new stream to separate sme7/sme8 trees [SME: 4633] + +* Tue Oct 7 2008 Shad L. Lords 1.6.0-53 +- Update excludes for sme8 [SME: 4507] + * Thu Aug 7 2008 Charlie Brady 1.6.0-52 - Remove incorrect 'Obsoletes: yum-metadata-parser'. [SME: 4466] @@ -876,41 +859,9 @@ SME Server module to display support and %prep %setup -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch6 -p1 - -mkdir -p root/etc/e-smith/templates/etc/issue -touch root/etc/e-smith/templates/etc/issue/template-begin - -rm -f root/etc/e-smith/web/common/e-smith-manager.gif -rm -rf root/etc/e-smith/locale/de -rm -rf root/etc/e-smith/locale/fr -rm -rf root/etc/e-smith/locale/es -rm -rf root/etc/e-smith/locale/it -rm -rf root/etc/e-smith/licenses/fr -rm -rf root/etc/e-smith/licenses/fr_CA - -%patch5 -p1 -rm -f root/etc/e-smith/web/common/smeserver_logo.gif cp %{SOURCE1} root/etc/e-smith/web/common cp %{SOURCE2} root/etc/e-smith/web/common -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 - %build perl createlinks