--- rpms/smeserver-yum/sme8/smeserver-yum.spec 2008/10/13 03:12:24 1.27 +++ rpms/smeserver-yum/sme8/smeserver-yum.spec 2010/06/02 17:10:51 1.44 @@ -1,20 +1,31 @@ -# $Id: smeserver-yum.spec,v 1.26 2008/10/13 01:13:20 slords Exp $ +# $Id: smeserver-yum.spec,v 1.43 2010/06/02 16:41:28 slords Exp $ %define name smeserver-yum Summary: YUM, an rpm updater Name: %{name} %define version 2.2.0 -%define release 2 +%define release 16 Version: %{version} Release: %{release}%{?dist} License: GPL Group: SMEServer/addon Source: %{name}-%{version}.tar.gz Patch1: smeserver-yum-2.2.0-extras.patch +Patch2: smeserver-yum-2.2.0-repodir.patch +Patch3: smeserver-yum-2.2.0-buffer.patch +Patch4: smeserver-yum-2.2.0-protected.patch +Patch5: smeserver-yum-2.2.0-mirrorlist.patch +Patch6: smeserver-yum-2.2.0-updatetoggle.patch +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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-formmagick >= 1.4.0-12 Requires: e-smith-base +Requires: yum-protect-packages Requires: perl(CGI::FormMagick) >= 0.91-26 Requires: rpm-python >= 4.0.4-7x.18 Requires: yum >= 1.0.3-1_73 @@ -25,6 +36,7 @@ Obsoletes: rpmdb-CentOS Obsoletes: yum-plugin-fastestmirror Obsoletes: yum-plugin-installonlyn Requires: yum-fastestmirror +Requires: mailx BuildRequires: e-smith-devtools >= 1.13.1-03 Conflicts: centos-yumconf AutoReqProv: no @@ -32,6 +44,55 @@ AutoReqProv: no %name is an implementation of http://linux.duke.edu/projects/yum on SME Server %changelog +* Wed Jun 02 2010 Shad L. Lords 2.2.0-16.sme +- Fix yum database removal (missing one) [SME: 5707] + +* 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] + +* Thu Nov 5 2009 Shad L. Lords 2.2.0-12.sme +- only unlink file if we created it [SME: 5476] + +* Wed Oct 14 2009 Filipo Carletti 2.2.0-11.sme +- Import only keys not already imported [SME: 5507] + +* Tue Sep 15 2009 Shad L. Lords 2.2.0-10.sme +- set unsaved changes in yum event [SME: 5475] +- move yum warming to sme yum plugin [SME: 5474] +- ensure file exists before unlinking [SME: 5476] +- remove semicolons from yum plugin + +* Tue Sep 15 2009 Shad L. Lords 2.2.0-9.sme +- Add frequency of updates toggle [SME: 3764] +- remove stray file + +* Sat May 30 2009 Shad L. Lords 2.2.0-8.sme +- Add /etc/yum.smerepos.d to package [SME: 5305] + +* Mon May 18 2009 Shad L. Lords 2.2.0-7.sme +- Change SME mirrorlists to point to ibiblio [SME: 5242] + +* Fri Apr 10 2009 Jonathan Martens 2.2.0-6.sme +- Require mailx [SME: 5131] + +* Mon Nov 24 2008 Shad L. Lords 2.2.0-5.sme +- Add yum-protect-packages support to prevent removal of + needed pacakges [SME: 3133] + +* Tue Oct 28 2008 Shad L. Lords 2.2.0-4.sme +- Make yum update unbuffered for web interface [SME: 4726] + +* Mon Oct 13 2008 Shad L. Lords 2.2.0-3.sme +- Move repos to repodir to fix yum bug [SME: 3676] + * Sun Oct 12 2008 Shad L. Lords 2.2.0-2.sme - Fix name for smeextras [SME: 4585] @@ -796,6 +857,16 @@ AutoReqProv: no %prep %setup %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 %build perl createlinks @@ -806,26 +877,10 @@ mkdir -p root/var/service/yum/supervise touch root/var/service/yum/down mkdir -p root/var/service/yum/log/supervise mkdir -p root/var/log/yum +mkdir -p root/etc/yum.smerepos.d mkdir -p root/etc/e-smith/db/yum_{available,installed,updates} -# TODO: Remove testing when released -ver=testing/8 - -mkdir -p root/etc/yum.repos.d/ -for repo in smeaddons smecontribs smedev smeextras smeos smetest smeupdates smeupdates-testing -do - cat > root/etc/yum.repos.d/mirrors-$repo <