--- rpms/smeserver-yum/sme8/smeserver-yum.spec 2010/05/17 18:45:54 1.41 +++ rpms/smeserver-yum/sme8/smeserver-yum.spec 2015/02/21 16:44:20 1.56 @@ -1,18 +1,10 @@ -# $Id: smeserver-yum.spec,v 1.40 2009/11/05 18:43:13 slords Exp $ +# $Id: smeserver-yum.spec,v 1.55 2015/01/10 10:40:20 stephdl Exp $ %define name smeserver-yum Summary: YUM, an rpm updater Name: %{name} %define version 2.2.0 -%define release 13 - -# 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 - -# TODO: check mkinitrd,mdadm to see if needed -%define centos_excludes initscripts - +%define release 25 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -28,6 +20,13 @@ Patch7: smeserver-yum-2.2.0-nosemi.patch Patch8: smeserver-yum-2.2.0-unsavedchanges.patch Patch9: smeserver-yum-2.2.0-import-keys.patch Patch10: smeserver-yum-2.2.0-fixremove.patch +Patch11: smeserver-yum-2.2.0-migratelist.patch +Patch12: smeserver-yum-2.2.0-migrate_undefined.patch +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 @@ -44,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 @@ -51,6 +51,45 @@ AutoReqProv: no %name is an implementation of http://linux.duke.edu/projects/yum on SME Server %changelog +* Sat Feb 21 2015 Stephane de Labrusse 2.2.0-25.sme +- Set the check update frequency of smecontribs through the server-manager +- [SME: 8858] + +* Sat Jan 10 2015 Stephane de Labrusse 2.2.0-24.sme +- Add a default Yum db property for check4contribsupdates [SME: 8791] + +* 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] + +* Tue Mar 1 2011 Jonathan Martens 2.2.0-19.sme +- Add random wait timer for check4updates script to distribute load on ibiblio [SME: 6534] + +* Fri Oct 1 2010 Jonathan Martens 2.2.0-18.sme +- Trigger post-upgrade and reboot on kernel updates [SME: 6166] + +* Sat Jun 12 2010 Shad L. Lords 2.2.0-17.sme +- Fix migrate fragment to not throw warnings [SME: 5705] + +* Wed Jun 02 2010 Shad L. Lords 2.2.0-16.sme +- Fix yum database removal (missing one) [SME: 5705] + +* Wed Jun 02 2010 Shad L. Lords 2.2.0-15.sme +- Migrate MirrorList properties to sme8 repos [SME: 5705] +- Remove BaseURL properties if migrating to sme8 repos [SME: 5949] +- Remove yum databases and repodata if migrating to sme8 repos [SME: 5998] + +* Mon May 17 2010 Jonathan Martens 2.2.0-14.sme +- Revert previous change [SME: 5962] + * Mon May 17 2010 Jonathan Martens 2.2.0-13.sme - Migrate CentOS Exclude property default values to smeserver-yum [SME: 5962] @@ -862,6 +901,13 @@ AutoReqProv: no %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 %build perl createlinks @@ -876,13 +922,6 @@ mkdir -p root/etc/yum.smerepos.d mkdir -p root/etc/e-smith/db/yum_{available,installed,updates} -YUM_REPOS=root/etc/e-smith/db/yum_repositories/ -for dir in base updates -do - mkdir -p $YUM_REPOS/defaults/$dir - echo %{centos_excludes} > $YUM_REPOS/defaults/$dir/Exclude -done - %install /bin/rm -rf $RPM_BUILD_ROOT (cd root ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT) @@ -891,6 +930,7 @@ done --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)' \