--- rpms/smeserver-support/sme10/smeserver-support.spec 2016/05/12 21:21:08 1.6 +++ rpms/smeserver-support/sme10/smeserver-support.spec 2018/05/02 17:58:16 1.20 @@ -1,17 +1,17 @@ -# $Id: smeserver-support.spec,v 1.5 2016/04/11 19:04:55 vip-ire Exp $ +# $Id: smeserver-support.spec,v 1.19 2018/02/11 04:52:58 jpp Exp $ Summary: SME Server module to display support and licensing information %define name smeserver-support Name: %{name} %define version 2.8.0 -%define release 5 +%define release 15 # 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 # prior to taking the update # TODO: check mkinitrd,mdadm to see if needed -%define centos_excludes initscripts,libgsf +%define centos_excludes initscripts,libgsf,samba*,libsmbclient,libwbclient,libtevent,python-tevent %define centos_remove kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm,openssl Version: %{version} @@ -19,17 +19,22 @@ 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 Patch0: smeserver-support-2.8.0-update_copyright_2016.patch Patch1: smeserver-support-2.8.0-remove_smolt_service.patch +Patch2: smeserver-support-2.8.0.os-release.patch +Patch3: smeserver-support-2.8.0-koozali.patch +Patch4: smeserver-support-2.8.0-koozali_manager.patch +Patch5: smeserver-support-2.8.0-bz9676hover.patch +Patch6: smeserver-support-2.8.0-bz10516.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch Provides: server-manager-images AutoReqProv: no +# SME 10 requires these explicitly +Requires: perl(LWP::Protocol::https) + # New features that we want to pull in on upgrades Requires: screen Requires: smeserver-yum @@ -99,6 +104,48 @@ Requires: psacct Requires: dmraid %changelog +* Wed May 02 2018 Jean-Philipe Pialasse 2.8.0-15.sme +- exclude libtevent,python-tevent from base and updates to avoid conflict with localy build version of samba [SME: 10573] + +* Sat Feb 10 2018 Jean-Philipe Pialasse 2.8.0-14.sme +- add back perl(LWP::Protocol::https) support [SME: 10516] + +* Mon Sep 25 2017 Jean-Philipe Pialasse 2.8.0-13.sme +- upstream samba packages were not all excluded [SME: 10428] + +* Mon Mar 20 2017 Jean-Philipe Pialasse 2.8.0-12.sme +- exclude samba from centos repo as we have our own with DC support [SME: 10155] + +* Fri Mar 03 2017 Jean-Philipe Pialasse 2.8.0-11.sme +- improving link to donation [SME: 9598] + +* Tue Jul 19 2016 Jean-Philipe Pialasse 2.8.0-10.sme +- fix hover color [SME: 9676] + +* Tue Jul 19 2016 Jean-Philipe Pialasse 2.8.0-9.sme +- Koozali branding of manager [SME: 9676] +- new images in archive; removed old images from cvs +- updated some css smeserver-support-2.8.0-koozali_manager.patch + +* Wed Jun 15 2016 Jean-Philipe Pialasse 2.8.0-8.sme +- reverting partly the changes in last patch [SME: 9598] +- wrong catch of proxy related url with the http to https changes +- thank to Charlie Brady for reporting +- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, + by assuming the date is correct and changing the weekday. + Fri Oct 24 2005 --> Fri Oct 21 2005 or Mon Oct 24 2005 or Fri Oct 28 2005 or .... + Sat Oct 25 2005 --> Sat Oct 22 2005 or Tue Oct 25 2005 or Sat Oct 29 2005 or .... + Sat Dec 25 2005 --> Sat Dec 24 2005 or Sun Dec 25 2005 or Sat Dec 31 2005 or .... + Thu May 23 2006 --> Thu May 18 2006 or Tue May 23 2006 or Thu May 25 2006 or .... + Sat Mar 07 2008 --> Sat Mar 01 2008 or Fri Mar 07 2008 or Sat Mar 08 2008 or .... + Sat Feb 03 2013 --> Sat Feb 02 2013 or Sun Feb 03 2013 or Sat Feb 09 2013 or .... + +* Wed Jun 15 2016 Jean-Philipe Pialasse 2.8.0-7.sme +- update links to koozali.org [SME: 9598] + +* Tue Jun 14 2016 stephane de Labrusse 2.8.0-6.sme +- Template of os-release [SME: 9580] + * Thu May 12 2016 Daniel Berteaud 2.8.0-5.sme - Rebuild for [SME: 9393] @@ -190,10 +237,12 @@ Requires: dmraid * Thu Feb 7 2013 Ian Wells 2.4.0-4.sme - Obsolete only older php-mcrypt versions <= 5.3 [SME: 7320] -* Sat Feb 3 2013 Shad L. Lords 2.4.0-3.sme +* Sun Feb 03 2013 Shad L. Lords 2.4.0-3.sme + Sat Feb 03 2013 --> Sat Feb 02 2013 or Sun Feb 03 2013 or Sat Feb 09 2013 or .... - Obsolete python-ctypes so upgrades will work [SME: 7273] -* Sat Feb 3 2013 Shad L. Lords 2.4.0-2.sme +* Sun Feb 03 2013 Shad L. Lords 2.4.0-2.sme + Sat Feb 03 2013 --> Sat Feb 02 2013 or Sun Feb 03 2013 or Sat Feb 09 2013 or .... - Obsolete kudzu so upgrades will work [SME: 7273] * Thu Jan 31 2013 Shad L. Lords 2.4.0-1.sme @@ -286,7 +335,8 @@ Requires: dmraid * 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 +* Fri Mar 07 2008 Stephen Noble 1.6.0-47 + Sat Mar 07 2008 --> Sat Mar 01 2008 or Fri Mar 07 2008 or Sat Mar 08 2008 or .... - gettext Internet connection failed [SME: 631] * Sat Mar 1 2008 Shad L. Lords 1.6.0-46 @@ -419,10 +469,12 @@ Requires: dmraid * Tue May 23 2006 Gavin Weight 1.6.0-09 - Add Obsoletes for perl-File-MMagic. [SME: 1436] -* Thu May 23 2006 Gordon Rowell 1.6.0-08 +* Tue May 23 2006 Gordon Rowell 1.6.0-08 + Thu May 23 2006 --> Thu May 18 2006 or Tue May 23 2006 or Thu May 25 2006 or .... - Don't bother printing LWP error [SME: 1314] -* Thu May 23 2006 Gordon Rowell 1.6.0-07 +* Tue May 23 2006 Gordon Rowell 1.6.0-07 + Thu May 23 2006 --> Thu May 18 2006 or Tue May 23 2006 or Thu May 25 2006 or .... - Add weekly status report. - Only the following information is passed in the status report: - ReleaseVersion (e.g. 7.0rc2) @@ -540,10 +592,12 @@ Requires: dmraid - sysconfig{ReleaseVersion} - An SHA1 hash of sysconfig{SystemID} [SME: 402] -* Sat Dec 25 2005 Gordon Rowell 1.4.7-23 +* Sun Dec 25 2005 Gordon Rowell 1.4.7-23 + Sat Dec 25 2005 --> Sat Dec 24 2005 or Sun Dec 25 2005 or Sat Dec 31 2005 or .... - Add esmith::console object for standalone menu item [SME: 364] -* Sat Dec 25 2005 Gordon Rowell 1.4.7-22 +* Sun Dec 25 2005 Gordon Rowell 1.4.7-22 + Sat Dec 25 2005 --> Sat Dec 24 2005 or Sun Dec 25 2005 or Sat Dec 31 2005 or .... - Move testInternet console menu item to smeserver-support [SME: 364] * Wed Dec 14 2005 Gordon Rowell 1.4.7-21 @@ -585,10 +639,12 @@ Requires: dmraid * Mon Oct 31 2005 Gordon Rowell 1.4.7-10 - Obsolete e-smith-reinstall-floppy [SF: 1342860] -* Sat Oct 25 2005 Gordon Rowell 1.4.7-09 +* Tue Oct 25 2005 Gordon Rowell 1.4.7-09 + Sat Oct 25 2005 --> Sat Oct 22 2005 or Tue Oct 25 2005 or Sat Oct 29 2005 or .... - Add dependency on audit-libs -* Fri Oct 24 2005 Gordon Rowell 1.4.7-08 +* Mon Oct 24 2005 Gordon Rowell 1.4.7-08 + Fri Oct 24 2005 --> Fri Oct 21 2005 or Mon Oct 24 2005 or Fri Oct 28 2005 or .... - Remove kenel-module-st - patch is in the CentOS 4.2 kernel * Mon Oct 17 2005 Gordon Rowell 1.4.7-07 @@ -868,9 +924,11 @@ 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 -cp %{SOURCE3} root/etc/e-smith/web/common +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build perl createlinks @@ -897,8 +955,6 @@ rm -f %{name}-%{version}-%{release}-file rm -rf $RPM_BUILD_ROOT %post -[ -f /boot/grub/splash.xpm.gz ] || ln -s tux.xpm.gz /boot/grub/splash.xpm.gz -/bin/true %files -f %{name}-%{version}-%{release}-filelist %defattr(-,root,root)