packages: yum/yum-chroot.patch, yum/yum.spec - updated to 3.2.25, corrected...
glen
glen at pld-linux.org
Wed Nov 18 13:17:19 CET 2009
Author: glen Date: Wed Nov 18 12:17:19 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 3.2.25, corrected runtime arch detection for th
---- Files affected:
packages/yum:
yum-chroot.patch (1.12 -> 1.13) , yum.spec (1.77 -> 1.78)
---- Diffs:
================================================================
Index: packages/yum/yum-chroot.patch
diff -u packages/yum/yum-chroot.patch:1.12 packages/yum/yum-chroot.patch:1.13
--- packages/yum/yum-chroot.patch:1.12 Thu Aug 6 00:43:23 2009
+++ packages/yum/yum-chroot.patch Wed Nov 18 13:17:14 2009
@@ -1,4 +1,3 @@
-diff -urN yum-3.2.23.orig/cli.py yum-3.2.23/cli.py
--- yum-3.2.23.orig/cli.py 2009-05-14 18:41:21.000000000 +0200
+++ yum-3.2.23/cli.py 2009-08-06 00:34:04.380934519 +0200
@@ -1243,13 +1243,14 @@
@@ -31,13 +30,12 @@
help=_("config file location"), metavar=' [config file]')
group.add_option("-R", dest="sleeptime", type='int', default=None,
help=_("maximum command wait time"), metavar=' [minutes]')
-diff -urN yum-3.2.23.orig/docs/yum.conf.5 yum-3.2.23/docs/yum.conf.5
---- yum-3.2.23.orig/docs/yum.conf.5 2009-04-20 22:00:30.000000000 +0200
-+++ yum-3.2.23/docs/yum.conf.5 2009-08-06 00:33:12.628012450 +0200
-@@ -23,8 +23,10 @@
- following options:
+--- yum-3.2.25/docs/yum.conf.5~ 2009-10-12 16:58:13.000000000 +0300
++++ yum-3.2.25/docs/yum.conf.5 2009-11-18 13:34:13.578656364 +0200
+@@ -24,8 +24,10 @@
- .IP \fBcachedir\fR
+ .IP
+ \fBcachedir\fR
-Directory where yum should store its cache and db files. The default is
-`/var/cache/yum'.
+Directory where yum should store its cache and db files. The default
@@ -45,9 +43,9 @@
+are used, some magic will be applied to determine the real path in
+combination with `--installroot'.
- .IP \fBpersistdir\fR
- Directory where yum should store information that should persist over multiple
-@@ -44,6 +46,10 @@
+ .IP
+ \fBpersistdir\fR
+@@ -48,6 +50,10 @@
repositories defined in /etc/yum/yum.conf to form the complete set of
repositories that yum will use.
@@ -55,24 +53,23 @@
+will be applied to determine the real path in combination with
+`--installroot'.
+
- .IP \fBdebuglevel\fR
+ .IP
+ \fBdebuglevel\fR
Debug message output level. Practical range is 0\-10. Default is `2'.
+@@ -58,7 +64,10 @@
-@@ -51,7 +57,10 @@
- Error message output level. Practical range is 0\-10. Default is `2'.
-
- .IP \fBlogfile\fR
+ .IP
+ \fBlogfile\fR
-Full directory and file name for where yum should write its log file.
+Full directory and file name for where yum should write its log
+file. Unless the prefixes `hostfs://' or `chrootfs://' are used,
+some magic will be applied to determine the real path in combination
+with `--installroot'.
- .IP \fBgpgcheck\fR
- Either `1' or `0'. This tells yum whether or not it should perform a GPG
-diff -urN yum-3.2.23.orig/yum/config.py yum-3.2.23/yum/config.py
---- yum-3.2.23.orig/yum/config.py 2009-05-18 22:24:19.000000000 +0200
-+++ yum-3.2.23/yum/config.py 2009-08-06 00:37:29.804480348 +0200
+ .IP
+ \fBgpgcheck\fR
+--- yum-3.2.25/yum/config.py~ 2009-11-18 13:34:24.000000000 +0200
++++ yum-3.2.25/yum/config.py 2009-11-18 13:34:59.641984903 +0200
@@ -588,6 +588,26 @@
syslog_ident = Option()
syslog_facility = Option('LOG_DAEMON')
@@ -108,7 +105,7 @@
reposdir = ListOption(['/etc/yum/repos.d', '/etc/yum.repos.d'])
commands = ListOption()
-@@ -798,12 +819,12 @@
+@@ -850,13 +850,13 @@
yumconf.populate(startupconf._parser, 'main')
# Apply the installroot to directory options
@@ -118,12 +115,12 @@
ir_path = yumconf.installroot + path
ir_path = ir_path.replace('//', '/') # os.path.normpath won't fix this and
# it annoys me
+ ir_path = varReplace(ir_path, yumvars)
- setattr(yumconf, option, ir_path)
+ setattr(yumconf, option, yumconf.getRootedPath(path))
# Add in some extra attributes which aren't actually configuration values
yumconf.yumvar = yumvars
-diff -urN yum-3.2.23.orig/yum/__init__.py yum-3.2.23/yum/__init__.py
--- yum-3.2.23.orig/yum/__init__.py 2009-05-19 21:53:48.000000000 +0200
+++ yum-3.2.23/yum/__init__.py 2009-08-06 00:36:19.980910237 +0200
@@ -341,8 +341,7 @@
================================================================
Index: packages/yum/yum.spec
diff -u packages/yum/yum.spec:1.77 packages/yum/yum.spec:1.78
--- packages/yum/yum.spec:1.77 Thu Aug 6 01:33:38 2009
+++ packages/yum/yum.spec Wed Nov 18 13:17:14 2009
@@ -1,13 +1,15 @@
# $Revision$, $Date$
+# TODO
+# - PLDize (or drop) /etc/yum/version-groups.conf
Summary: RPM installer/updater
Summary(pl.UTF-8): Narzędzie do instalowania/uaktualniania pakietów RPM
Name: yum
-Version: 3.2.23
-Release: 3
+Version: 3.2.25
+Release: 1
License: GPL
Group: Applications/System
Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
-# Source0-md5: 9bb6a69dbb1a5a4cb4d5dd8036cffac4
+# Source0-md5: 7fdea025aa8fb88376a283959d5d2d0f
Source1: %{name}-pld-source.repo
Source2: %{name}-pld-ti-source.repo
Source3: %{name}-updatesd.init
@@ -16,6 +18,7 @@
# from util-vserver-*/contrib/
Patch2: %{name}-chroot.patch
Patch3: %{name}-pld.patch
+Patch4: %{name}-amd64.patch
URL: http://yum.baseurl.org/
BuildRequires: gettext-devel
BuildRequires: intltool
@@ -66,6 +69,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%{__make}
@@ -78,6 +82,7 @@
DESTDIR=$RPM_BUILD_ROOT \
PYLIBDIR=%{py_sitescriptdir}/..
+%if "%{pld_release}" == "ti"
%ifarch i486 i686 ppc sparc alpha athlon
%define _ftp_arch %{_target_cpu}
%endif
@@ -85,11 +90,7 @@
%define _ftp_arch x86_64
%endif
%ifarch i586
-%if "%{pld_release}" == "ti"
%define _ftp_arch i586
-%else
-%define _ftp_arch i486
-%endif
%endif
%ifarch pentium2 pentium3 pentium4
%define _ftp_arch i686
@@ -97,16 +98,14 @@
%ifarch sparcv9 sparc64
%define _ftp_arch sparc
%endif
-
-%if "%{pld_release}" == "ti"
sed -e '
s|%%ARCH%%|%{_ftp_arch}|g
' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/yum/repos.d/pld.repo
%else
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/yum/repos.d/pld.repo
+install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/yum/repos.d/pld.repo
%endif
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/yum-updatesd
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/yum-updatesd
+install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/yum-updatesd
+install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/yum-updatesd
%py_postclean
@@ -148,6 +147,7 @@
%defattr(644,root,root,755)
%doc README AUTHORS TODO INSTALL ChangeLog
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/yum/yum.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/yum/version-groups.conf
%dir %{_sysconfdir}/yum
%dir %{_sysconfdir}/yum/repos.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/yum/repos.d/*.repo
@@ -178,6 +178,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.78 2009/11/18 12:17:14 glen
+- updated to 3.2.25, corrected runtime arch detection for th
+
Revision 1.77 2009/08/05 23:33:38 hawk
- revert small upstream breakage, they assume some symbols are in each and
every version of rpm which seems not true for our rpm.spec:rpm-4_5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/yum/yum-chroot.patch?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/yum/yum.spec?r1=1.77&r2=1.78&f=u
More information about the pld-cvs-commit
mailing list