--- rpms/smeserver-yum/sme8/smeserver-yum.spec 2008/01/11 18:54:53 1.10 +++ rpms/smeserver-yum/sme8/smeserver-yum.spec 2008/02/10 12:17:52 1.12 @@ -4,7 +4,7 @@ Summary: YUM, an rpm updater %define name smeserver-yum Name: %{name} %define version 1.2.0 -%define release 47 +%define release 49 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -49,6 +49,7 @@ 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-formmagick @@ -56,10 +57,10 @@ Requires: perl(CGI::FormMagick) >= 0.91- 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 Requires: yum-fastestmirror %else @@ -73,6 +74,12 @@ AutoReqProv: no %name is an implementation of http://linux.duke.edu/projects/yum on SME Server %changelog +* 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 +844,7 @@ rm root/usr/lib/perl5/site_perl/esmith/F %patch36 -p1 %patch37 -p1 %patch38 -p1 +%patch39 -p1 %build perl createlinks