--- rpms/smeserver-yum/sme7/smeserver-yum.spec 2008/04/27 16:41:25 1.17 +++ rpms/smeserver-yum/sme7/smeserver-yum.spec 2012/08/31 20:08:13 1.43 @@ -1,80 +1,42 @@ -%if "%{?rhel}" == "5" -%define _unpackaged_files_terminate_build 0 -%endif +# $Id: smeserver-yum.spec,v 1.42 2012/03/22 22:48:36 slords Exp $ %define name smeserver-yum -Summary: YUM, an rpm updaterdefine name smeserver-yum +Summary: YUM, an rpm updater Name: %{name} -%define version 1.2.0 -%define release 54 +%define version 2.0.0 +%define release 17 Version: %{version} Release: %{release}%{?dist} License: GPL Group: SMEServer/addon Source: %{name}-%{version}.tar.gz -Patch0: smeserver-yum-1.2.0-DisplayStatus.patch -Patch1: smeserver-yum-1.2.0-ModifyUpdateDBs.patch -Patch2: smeserver-yum-1.2.0-DisplayStatus.patch2 -Patch3: smeserver-yum-1.2.0-quoting.patch -Patch4: smeserver-yum-1.2.0-reposdir.patch -Patch5: smeserver-yum-1.2.0-MirrorList.patch -Patch6: smeserver-yum-1.2.0-MirrorList.patch2 -Patch7: smeserver-yum-1.2.0-distroverpkg.patch -Patch8: smeserver-yum-1.2.0-yumplugin.patch -Patch9: smeserver-yum-1.2.0-yumplugin.patch2 -Patch10: smeserver-yum-1.2.0-yumplugin.patch3 -Patch11: smeserver-yum-1.2.0-mirrorlists.patch -Patch12: smeserver-yum-1.2.0-reconfigurepage.patch -Patch13: smeserver-yum-1.2.0-reconfigurepage.patch2 -Patch14: smeserver-yum-1.2.0-wording.patch -Patch15: smeserver-yum-1.2.0-centosrepos.patch -Patch16: smeserver-yum-1.2.0-Refresh10.patch -Patch17: smeserver-yum-1.2.0-SMEMirrorLists.patch -Patch18: smeserver-yum-1.2.0-SMEMirrorLists.patch2 -Patch19: smeserver-yum-1.2.0-includepkgs.patch -Patch20: smeserver-yum-1.2.0-includepkgs.patch2 -Patch21: smeserver-yum-1.2.0-Notestingrepo.patch -Patch22: smeserver-yum-1.2.0-httpcache.patch -Patch23: smeserver-yum-1.2.0-dupkeys.patch -Patch24: smeserver-yum-1.2.0-runit17.patch -Patch25: smeserver-yum-1.2.0-epel_key.patch -Patch26: smeserver-yum-1.2.0-restrictAvailable.patch -Patch27: smeserver-yum-1.2.0-restrictAvailable.patch2 -Patch28: smeserver-yum-1.2.0-gpgkeys.patch -Patch29: smeserver-yum-1.2.0-FixUninitializedValue.patch -Patch30: smeserver-yum-1.2.0-FixEnableGroups.patch -Patch31: smeserver-yum-1.2.0-smecontribs.patch -Patch32: smeserver-yum-1.2.0-importkeys-update.patch -Patch33: smeserver-yum-1.2.0-check4updates.patch -Patch34: smeserver-yum-1.2.0-yumlocal.patch -Patch35: smeserver-yum-1.2.0-removeSMEBaseURLs.patch -Patch36: smeserver-yum-1.2.0-removeBaseURLs.patch -Patch37: smeserver-yum-1.2.0-uptodate.patch -Patch38: smeserver-yum-1.2.0-check4updates.patch2 -Patch39: smeserver-yum-1.2.0-rmFormTitle2.patch -Patch40: smeserver-yum-1.2.0-tags2general.patch -Patch41: smeserver-yum-1.2.0-cleanyum.patch -Patch42: smeserver-yum-1.2.0-deletedungog.patch -Patch43: smeserver-yum-1.2.0-add2general.patch +Patch1: smeserver-yum-2.0.0-extras.patch +Patch2: smeserver-yum-2.0.0-repodir.patch +Patch3: smeserver-yum-2.0.0-buffer.patch +Patch4: smeserver-yum-2.0.0-yumremove.patch +Patch5: smeserver-yum-2.0.0-protected.patch +Patch6: smeserver-yum-2.0.0-mirrorlist.patch +Patch7: smeserver-yum-2.0.0-updatetoggle.patch +Patch8: smeserver-yum-2.0.0-nosemi.patch +Patch9: smeserver-yum-2.0.0-unsavedchanges.patch +Patch10: smeserver-yum-2.0.0-fixremove.patch +Patch11: smeserver-yum-2.0.0-add-wait-timer.patch +Patch12: smeserver-yum-2.0.0-CentOS.patch +Patch13: smeserver-yum-2.0.0-mirrorlist2.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch -Requires: e-smith-formmagick >= 1.4.0-9 +Requires: e-smith-formmagick >= 1.4.0-12 +Requires: e-smith-base Requires: perl(CGI::FormMagick) >= 0.91-26 Requires: rpm-python >= 4.0.4-7x.18 Requires: yum >= 1.0.3-1_73 Provides: yumconf Obsoletes: check4updates Provides: check4updates -%if "%{?rhel}" == "5" -Obsoletes: rpmdb-CentOS -Obsoletes: yum-plugin-fastestmirror -Obsoletes: yum-plugin-installonlyn -Requires: yum-fastestmirror -%else Requires: rpmdb-CentOS Requires: yum-plugin-fastestmirror Requires: yum-plugin-installonlyn -%endif +Requires: mailx BuildRequires: e-smith-devtools >= 1.13.1-03 Conflicts: centos-yumconf AutoReqProv: no @@ -82,8 +44,74 @@ AutoReqProv: no %name is an implementation of http://linux.duke.edu/projects/yum on SME Server %changelog +* Fri Aug 31 2012 Shad L. Lords 2.0.0-17.sme +- Point mirrorlist to mirrorlist.contribs.org [SME: 7086] + +* Thu Mar 22 2012 Shad L. Lords 2.0.0-16.sme +- Fix removal of default MirrorList files (missed in last patch) [SME: 6873] + +* Thu Mar 22 2012 Shad L. Lords 2.0.0-15.sme +- Point BaseURL to vault only if we find MirrorList property [SME: 6873] +- Don't adjust visible or enabled on CentOS repos + +* Wed Mar 21 2012 Ian Wells 2.0.0-14.sme +- Enable CentOS repos using BaseURL pointing to the vault [SME: 6873] + +* Wed Mar 14 2012 Ian Wells 2.0.0-13.sme +- Disable CentOS base and updates repos [SME: 6868] + +* Tue Mar 1 2011 Jonathan Martens 2.0.0-12.sme +- Add random wait timer for check4updates script to distribute load on ibiblio [SME: 6489] + +* Thu Nov 5 2009 Shad L. Lords 2.0.0-11.sme +- only unlink file if we created it [SME: 4169] + +* Tue Sep 15 2009 Shad L. Lords 2.0.0-10.sme +- set unsaved changes in yum event [SME: 2081] +- move yum warming to sme yum plugin [SME: 5472] +- ensure file exists before unlinking [SME: 4169] +- remove semicolons from yum plugin + +* Tue Sep 15 2009 Shad L. Lords 2.0.0-9.sme +- Add frequency of updates toggle [SME: 5473] +- remove stray file + +* Sat May 30 2009 Shad L. Lords 2.0.0-8.sme +- Add /etc/yum.smerepos.d to package [SME: 5306] + +* Mon May 18 2009 Shad L. Lords 2.0.0-7.sme +- Change SME mirrorlists to point to ibiblio [SME: 5242] + +* Fri Apr 10 2009 Jonathan Martens 2.0.0-6.sme +- Require mailx [SME: 5131] + +* Mon Nov 24 2008 Shad L. Lords 2.0.0-5.sme +- Add yum-protect-packages support to prevent removal of + needed pacakges [SME: 3133] + +* Tue Oct 28 2008 Shad L. Lords 2.0.0-4.sme +- Make yum update unbuffered for web interface [SME: 4726] + +* Mon Oct 13 2008 Shad L. Lords 2.0.0-3.sme +- Move repos to repodir to fix yum bug [SME: 3676] + +* Sun Oct 12 2008 Shad L. Lords 2.0.0-2.sme +- Fix name for smeextras [SME: 4585] + +* Tue Oct 7 2008 Shad L. Lords 2.0.0-1.sme +- Roll new stream to separate sme7/sme8 trees [SME: 4633] + +* Fri Sep 19 2008 Shad L. Lords 1.2.0-57 +- Add smeextras repo database and information [SME: 4585] + +* Sun Aug 10 2008 Shad L. Lords 1.2.0-56 +- Remove links to crontab in bootstrap-console-save [SME: 4494] + +* Sat Jul 5 2008 Jonathan Martens 1.2.0-55 +- Add common tags to e-smith-formmagick's general [SME: 4279] + * Sun Apr 27 2008 Jonathan Martens 1.2.0-54 -- Add common tags to e-smith-formmagick's general +- Add common tags to e-smith-formmagick's general [SME: 4290] * Mon Mar 31 2008 Shad L. Lords 1.2.0-53 - Include installonlyn plugin to manage kernels [SME: 2101] @@ -827,10 +855,8 @@ AutoReqProv: no %prep %setup -%patch0 -p1 %patch1 -p1 %patch2 -p1 -rm root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm.orig %patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -842,36 +868,6 @@ rm root/usr/lib/perl5/site_perl/esmith/F %patch11 -p1 %patch12 -p1 %patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 %build perl createlinks @@ -882,23 +878,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} -mkdir -p root/etc/yum.repos.d/ -for repo in smeaddons smedev smeos smetest smeupdates smeupdates-testing smecontribs -do - cat > root/etc/yum.repos.d/mirrors-$repo <