--- rpms/smeserver-yum/sme7/smeserver-yum.spec 2007/12/11 23:40:36 1.5 +++ rpms/smeserver-yum/sme7/smeserver-yum.spec 2008/10/13 14:58:50 1.28 @@ -1,61 +1,30 @@ -%define _unpackaged_files_terminate_build 0 +# $Id: smeserver-yum.spec,v 1.27 2008/10/13 03:13:32 dungog Exp $ -Summary: YUM, an rpm updater %define name smeserver-yum +Summary: YUM, an rpm updater Name: %{name} -%define version 1.2.0 -%define release 40 +%define version 2.0.0 +%define release 3 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 +Patch1: smeserver-yum-2.0.0-extras.patch +Patch2: smeserver-yum-2.0.0-repodir.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch -Requires: e-smith-formmagick +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 -%if "%{?rhel}" == "5" -Obsoletes: rpmdb-CentOS -Obsoletes: yum-plugin-fastestmirror -Requires: yum-fastestmirror -%else +Obsoletes: check4updates +Provides: check4updates Requires: rpmdb-CentOS Requires: yum-plugin-fastestmirror -%endif +Requires: yum-plugin-installonlyn BuildRequires: e-smith-devtools >= 1.13.1-03 Conflicts: centos-yumconf AutoReqProv: no @@ -63,6 +32,66 @@ AutoReqProv: no %name is an implementation of http://linux.duke.edu/projects/yum on SME Server %changelog +* 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.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 [SME: 4290] + +* Mon Mar 31 2008 Shad L. Lords 1.2.0-53 +- Include installonlyn plugin to manage kernels [SME: 2101] + +* Mon Mar 31 2008 Stephen Noble 1.2.0-52 +- Delete dungog repository, reworked [SME: 4097] + +* Fri Mar 14 2008 Shad L. Lords 1.2.0-51 +- Clean up "rpm -qa" warnings in yum wrapper [SME: 4052] + +* Wed Feb 13 2008 Stephen Noble 1.2.0-50 +- Remove tags now in general [SME: 3914] + +* Sun Feb 10 2008 Stephen Noble 1.2.0-49 +- Remove duplicate entries [SME: 3889] + +* Fri Jan 11 2008 Shad L. Lords 1.2.0-48 +- Put check4updates obsoletes & provides in the right place [SME: 3250] + +* Fri Jan 11 2008 Shad L. Lords 1.2.0-47 +- Add check4update script, make cronjob run same as scheduled dirs [SME: 3250] + +* Wed Jan 09 2008 Stephen Noble 1.2.0-46 +- Add server is up to date message on panel [SME: 2512] + +* Mon Jan 7 2008 Stephen Noble 1.2.0-45 +- remove BaseURL property for repos with mirrorlists [SME: 3275] + +* Mon Jan 7 2008 Stephen Noble 1.2.0-44 +- safesymlink yum into local [SME: 3238] + +* Mon Jan 7 2008 Stephen Noble 1.2.0-43 +- add check4updates cronjob, obsolete check4updates rpm [SME: 3250] + +* Mon Jan 7 2008 Stephen Noble 1.2.0-42 +- yum-import-keys action to yum-update event [SME: 3196] + +* Mon Dec 24 2007 Stephen Noble 1.2.0-41 +- add smecontribs repo [SME: 3551] + * Tue Dec 11 2007 Gavin Weight 1.2.0-40 - Remove bad mirror and add two new mirrors. [SME: 3636] @@ -766,38 +795,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 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%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 %build perl createlinks @@ -811,16 +810,18 @@ mkdir -p root/var/log/yum 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 +ver=7 + +mkdir -p root/etc/yum.repos.d/ root/etc/yum.smerepos.d/ +for repo in smeaddons smecontribs smedev smeextras smeos smetest smeupdates smeupdates-testing do cat > root/etc/yum.repos.d/mirrors-$repo <