--- rpms/smeserver-support/sme8/smeserver-support.spec 2007/09/08 00:57:08 1.4 +++ rpms/smeserver-support/sme8/smeserver-support.spec 2010/06/28 15:33:08 1.35 @@ -1,13 +1,18 @@ +# $Id: smeserver-support.spec,v 1.34 2010/05/25 15:31:38 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 40 +%define version 2.2.0 +%define release 16 -# These packages come from CentOS, but wee need to use care when +# 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 -%define centos_excludes kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm,initscripts + +# 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} @@ -16,20 +21,8 @@ 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 +Patch0: smeserver-support.bug5656.patch +Patch1: smeserver-support-2.2.0-migrate_excludes.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch @@ -40,8 +33,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 @@ -52,6 +43,10 @@ Obsoletes: kmod-slip Obsoletes: kmod-slip-smp Obsoletes: kmod-slip-xenU +# remove old kernel modules that prevent upgrades +Obsoletes: kernel-module-appletalk +Obsoletes: kernel-smp-module-appletalk + # Old dependencies from outdated atrpms/rpmforge packages Obsoletes: libghttp Obsoletes: perl-HTTP-GHTTP @@ -60,11 +55,12 @@ Obsoletes: pythonabi # 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 -Obsoletes: yum-metadata-parser # remove netatalk and modules Obsoletes: e-smith-netatalk @@ -73,32 +69,6 @@ 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 -Obsoletes: perl-Unicode-IMAPUtf7 = 1.02-1 -Obsoletes: perl-Unicode-String = 2.06-1 -Obsoletes: file = 4.12-3db_rh73 -Obsoletes: libmcrypt = 2.5.7-1.dag.rh73 -Obsoletes: libmhash = 0.9.1-1.rh73.dag -Obsoletes: php = 4.3.10-3eo -Obsoletes: php-curl = 4.3.10-3eo -Obsoletes: php-devel = 4.3.10-3eo -Obsoletes: php-domxml = 4.3.10-3eo -Obsoletes: php-imap = 4.3.10-3eo -Obsoletes: php-ldap = 4.3.10-3eo -Obsoletes: php-mcrypt = 4.3.10-3eo -Obsoletes: php-mhash = 4.3.10-3eo -Obsoletes: php-mysql = 4.3.10-3eo -Obsoletes: php-odbc = 4.3.10-3eo -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 @@ -107,13 +77,13 @@ 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 Requires: smeserver-clamav Requires: e-smith-spamassassin Requires: smeserver-audittools +Requires: e-smith-formmagick >= 1.4.0-9 # These packages weren't in 5.x, or were split from e-smith-base since then Requires: e-smith-domains @@ -136,14 +106,32 @@ Obsoletes: kernel-module-st Obsoletes: e-smith-loginscript = 0.2-2 Obsoletes: e-smith-samba = 2.1.0-10gjz Requires: e-smith-samba -Requires: check4updates # Pull in locales so we have a smooth language upgrade [SF: 1309520] +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-he +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 @@ -201,6 +189,9 @@ Conflicts: e-smith-userpanel Obsoletes: dmc-mitel-mailrules Conflicts: dmc-mitel-mailrules +Obsoletes: php5-cgi +Conflicts: php5-cgi + # This block used to be in the SMEServer RPM. Many are probably # redundant or should be elsewhere or removed # [SF: 1356225] @@ -262,7 +253,108 @@ Conflicts: dungog-ssl Conflicts: dungog-deletedoublebounce Conflicts: dungog-mailblocking +# Remove rkhunter +Obsoletes: rkhunter <= 1.3.4-7.el5.sme + %changelog +* 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] + +* Wed Dec 9 2009 Charlie Brady 2.2.0-11.sme +- Fix css validation errors. [SME: 5656] + +* Tue Oct 27 2009 Shad L. Lords 2.2.0-10.sme +- Add support for Polish (pl). [SME: 5434] +- Add support for Thai (th). [SME: 5466] + +* Mon Oct 26 2009 Shad L. Lords 2.2.0-9.sme +- obsoletes fonts-xorg-base to prevent dragging in unneeded + packages [SME: 5535] + +* Mon Oct 26 2009 Shad L. Lords 2.2.0-8.sme +- add VFlib2 to obsoletes list so upgrades work [SME: 5532] + +* Mon Aug 03 2009 Gavin Weight 2.2.0-7.sme +- Add Obsoletes for kernel modules. [SME: 5386] + +* Wed May 27 2009 Shad L. Lords 2.2.0-6.sme +- Add support for Romanian (ro). [SME: 5268] + +* Wed May 13 2009 Filippo Carletti 2.2.0-5 +- Obsoletes: rkhunter to remove from default install [SME: 5172] + +* Wed Apr 29 2009 Gavin Weight 2.2.0-4.sme +- Add support for Estonian (et). [SME: 5203] + +* Tue Mar 3 2009 Shad L. Lords 2.2.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.2.0-2.sme +- Add support for Japanese (ja) [SME: 4637] + +* Tue Oct 7 2008 Shad L. Lords 2.2.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] + +* Sat Jul 26 2008 Shad L. Lords 1.6.0-51 +- Add support for Bulgarian (bg) [SME: 4337] +- Re-add support for Portuguese (pt) [SME: 4006] +- Add support for Turkish (tr) [SME: 4443] + +* Tue Mar 18 2008 Shad L. Lords 1.6.0-50 +- Add gettext to console titles. + +* Tue Mar 18 2008 Shad L. Lords 1.6.0-49 +- Fix support for Portuguese (pt_BR) [SME: 4006] + +* Wed Mar 12 2008 Shad L. Lords 1.6.0-48 +- Add support for Hungarian (hu) [SME: 4025] + +* Sat Mar 07 2008 Stephen Noble 1.6.0-47 +- gettext Internet connection failed [SME: 631] + +* Sat Mar 1 2008 Shad L. Lords 1.6.0-46 +- Add support for Danish (da) [SME: 4006] +- Add support for Dutch (nl) [SME: 4006] +- Add support for Greek (el) [SME: 4006] +- Add support for Indonesian (id) [SME: 4006] +- Add support for Portuguese (pt) [SME: 4006] +- Add support for Slovenian (sl) [SME: 4006] + +* Wed Feb 13 2008 Stephen Noble 1.6.0-45 +- Remove tags now in general [SME: 3928] + +* Sat Feb 09 2008 Stephen Noble 1.6.0-44 +- move support lexicon [SME: 3878] + +* Fri Jan 11 2008 Shad L. Lords 1.6.0-43 +- Revert obsoletes check4updates, should be in smeserver-yum [SME: 3250] + +* Fri Jan 11 2008 Stephen Noble 1.6.0-42 +- Add Obsolete check4updates [SME: 3250] + +* Mon Jan 7 2008 Gavin Weight 1.6.0-41 +- Remove check4updates requires line. [SME: 3250] + * Fri Sep 7 2007 Shad L. Lords 1.6.0-40 - Update obsoletes for sme8 [SME: 2437] @@ -819,35 +911,9 @@ SME Server module to display support and %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 - %build perl createlinks @@ -859,6 +925,8 @@ 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