--- rpms/smeserver-yum/sme8/smeserver-yum.spec 2012/08/31 20:09:16 1.50 +++ rpms/smeserver-yum/sme8/smeserver-yum.spec 2014/11/19 17:53:05 1.54 @@ -1,10 +1,10 @@ -# $Id: smeserver-yum.spec,v 1.49 2011/03/01 19:20:57 snetram Exp $ +# $Id: smeserver-yum.spec,v 1.53 2013/03/18 03:00:53 wellsi Exp $ %define name smeserver-yum Summary: YUM, an rpm updater Name: %{name} %define version 2.2.0 -%define release 20 +%define release 23 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -25,6 +25,8 @@ Patch12: smeserver-yum-2.2.0-migrate_und Patch13: smeserver-yum-2.2.0-trigger-reboot-on-kernel-update.patch Patch14: smeserver-yum-2.2.0-add-wait-timer.patch Patch15: smeserver-yum-2.2.0-mirrorlist2.patch +Patch16: smeserver-yum-2.2.0-SoftwareUpdate.patch +Patch17: smeserver-yum-2.2.0.check4updates_to_smecontribs.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-formmagick >= 1.4.0-12 @@ -41,6 +43,7 @@ Obsoletes: yum-plugin-fastestmirror Obsoletes: yum-plugin-installonlyn Requires: yum-fastestmirror Requires: mailx +Requires: python-hashlib BuildRequires: e-smith-devtools >= 1.13.1-03 Conflicts: centos-yumconf AutoReqProv: no @@ -48,6 +51,15 @@ AutoReqProv: no %name is an implementation of http://linux.duke.edu/projects/yum on SME Server %changelog +* Wed Nov 19 2014 Stephane de Labrusse 2.2.0-23.sme +- Added a check-update for the smecontribs repository [SME: 8678] + +* Sun Mar 17 2013 Ian Wells 2.2.0-22.sme +- Change wording of Software Update button [SME: 7343] + +* Sat Feb 2 2013 Shad L. Lords 2.2.0-21.sme +- Add python-hashlib so we can read newer repodata signatures [SME: 7290] + * Fri Aug 31 2012 Shad L. Lords 2.2.0-20.sme - Point mirrorlist to mirrorlist.contribs.org [SME: 7087] @@ -887,6 +899,8 @@ AutoReqProv: no %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 +%patch17 -p1 %build perl createlinks @@ -909,6 +923,7 @@ mkdir -p root/etc/e-smith/db/yum_{availa --file '/sbin/e-smith/yum_update_dbs' 'attr(0700,root,root)' \ --file '/sbin/e-smith/yum' 'attr(0755,root,root)' \ --file '/sbin/e-smith/check4updates' 'attr(0755,root,root)' \ + --file '/sbin/e-smith/check4contribsupdates' 'attr(0755,root,root)' \ --file '/etc/cron.daily/smeserver-yum' 'attr(0700,root,root)' \ --file /var/service/yum/down 'attr(0644,root,root)' \ --file /var/service/yum/run 'attr(0755,root,root)' \