--- rpms/smeserver-yum/sme9/smeserver-yum.spec	2013/01/31 18:15:34	1.1
+++ rpms/smeserver-yum/sme9/smeserver-yum.spec	2014/11/19 17:22:34	1.10
@@ -1,20 +1,25 @@
-# $Id: smeserver-yum.spec,v 1.50 2012/08/31 20:09:16 slords Exp $
+# $Id: smeserver-yum.spec,v 1.9 2014/06/30 19:31:52 vip-ire Exp $
 
 %define name smeserver-yum
 Summary: YUM, an rpm updater
 Name: %{name}
 %define version 2.4.0
-%define release 1
+%define release 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: SMEServer/addon
 Source: %{name}-%{version}.tar.xz
+Patch1: smeserver-yum-2.4.0-addons_fasttrack.patch
+Patch2: smeserver-yum-2.4.0-updatekeys.patch
+Patch3: smeserver-yum-2.4.0-SoftwareUpdate.patch
+Patch4: smeserver-yum-2.4.0-Check4Updates.patch
+Patch5: smeserver-yum-2.4.0-protected_packages.patch
+Patch6: smeserver-yum-2.4.0.check4updates_to_smecontribs.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-formmagick >= 1.4.0-12
 Requires: e-smith-base
-Requires: yum-protect-packages
 Requires: perl(CGI::FormMagick) >= 0.91-26
 Requires: rpm-python >= 4.0.4-7x.18
 Requires: yum >= 1.0.3-1_73 
@@ -24,6 +29,7 @@ Provides: check4updates
 Obsoletes: rpmdb-CentOS
 Requires: yum-plugin-fastestmirror
 Obsoletes: yum-plugin-installonlyn
+Obsoletes: yum-protect-packages <= 1.1.16
 Requires: mailx
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Conflicts: centos-yumconf
@@ -32,6 +38,30 @@ AutoReqProv: no
 %name is an implementation of http://linux.duke.edu/projects/yum on SME Server
 
 %changelog
+* Wed Nov 19 2014 Stephane de Labrusse <stephdl@de-labrusse.fr> 2.4.0-9.sme
+- Added a check-update for the smecontribs repository
+
+* Mon Jun 30 2014 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-8.sme
+- Move protected package list to the correct location [SME: 8476]
+
+* Fri Mar 22 2013 Ian Wells <esmith@wellsi.com> 2.4.0-7.sme
+- Change order of mail options in check4updates [SME: 7504]
+
+* Sun Mar 17 2013 Ian Wells <esmith@wellsi.com> 2.4.0-6.sme
+- Change wording of Software Update button [SME: 7499]
+
+* Wed Mar 6 2013 Shad L. Lords <slords@mail.com> 2.4.0-5.sme
+- Obsolete el5 yum-protect-packages, provided by yum [SME: 7273]
+
+* Wed Mar 6 2013 Shad L. Lords <slords@mail.com> 2.4.0-4.sme
+- Update GPG keys for sme9 [SME: 7465]
+
+* Wed Feb 27 2013 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-3.sme
+- Add fasttrack and remove addons repo [SME: 7385]
+
+* Tue Feb 5 2013 Shad L. Lords <slords@mail.com> 2.4.0-2.sme
+- Add back in missing parts from new stream [SME: 7305]
+
 * Thu Jan 31 2013 Shad L. Lords <slords@mail.com> 2.4.0-1.sme
 - Roll new stream for sme9
 
@@ -859,9 +889,17 @@ AutoReqProv: no
 
 %prep
 %setup
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks
+ln -s /var/service/yum root/service/yum
+mkdir -p root/etc/yum.smerepos.d
 
 %install
 /bin/rm -rf $RPM_BUILD_ROOT
@@ -871,6 +909,7 @@ perl createlinks
     --file '/sbin/e-smith/yum_update_dbs' 'attr(0700,root,root)' \
     --file '/sbin/e-smith/yum' 'attr(0755,root,root)' \
     --file '/sbin/e-smith/check4updates' 'attr(0755,root,root)' \
+    --file '/sbin/e-smith/check4contribsupdates' 'attr(0755,root,root)' \
     --file '/etc/cron.daily/smeserver-yum' 'attr(0700,root,root)' \
     --file /var/service/yum/down 'attr(0644,root,root)' \
     --file /var/service/yum/run 'attr(0755,root,root)' \