-diff -ur yum-3.2.27.orig/cli.py yum-3.2.27/cli.py
---- yum-3.2.27.orig/cli.py 2010-03-03 20:09:36.000000000 -0500
-+++ yum-3.2.27/cli.py 2010-03-23 16:24:21.313420546 -0400
-@@ -1278,13 +1278,15 @@
+diff -ur yum-3.2.28.orig/cli.py yum-3.2.28/cli.py
+--- yum-3.2.28.orig/cli.py 2010-07-07 14:46:08.000000000 -0400
++++ yum-3.2.28/cli.py 2010-10-18 14:05:51.919642477 -0400
+@@ -1409,13 +1409,15 @@
def getRoot(self,opts):
# If the conf file is inside the installroot - use that.
# otherwise look for it in the normal root
root=opts.installroot
else:
root = '/'
-@@ -1325,7 +1327,7 @@
+@@ -1456,7 +1458,7 @@
action="store_true",
help=_("run entirely from system cache, don't update cache"))
group.add_option("-c", "--config", dest="conffile",
help=_("config file location"), metavar='[config file]')
group.add_option("-R", "--randomwait", dest="sleeptime", type='int',
default=None,
-diff -ur yum-3.2.27.orig/yum/config.py yum-3.2.27/yum/config.py
---- yum-3.2.27.orig/yum/config.py 2010-03-23 16:13:48.022914313 -0400
-+++ yum-3.2.27/yum/config.py 2010-03-23 16:26:57.116806313 -0400
-@@ -603,7 +603,27 @@
- syslog_ident = Option()
- syslog_facility = Option('LOG_DAEMON')
+diff -ur yum-3.2.28.orig/yum/config.py yum-3.2.28/yum/config.py
+--- yum-3.2.28.orig/yum/config.py 2010-10-18 13:59:40.165820228 -0400
++++ yum-3.2.28/yum/config.py 2010-10-18 14:05:51.919642477 -0400
+@@ -623,7 +623,27 @@
+ syslog_facility = Option('LOG_USER')
+ syslog_device = Option('/dev/log')
persistdir = Option('/var/lib/yum')
-
+
class YumConf(StartupConf):
'''
Configuration option definitions for yum.conf\'s [main] section.
-@@ -617,6 +637,7 @@
+@@ -637,6 +657,7 @@
keepcache = BoolOption(True)
logfile = Option('/var/log/yum.log')
reposdir = ListOption(['/etc/yum/repos.d', '/etc/yum.repos.d'])
commands = ListOption()
-@@ -859,9 +880,9 @@
- yumconf.populate(startupconf._parser, 'main')
-
+@@ -888,7 +909,7 @@
# Apply the installroot to directory options
-- for option in ('cachedir', 'logfile', 'persistdir'):
-+ for option in ('cachedir', 'logfile', 'lockfile', 'persistdir'):
+ def _apply_installroot(yumconf, option):
path = getattr(yumconf, option)
- ir_path = yumconf.installroot + path
+ ir_path = yumconf.getRootedPath(path)
ir_path = ir_path.replace('//', '/') # os.path.normpath won't fix this and
# it annoys me
ir_path = varReplace(ir_path, yumvars)
-diff -ur yum-3.2.27.orig/yum/__init__.py yum-3.2.27/yum/__init__.py
---- yum-3.2.27.orig/yum/__init__.py 2010-03-18 12:28:57.000000000 -0400
-+++ yum-3.2.27/yum/__init__.py 2010-03-23 16:27:43.617623958 -0400
-@@ -398,8 +398,7 @@
+@@ -912,7 +933,7 @@
+ yumvars[fsvar] = val
+
+ # These can use the above FS yumvars
+- for option in ('cachedir', 'logfile', 'persistdir'):
++ for option in ('cachedir', 'logfile', 'lockfile', 'persistdir'):
+ _apply_installroot(yumconf, option)
+
+ # Add in some extra attributes which aren't actually configuration values
+diff -ur yum-3.2.28.orig/yum/__init__.py yum-3.2.28/yum/__init__.py
+--- yum-3.2.28.orig/yum/__init__.py 2010-10-18 13:59:40.173818661 -0400
++++ yum-3.2.28/yum/__init__.py 2010-10-18 14:05:51.920642052 -0400
+@@ -429,8 +429,7 @@
# this check makes sure that our dirs exist properly.
# if they aren't in the installroot then don't prepend the installroot path
# if we don't do this then anaconda likes to not work.
if os.path.isdir(reposdir):
for repofn in sorted(glob.glob('%s/*.repo' % reposdir)):
-@@ -1377,10 +1376,8 @@
+@@ -1585,10 +1584,8 @@
if self.conf.uid != 0:
return
+
mypid=str(os.getpid())
while not self._lock(lockfile, mypid, 0644):
- fd = open(lockfile, 'r')
+ try:
%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%global release 4chroot
+%global release 5chroot
Summary: RPM installer/updater
Name: yum
-Version: 3.2.27
+Version: 3.2.28
Release: %release
License: GPLv2+
Group: System Environment/Base
Source2: yum-updatesd.conf.fedora
Patch0: installonlyn-enable.patch
Patch1: yum-mirror-priority.patch
-Patch2: yum-manpage-files.patch
Patch3: yum-multilib-policy-best.patch
Patch4: no-more-exactarchlist.patch
Patch5: geode-arch.patch
Patch6: yum-HEAD.patch
-Patch7: yum-do-not-overwrite-keys.patch
-Patch8: reget-metadata-size-fix.patch
-Patch10: yum-3.2.27-chroot.patch
+Patch7: yum-PK-auto-close-fix.patch
+
+Patch10: yum-3.2.28-chroot.patch
+
+Patch20: yum-manpage-files.patch
URL: http://yum.baseurl.org/
BuildArch: noarch
Requires: python-urlgrabber >= 3.9.0-8
Requires: yum-metadata-parser >= 1.1.0
Requires: pygpgme
-Obsoletes: yum-skip-broken, yum-basearchonly
+Obsoletes: yum-skip-broken <= 1.1.18
+Obsoletes: yum-basearchonly <= 1.1.9
+Obsoletes: yum-plugin-basearchonly <= 1.1.24
+Obsoletes: yum-allow-downgrade < 1.1.20-0
+Obsoletes: yum-plugin-allow-downgrade < 1.1.22-0
+Obsoletes: yum-plugin-protect-packages < 1.1.27-0
+Obsoletes: yum-plugin-download-order <= 0.2-2
+Provides: yum-skip-broken
+Provides: yum-basearchonly
+Provides: yum-allow-downgrade
+Provides: yum-plugin-allow-downgrade
+Provides: yum-protect-packages
+Provides: yum-plugin-protect-packages
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
Yum is a utility that can check for and automatically download and
install updated RPM packages. Dependencies are obtained and downloaded
-automatically prompting the user as necessary.
+automatically, prompting the user for permission as necessary.
%package updatesd
Summary: Update notification daemon
%prep
%setup -q
%patch1 -p0
-#%%%patch2 -p0
%patch3 -p0
%patch4 -p0
%patch5 -p1
-#%%%%patch6 -p1
+%patch6 -p1
%patch7 -p1
-%patch8 -p1
%patch10 -p1
+%patch20 -p1
+
%build
make
rm -f $RPM_BUILD_ROOT/%{_mandir}/man*/yum-updatesd*
rm -f $RPM_BUILD_ROOT/%{_datadir}/yum-cli/yumupd.py*
+# Ghost files:
+mkdir -p $RPM_BUILD_ROOT/var/lib/yum/history
+mkdir -p $RPM_BUILD_ROOT/var/lib/yum/plugins
+mkdir -p $RPM_BUILD_ROOT/var/lib/yum/yumdb
+touch $RPM_BUILD_ROOT/var/lib/yum/uuid
+
%find_lang %name
%clean
%config(noreplace) %{_sysconfdir}/yum.conf
%dir %{_sysconfdir}/yum
%config(noreplace) %{_sysconfdir}/yum/version-groups.conf
+%dir %{_sysconfdir}/yum/protected.d
%dir %{_sysconfdir}/yum.repos.d
+%dir %{_sysconfdir}/yum/vars
%config(noreplace) %{_sysconfdir}/logrotate.d/yum
%{_sysconfdir}/bash_completion.d
%dir %{_datadir}/yum-cli
%{python_sitelib}/rpmUtils
%dir /var/cache/yum
%dir /var/lib/yum
+%ghost /var/lib/yum/uuid
+%ghost /var/lib/yum/history
+%ghost /var/lib/yum/plugins
+%ghost /var/lib/yum/yumdb
%{_mandir}/man*/yum.*
%{_mandir}/man*/yum-shell*
# plugin stuff
%dir /usr/lib/yum-plugins
%changelog
+* Tue Sep 14 2010 James Antill <james at fedoraproject.org> - 3.2.28-4
+- Fix auto-close bug with GPG key installs.
+- Resolves: bug#622179
+- Fix obsoletes on basearchonly.
+- Resolves: bug#629138
+
+* Fri Aug 27 2010 Seth Vidal <skvidal at fedoraproject.org>
+- obsoleted yum-plugin-download-order
+
+* Thu Aug 12 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.28-3
+- latest head
+- fix gpg key import
+- more unicode fixes
+- output slightly more clear depsovling error msgs
+- sync up spec file with f13,f14
+
+* Mon Aug 9 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.28-2
+- fixes sqlite historydb conversion bug
+- patches up some unicide issues
+
+
+* Fri Jul 30 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.28-1
+- 3.2.28
+
* Thu Apr 8 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.27-3
- fix regets on metadata when we run into an old file that's larger
than the new one