SPECS (AC-branch): yum.spec - update to from HEAD

[glen]

Author: glen                         Date: Fri Apr 25 22:37:57 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- update to from HEAD

---- Files affected:
SPECS:
   yum.spec (1.35.2.11 -> 1.35.2.12) 

---- Diffs:

================================================================
Index: SPECS/yum.spec
diff -u SPECS/yum.spec:1.35.2.11 SPECS/yum.spec:1.35.2.12
--- SPECS/yum.spec:1.35.2.11	Wed Apr  2 23:16:42 2008
+++ SPECS/yum.spec	Sat Apr 26 00:37:51 2008
@@ -2,17 +2,18 @@
 Summary:	RPM installer/updater
 Summary(pl.UTF-8):	Narzędzie do instalowania/uaktualniania pakietów RPM
 Name:		yum
-Version:	3.2.8
+Version:	3.2.12
 Release:	3
 License:	GPL
 Group:		Applications/System
 Source0:	http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
-# Source0-md5:	25362cf7c9baeb557975be8ca2534555
+# Source0-md5:	9a54cb93a0fa78f456ad4b09f1aea28b
 Source1:	%{name}-pld-source.repo
 Source2:	%{name}-updatesd.init
 Source3:	%{name}-updatesd.sysconfig
 Patch0:		%{name}-missingok.patch
 Patch1:		%{name}-obsoletes.patch
+# from util-vserver-*/contrib/
 Patch2:		%{name}-chroot.patch
 Patch3:		%{name}-amd64.patch
 URL:		http://linux.duke.edu/projects/yum/
@@ -22,6 +23,7 @@
 Requires:	python
 Requires:	python-cElementTree
 Requires:	python-libxml2
+Requires:	python-pygpgme
 Requires:	python-rpm
 Requires:	python-sqlite
 Requires:	python-urlgrabber
@@ -60,7 +62,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -81,6 +83,8 @@
 
 %py_postclean
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -107,13 +111,13 @@
 	%service -q yum-updatesd stop
 fi
 
-%triggerpostun -- %{name} < 3.2.8-2.1
+%triggerpostun -- %{name} < 3.2.12-3
 if [ -f %{_sysconfdir}/yum/repos.d/pld-source.repo.rpmsave ]; then
 	cp -f %{_sysconfdir}/yum/repos.d/pld.repo{,.rpmnew}
 	mv -f %{_sysconfdir}/yum/repos.d/{pld-source.repo.rpmsave,pld.repo}
 fi
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README AUTHORS TODO INSTALL ChangeLog
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/yum/yum.conf
@@ -147,6 +151,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35.2.12  2008-04-25 22:37:51  glen
+- update to from HEAD
+
 Revision 1.35.2.11  2008-04-02 21:16:42  glen
 - rename pld-source.repo to pld.repo; rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/yum.spec?r1=1.35.2.11&r2=1.35.2.12&f=u