--- rpms/smeserver-support/sme9/smeserver-support.spec 2013/11/03 05:17:28 1.21 +++ rpms/smeserver-support/sme9/smeserver-support.spec 2016/07/19 12:45:08 1.32 @@ -1,10 +1,10 @@ -# $Id: smeserver-support.spec,v 1.20 2013/10/12 03:09:35 wellsi Exp $ +# $Id: smeserver-support.spec,v 1.31 2016/07/19 12:41:13 unnilennium Exp $ Summary: SME Server module to display support and licensing information %define name smeserver-support Name: %{name} -%define version 2.4.0 -%define release 19 +%define version 2.6.0 +%define release 8 # These packages come from CentOS, but we need to use care when # updating them - either we've patched them, or we need to do something @@ -12,92 +12,28 @@ 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.xz -Source1: smeserver_logo.jpg -Source2: smeserver_logo.gif -Source3: btn_donateCC_LG.gif -Patch1: smeserver-support-2.4.0-SystemRelease.patch -Patch2: smeserver-support-2.4.0-donation.patch -Patch3: smeserver-support-2.4.0-FullCopyrightText.patch +Patch0: smeserver-support-2.6.0.bz8939.motd_donation_message.patch +Patch1: smeserver-support-2.6.0.bz8939.system-release-template.patch +Patch2: smeserver-support-2.6.0-readhat_release_no_motd.patch +Patch3: smeserver-support-2.6.0-update_copyright_2016.patch +Patch4: smeserver-support-2.6.0-koozali_manager.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch Provides: server-manager-images -Conflicts: ServiceLink-support -Obsoletes: e-smith-blades -Obsoletes: e-smith-keys -Obsoletes: e-smith-support AutoReqProv: no -# remove old sme8 packages that prevent upgrades -Obsoletes: kudzu -Obsoletes: python-ctypes < 1.0.3 - -# 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 - -# 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 -Obsoletes: perl-Net_SSLeay.pm -Obsoletes: pythonabi -Obsoletes: centos-release-notes <= 5.9 -Obsoletes: gettext <= 0.17 -Obsoletes: hmaccalc <= 0.9.6 -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 -Obsoletes: fonts-xorg-base -Obsoletes: pine -Obsoletes: system-config-mouse -Obsoletes: VFlib2 -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 - -# XXX - FIXME - pam should require this, shouldn't it? -Requires: audit-libs - # New features that we want to pull in on upgrades Requires: smolt Requires: screen Requires: smeserver-yum -Obsoletes: yum = 1.0.3-6.0.7.x.esmith -Obsoletes: m2crypto <= 0.16 -Obsoletes: mcstrans <= 0.2.11 -Obsoletes: net-snmp <= 5.3.2.2 -Obsoletes: net-snmp-utils <= 5.3.2.2 -Obsoletes: postgresql-libs <= 8.1.23 -Obsoletes: sysklogd <= 1.4.1 Requires: smeserver-clamav Requires: e-smith-spamassassin Requires: smeserver-audittools @@ -114,15 +50,6 @@ Requires: e-smith-starterwebsite Requires: e-smith-dnscache Requires: e-smith-tinydns -# This one should probably be in e-smith-base -Obsoletes: kernel-module-slip -Obsoletes: kernel-smp-module-slip -Obsoletes: kernel-module-st - -# Specific package versions we dont want. -# These aren't being pulled by anything else. -Obsoletes: e-smith-loginscript = 0.2-2 -Obsoletes: e-smith-samba = 2.1.0-10gjz Requires: e-smith-samba # Pull in locales so we have a smooth language upgrade [SF: 1309520] @@ -152,96 +79,9 @@ Requires: smeserver-locale-tr Requires: smeserver-locale-zh_CN Requires: smeserver-locale-zh_TW -# Obsolete old versions of aspell -Obsoletes: aspell <= 12:0.60.3 -Obsoletes: aspell-en <= 50:6.0 - -# These should be re-pulled by other e-smith packages. -Obsoletes: perl-File-MMagic = 1.22-1 -Obsoletes: perl-gettext = 1.01-10 -Obsoletes: perl-perl-ldap = 0.22-10 -Obsoletes: perl-perl-ldap = 0.31-1 -Obsoletes: php = 4.3.10-01es01 -Obsoletes: php-imap = 4.3.10-01es01 -Obsoletes: php-ldap = 4.3.10-01es01 -Obsoletes: php-mysql = 4.3.10-01es01 -Obsoletes: proftpd = 4:1.2.5-fr1 -Obsoletes: proftpd = 5:1.2.8p-es1 -Obsoletes: proftpd = 5:1.2.9-es1 -Obsoletes: proftpd = 5:1.2.9-es3 -Obsoletes: proftpd = 5:1.2.9-es3sme1 -Obsoletes: proftpd = 5:1.2.9-es4 -Obsoletes: squid = 9:2.5.STABLE3-6.3E.2es01 - -# Specific package versions we dont want. -# These were installed with older version but aren't needed. -Obsoletes: authconfig = 4.2.8-4 -Obsoletes: bind-utils = 9.2.1-1.7x.2 -Obsoletes: cvs = 1.11.1p1-7es02 -Obsoletes: cvs = 1.11.1p1-16.legacy.2 -Obsoletes: cvs = 1.11.1p1-17.legacy.2 -Obsoletes: dietlibc = 0.15-2 -Obsoletes: e-smith-telnet = 1.6.0-02 -Obsoletes: e-smith-reinstall-floppy <= 1.12.0-01 -Obsoletes: gd = 1.8.4-4 -Obsoletes: gd = 1.8.4-4.1.legacy -Obsoletes: logwatch = 5.2.2-1sme01 -Obsoletes: mysqlclient9 = 3.23.22-8 -Obsoletes: mysql-devel = 3.23.56-1.73 -Obsoletes: mysql-devel = 3.23.58-1.73 -Obsoletes: openldap-clients = 2.0.27-2.7.3es -Obsoletes: perl-Crypt-SSLeay = 0.35-15 -Obsoletes: perl-Digest-Nilsimsa = 0.06-1 -Obsoletes: perl-Filter-Handle = 0.03-10 -Obsoletes: perl-I18N-LangTags = 0.27-1es3 -Obsoletes: perl-NDBM_File = 1:1.75-34.99.6 -Obsoletes: perl-Net-Ping = 2.28-1 -Obsoletes: perl-Proc-PID_File = 0.05-1 -Obsoletes: perl-Test-Harness-Straps = 0.10-1 -Obsoletes: perl-Test-Simple = 0.42-1 -Obsoletes: perl-Text-Wrapper = 1.000-10 -Obsoletes: ppp-modules -Obsoletes: rpm-build = 4.0.4-7x.18 -Obsoletes: sortspam = 1.0.0-01 -Obsoletes: sortspam = 1.1.0-05 -Obsoletes: sortspam = 1.1.0-05sme01 -Obsoletes: sortspam = 1.1.0-05sme02 -Obsoletes: telnet-server = 0.17-20 -Obsoletes: e-smith-userpanel -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 <= 5.3 - # This block used to be in the SMEServer RPM. Many are probably # redundant or should be elsewhere or removed # [SF: 1356225] -Conflicts: amavis-ng -Conflicts: clamav-es -Obsoletes: obtuse-smtpd obtuse-smtpd-qmail -Obsoletes: ip_masq_h323 ip_masq_icq ip_masq_rtsp isapnptools -Obsoletes: pidentd -Obsoletes: tftp-conntrack-nat -Obsoletes: e-smith-named -Obsoletes: e-smith-locale-fr_CA -Obsoletes: pptp-conntrack-nat -Obsoletes: amavis-ng -Obsoletes: clamav-es Requires: attr Requires: audit Requires: dos2unix @@ -259,40 +99,44 @@ Requires: prelink Requires: psacct Requires: dmraid -# Dungog contribs which Stephen Noble reports as incompatible with -# SME 7.x [SME 1283] [SME 1295] [SME 2427] -Obsoletes: dungog-vdomain -Obsoletes: smeserver-vdomain -Conflicts: dungog-vdomain -Conflicts: smeserver-vdomain -Obsoletes: smeserver-userpanel <= 0.9-9 -Obsoletes: dungog-autofs -Obsoletes: dungog-nis -Obsoletes: dungog-cgiinhtml -Obsoletes: dungog-ispconnection -Obsoletes: dungog-dialup -Obsoletes: dungog-masq -Obsoletes: dungog-sshd -Obsoletes: dungog-tmda -Obsoletes: dungog-ssl -Obsoletes: dungog-deletedoublebounce -Obsoletes: dungog-mailblocking -Conflicts: dungog-autofs -Conflicts: dungog-nis -Conflicts: dungog-cgiinhtml -Conflicts: dungog-ispconnection -Conflicts: dungog-dialup -Conflicts: dungog-masq -Conflicts: dungog-sshd -Conflicts: dungog-tmda -Conflicts: dungog-ssl -Conflicts: dungog-deletedoublebounce -Conflicts: dungog-mailblocking +%changelog +* Tue Jul 19 2016 Jean-Philipe Pialasse 2.6.0-8.sme +- Koozali branding of manager [SME: 9678] +- Tanks to John Crisp for his wonderful work. +- new images in archive; removed old images from cvs +- updated some css smeserver-support-2.6.0-koozali_manager.patch + +* Thu Mar 3 2016 Daniel Berteaud 2.6.0-7.sme +- Update copyright in server-manager footer [SME: 9266] + +* Wed Jan 20 2016 Daniel Berteaud 2.6.0-6.sme +- Don't put motd content in /etc/redhat-release [SME: 9161] + +* Fri Sep 25 2015 stephane de Labrusse 2.6.0-5.sme +- created a template for /etc/system-release [SME: 8939] +- Added smeserver-support-2.6.0.bz8939.system-release-template.patch + +* Thu Jun 25 2015 stephane de Labrusse 2.6.0-4.sme +- added a motd message to increase involvements or donations [SME: 8939] +- Code done by John Crisp and +- Stefano Zamboni + +* Sat Nov 1 2014 Daniel Berteaud 2.6.0-3.sme +- Remove now uneeded obsolete directives [SME: 8400] + +* Wed Sep 10 2014 Daniel Berteaud 2.6.0-2.sme +- Remove openssl from the Exclude list of centos repo [SME: 8530] + +* Sun Mar 23 2014 Ian Wells 2.6.0-1.sme +- Roll new stream to remove obsolete images [SME: 7962] + +* Sun Mar 16 2014 Ian Wells 2.4.0-21.sme +- Move support.pl from e-smith-base to smeserver-support [SME: 8264] +- This console license page now uses dialog's textbox. -# Remove rkhunter -Obsoletes: rkhunter <= 1.3.4-7.el5.sme +* Sat Nov 2 2013 Ian Wells 2.4.0-20.sme +- Update footer copyright [SME: 7961] -%changelog * Sat Nov 2 2013 Ian Wells 2.4.0-19.sme - Renew full copyright text, by Greg Zartman [SME: 7942] @@ -1017,12 +861,11 @@ SME Server module to display support and %prep %setup -cp %{SOURCE1} root/etc/e-smith/web/common -cp %{SOURCE2} root/etc/e-smith/web/common -cp %{SOURCE3} root/etc/e-smith/web/common +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build perl createlinks