--- rpms/smeserver-yum/sme7/smeserver-yum.spec 2007/07/14 20:55:47 1.2 +++ rpms/smeserver-yum/sme7/smeserver-yum.spec 2008/07/04 21:59:40 1.19 @@ -1,10 +1,12 @@ -%define _unpackaged_files_terminate_build 0 +%if "%{?rhel}" == "5" +%define _unpackaged_files_terminate_build 0 +%endif -Summary: YUM, an rpm updater %define name smeserver-yum +Summary: YUM, an rpm updaterdefine name smeserver-yum Name: %{name} %define version 1.2.0 -%define release 37 +%define release 55 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -39,20 +41,39 @@ Patch25: smeserver-yum-1.2.0-epel_key.pa 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch -Requires: e-smith-formmagick +Requires: e-smith-formmagick >= 1.4.0-12 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 BuildRequires: e-smith-devtools >= 1.13.1-03 Conflicts: centos-yumconf @@ -61,7 +82,62 @@ AutoReqProv: no %name is an implementation of http://linux.duke.edu/projects/yum on SME Server %changelog -* Sat Jul 14 2007 Stephen Noble 1.2.0-37 +* Fri Jul 4 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] + +* Fri Nov 30 2007 Gavin Weight 1.2.0-39 +- Change EnableGroups value to no/yes instead of 0/1. [SME: 3607] + +* Fri Nov 30 2007 Gavin Weight 1.2.0-38 +- Fix use of uninitialized value in migrate 10GPG_and_Groups. [SME: 2491] + +* Sat Jul 14 2007 Shad L. Lords 1.2.0-37 - Add GPG keys for CentOS 5 [SME: 3160] * Sun Jun 10 2007 Stephen Noble 1.2.0-36 @@ -785,6 +861,21 @@ rm root/usr/lib/perl5/site_perl/esmith/F %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 @@ -799,11 +890,12 @@ 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 +for repo in smeaddons smedev smeos smetest smeupdates smeupdates-testing smecontribs do cat > root/etc/yum.repos.d/mirrors-$repo <