Compare commits

...
Sign in to create a new pull request.

6 commits

Author SHA1 Message Date
Tim Lauridsen
83b7eb56e7 release 1.1.28-1 2010-08-03 18:17:16 +02:00
Fedora Release Engineering
8f429ec754 dist-git conversion 2010-07-29 18:32:12 +00:00
James Antill
3f43bbc7a0 - Fix repoquery in 1.1.27 2010-06-07 03:18:12 +00:00
Tim Lauridsen
9cc606d16f Release 1.1.27-1 2010-06-06 13:34:36 +00:00
Seth Vidal
e997a074e3 backport latest from rawhide 2010-05-17 14:06:52 +00:00
Jesse Keating
3694fd4bcc Initialize branch F-13 for yum-utils 2010-02-17 03:35:18 +00:00
5 changed files with 51 additions and 49 deletions

View file

View file

@ -1,21 +0,0 @@
# Makefile for source rpm: yum-utils
# $Id: Makefile,v 1.1 2005/06/11 19:27:59 skvidal Exp $
NAME := yum-utils
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

View file

@ -0,0 +1,19 @@
commit 123d241f35401386f514cee852a0ea2f174be500
Author: James Antill <james@and.org>
Date: Sun Jun 6 23:10:37 2010 -0400
Fix stupid typo in repoquery, let non-installed packages work again
diff --git a/repoquery.py b/repoquery.py
index 2992b2d..1186782 100755
--- a/repoquery.py
+++ b/repoquery.py
@@ -556,7 +556,7 @@ class YumBaseQuery(yum.YumBase):
pkg = iq
else:
if rq is None:
- rq = instPkgQuery(pkg, qf)
+ rq = repoPkgQuery(pkg, qf)
rq.pkg = pkg
rq.name = pkg.name
pkg = rq

View file

@ -1 +1 @@
cdf0b2e65a57485ec37ea09a8b1e36b9 yum-utils-1.1.26.tar.gz
beac7f26fe6f2f5f5faf81dd4adb3c69 yum-utils-1.1.28.tar.gz

View file

@ -1,6 +1,6 @@
Summary: Utilities based around the yum package manager
Name: yum-utils
Version: 1.1.26
Version: 1.1.28
Release: 1%{?dist}
License: GPLv2+
Group: Development/Tools
@ -8,16 +8,17 @@ Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz
URL: http://yum.baseurl.org/download/yum-utils/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: python >= 2.4 , yum >= 3.2.24
Requires: python >= 2.4 , yum >= 3.2.27
BuildRequires: python >= 2.4
%description
yum-utils is a collection of utilities and examples for the yum package
manager. It includes utilities by different authors that make yum easier and
more powerful to use. These tools include: debuginfo-install, package-cleanup,
repoclosure, repodiff, repo-graph, repomanage, repoquery, repo-rss, reposync,
repotrack, verifytree, yum-builddep, yum-complete-transaction, yumdownloader,
yum-debug-dump, yum-debug-restore and yum-groups-manager.
more powerful to use. These tools include: debuginfo-install,
find-repos-of-install, needs-restarting, package-cleanup, repoclosure,
repodiff, repo-graph, repomanage, repoquery, repo-rss, reposync,
repotrack, verifytree, yumdownloader, yum-builddep, yum-complete-transaction,
yum-config-manager, yum-debug-dump, yum-debug-restore and yum-groups-manager.
%package -n yum-updateonboot
Summary: Run yum update on system boot
@ -162,21 +163,6 @@ to yum and the list-security and info-security commands.
The options make it possible to limit list/upgrade of packages to specific
security relevant ones. The commands give you the security information.
%package -n yum-plugin-protect-packages
Summary: Yum plugin to prevents Yum from removing itself and other protected packages
Group: System Environment/Base
Provides: yum-protect-packages = %{version}-%{release}
Obsoletes: yum-protect-packages < 1.1.20-0
Conflicts: yum-protect-packages < 1.1.20-0
Requires: yum >= 3.0
%description -n yum-plugin-protect-packages
this plugin prevents Yum from removing itself and other protected packages.
By default, yum is the only package protected, but by extension this
automatically protects everything on which yum depends (rpm, python, glibc,
and so on).Therefore, the plugin functions well even without
compiling careful lists of all important packages.
%package -n yum-plugin-upgrade-helper
Summary: Yum plugin to help upgrades to the next distribution version
Group: System Environment/Base
@ -362,6 +348,16 @@ Requires: yum >= 3.2.22
When this plugin is installed it will automatically snapshot any
filesystem that is touched by the packages in a yum update or yum remove.
%package -n yum-plugin-ps
Summary: Yum plugin to look at processes, with respect to packages
Group: System Environment/Base
Requires: yum >= 3.2.27
%description -n yum-plugin-ps
When this plugin is installed it adds the yum command "ps", which allows you
to see which running processes are accociated with which packages (and if they
need rebooting, or have updates, etc.)
%prep
%setup -q
@ -382,7 +378,6 @@ plugins="\
refresh-updatesd \
merge-conf \
security \
protect-packages \
upgrade-helper \
aliases \
list-data \
@ -397,6 +392,7 @@ plugins="\
show-leaves \
local \
fs-snapshot \
ps \
"
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
@ -447,6 +443,7 @@ fi
%{_bindir}/verifytree
%{_bindir}/yumdownloader
%{_bindir}/yum-builddep
%{_bindir}/yum-config-manager
%{_bindir}/yum-debug-dump
%{_bindir}/yum-groups-manager
%{_bindir}/yum-debug-restore
@ -463,6 +460,7 @@ fi
%{_mandir}/man1/yum-debug-dump.1.*
%{_mandir}/man8/yum-complete-transaction.8.*
%{_mandir}/man1/yum-groups-manager.1.*
%{_mandir}/man8/yumdb.8.*
%{_mandir}/man1/yumdownloader.1.*
%files -n yum-updateonboot
@ -528,11 +526,6 @@ fi
/usr/lib/yum-plugins/security.*
%{_mandir}/man8/yum-security.8.*
%files -n yum-plugin-protect-packages
%defattr(-, root, root)
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protect-packages.conf
/usr/lib/yum-plugins/protect-packages.*
%files -n yum-plugin-upgrade-helper
%defattr(-, root, root)
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/upgrade-helper.conf
@ -618,7 +611,18 @@ fi
%{_mandir}/man1/yum-fs-snapshot.1.*
%{_mandir}/man5/yum-fs-snapshot.conf.5.*
%files -n yum-plugin-ps
%defattr(-, root, root)
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/ps.conf
/usr/lib/yum-plugins/ps.*
%changelog
* Tue Aug 3 2010 Tim Lauridsen <timlau@fedoraproject.org>
- mark as 1.1.28
* Sun Jun 6 2010 Tim Lauridsen <timlau@fedoraproject.org>
- mark as 1.1.27
* Wed Feb 10 2010 Tim Lauridsen <timlau@fedoraproject.org>
- mark as 1.1.26