--- rpms/smeserver-yum/sme7/smeserver-yum.spec 2008/01/11 18:54:53 1.10 +++ rpms/smeserver-yum/sme7/smeserver-yum.spec 2008/10/07 14:06:41 1.24 @@ -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 47 +%define release 58 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -49,22 +51,32 @@ Patch35: smeserver-yum-1.2.0-removeSMEBa 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 +Patch44: smeserver-yum-1.2.0-crontab.patch +Patch45: smeserver-yum-1.2.0-smeextras.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: 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 @@ -73,6 +85,39 @@ AutoReqProv: no %name is an implementation of http://linux.duke.edu/projects/yum on SME Server %changelog +* Tue Oct 7 2008 Shad L. Lords 1.2.0-58 +- Fix mirrorlist for sme8 [SME: 4508] + +* 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] @@ -837,6 +882,13 @@ rm root/usr/lib/perl5/site_perl/esmith/F %patch36 -p1 %patch37 -p1 %patch38 -p1 +%patch39 -p1 +%patch40 -p1 +%patch41 -p1 +%patch42 -p1 +%patch43 -p1 +%patch44 -p1 +%patch45 -p1 %build perl createlinks @@ -850,16 +902,23 @@ mkdir -p root/var/log/yum mkdir -p root/etc/e-smith/db/yum_{available,installed,updates} +%if "%{?rhel}" == "5" +# TODO: Remove testing when released +ver=testing/8 +%else +ver=7 +%endif + mkdir -p root/etc/yum.repos.d/ -for repo in smeaddons smedev smeos smetest smeupdates smeupdates-testing smecontribs +for repo in smeaddons smecontribs smedev smeextras smeos smetest smeupdates smeupdates-testing do cat > root/etc/yum.repos.d/mirrors-$repo <