From 20eac05b3541b34285be48b8f04469a3b55f15d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Sat, 20 Oct 2007 20:25:32 +0000 Subject: [PATCH 01/16] Initialize branch F-8 for yum-utils --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 9e866eb1855ec3b46cdba42a83b4a087fad84357 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Fri, 7 Dec 2007 09:12:40 +0000 Subject: [PATCH 02/16] Release 1.1.9-1 --- sources | 2 +- yum-utils.spec | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 0c90232..a87dbd5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a20b13012bf999bf392c268aac77814d yum-utils-1.1.8.tar.gz +4325e5aec2ae73e099d4ebe04238598c yum-utils-1.1.9.tar.gz diff --git a/yum-utils.spec b/yum-utils.spec index 18efd64..4f0e6f3 100644 --- a/yum-utils.spec +++ b/yum-utils.spec @@ -1,6 +1,6 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.1.8 +Version: 1.1.9 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -185,6 +185,15 @@ If you type 'yum install foo' on a x68_64 system, only 'foo-x.y.x86_46.rpm' is i If you want to install the foo-x.y.i386.rpm, you have to type 'yum install foo.i386'. The plugin only works with 'yum install'. +%package -n yum-upgrade-helper +Summary: Yum plugin to help upgrades to the next distribution version +Group: System Environment/Base +Requires: yum >= 3.0 + +%description -n yum-upgrade-helper +this plugin allows yum to erase specific packages on install/update based on an additional +metadata file in repositories. It is used to simplify distribution upgrade hangups. + %prep %setup -q @@ -197,7 +206,7 @@ make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install # Plugins to install plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module \ downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf \ - security protect-packages basearchonly" + security protect-packages basearchonly upgrade-helper" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ @@ -332,8 +341,17 @@ fi %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/basearchonly.conf /usr/lib/yum-plugins/basearchonly.* +%files -n yum-upgrade-helper +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/upgrade-helper.conf +/usr/lib/yum-plugins/upgrade-helper.* + %changelog +* Fri Dec 7 2007 Tim Lauridsen +- mark as 1.1.9 +* Fri Oct 26 2007 Seth Vidal +- add upgrade-helper plugin * Wed Oct 17 2007 Tim Lauridsen - mark as 1.1.8 * Sun Sep 30 2007 James Bowes From 8c3f76674f62b05dffdcff672c6765cbb52d4923 Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 27 Dec 2007 22:32:59 +0000 Subject: [PATCH 03/16] - Fix for yum-priorities killing pirut. - Resolves: rhbz#421961 --- yum-utils-1.1.9-prio-fix.patch | 13 +++++++++++++ yum-utils.spec | 6 ++++++ 2 files changed, 19 insertions(+) create mode 100644 yum-utils-1.1.9-prio-fix.patch diff --git a/yum-utils-1.1.9-prio-fix.patch b/yum-utils-1.1.9-prio-fix.patch new file mode 100644 index 0000000..8b12f57 --- /dev/null +++ b/yum-utils-1.1.9-prio-fix.patch @@ -0,0 +1,13 @@ +diff -rup yum-utils-1.1.9/plugins/priorities/priorities.py yum-utils-1.1.9-prio-fix/plugins/priorities/priorities.py +--- yum-utils-1.1.9/plugins/priorities/priorities.py 2007-12-07 03:59:11.000000000 -0500 ++++ yum-utils-1.1.9-prio-fix/plugins/priorities/priorities.py 2007-12-27 17:27:46.000000000 -0500 +@@ -85,7 +85,7 @@ def exclude_hook(conduit): + + # Check whether the user specified the --samearch option. + opts, commands = conduit.getCmdLine() +- if opts.samearch: ++ if opts and opts.samearch: + only_samearch = True + + cnt = 0 +Only in yum-utils-1.1.9-prio-fix/plugins/priorities: priorities.py~ diff --git a/yum-utils.spec b/yum-utils.spec index 4f0e6f3..4268b33 100644 --- a/yum-utils.spec +++ b/yum-utils.spec @@ -5,6 +5,7 @@ Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz +Patch0: yum-utils-1.1.9-prio-fix.patch URL: http://linux.duke.edu/yum/download/yum-utils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -197,6 +198,7 @@ metadata file in repositories. It is used to simplify distribution upgrade hangu %prep %setup -q +%patch0 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -348,6 +350,10 @@ fi %changelog +* Thu Dec 27 2007 James Antill +- Fix for yum-priorities killing pirut. +- Resolves: rhbz#421961 + * Fri Dec 7 2007 Tim Lauridsen - mark as 1.1.9 * Fri Oct 26 2007 Seth Vidal From 0b4261bd848c98bd818812238303c1b5b6198bfb Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 27 Dec 2007 22:36:18 +0000 Subject: [PATCH 04/16] - Fix for yum-priorities killing pirut. - Resolves: rhbz#421961 --- yum-utils.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yum-utils.spec b/yum-utils.spec index 4268b33..89bd10a 100644 --- a/yum-utils.spec +++ b/yum-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 1.1.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -350,7 +350,7 @@ fi %changelog -* Thu Dec 27 2007 James Antill +* Thu Dec 27 2007 James Antill 1.1.9-2 - Fix for yum-priorities killing pirut. - Resolves: rhbz#421961 From 86b3c49d5149125a0c4645e65bfe87bea6902d53 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Thu, 3 Jan 2008 18:33:59 +0000 Subject: [PATCH 05/16] Release 1.1.10-1 --- sources | 2 +- yum-utils.spec | 36 +++++++++++++++++++++++++++--------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/sources b/sources index a87dbd5..46b63b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4325e5aec2ae73e099d4ebe04238598c yum-utils-1.1.9.tar.gz +958aca92bacff1e5c56fe6e20c4e376e yum-utils-1.1.10.tar.gz diff --git a/yum-utils.spec b/yum-utils.spec index 89bd10a..058fe51 100644 --- a/yum-utils.spec +++ b/yum-utils.spec @@ -1,11 +1,10 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.1.9 -Release: 2%{?dist} +Version: 1.1.10 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz -Patch0: yum-utils-1.1.9-prio-fix.patch URL: http://linux.duke.edu/yum/download/yum-utils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -158,7 +157,7 @@ Group: System Environment/Base Requires: yum >= 3.0.5 %description -n yum-security -This plugin adds ther options --security, --cve, --bz and --advisory flags +This plugin adds the options --security, --cve, --bz and --advisory flags 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. @@ -195,10 +194,18 @@ Requires: yum >= 3.0 this plugin allows yum to erase specific packages on install/update based on an additional metadata file in repositories. It is used to simplify distribution upgrade hangups. +%package -n yum-aliases +Summary: Yum plugin to enable aliases filters +Group: System Environment/Base +Requires: yum >= 3.0.5 + +%description -n yum-aliases +This plugin adds the command alias, and parses the aliases config. file to +enable aliases. + %prep %setup -q -%patch0 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -208,7 +215,7 @@ make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install # Plugins to install plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module \ downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf \ - security protect-packages basearchonly upgrade-helper" + security protect-packages basearchonly upgrade-helper aliases" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ @@ -217,6 +224,8 @@ for plug in $plugins; do install -m 644 $plug/*.conf $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ install -m 644 $plug/*.py $RPM_BUILD_ROOT/usr/lib/yum-plugins/ done +install -m 644 aliases/aliases $RPM_BUILD_ROOT/%{_sysconfdir}/yum/aliases.conf + %clean rm -rf $RPM_BUILD_ROOT @@ -246,11 +255,13 @@ fi %{_bindir}/repo-rss %{_bindir}/yumdownloader %{_bindir}/yum-builddep +%{_bindir}/yum-complete-transaction %{_mandir}/man1/package-cleanup.1.* %{_mandir}/man1/repo-rss.1.* %{_mandir}/man1/repoquery.1.* %{_mandir}/man1/reposync.1.* %{_mandir}/man1/yum-builddep.1.* +%{_mandir}/man1/yum-complete-transaction.1.* %{_mandir}/man1/yumdownloader.1.* %files -n yum-updateonboot @@ -348,11 +359,18 @@ fi %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/upgrade-helper.conf /usr/lib/yum-plugins/upgrade-helper.* +%files -n yum-aliases +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/aliases.conf +%config(noreplace) %{_sysconfdir}/yum/aliases.conf +/usr/lib/yum-plugins/aliases.* + %changelog -* Thu Dec 27 2007 James Antill 1.1.9-2 -- Fix for yum-priorities killing pirut. -- Resolves: rhbz#421961 +* Thu Jan 3 2008 Tim Lauridsen +- mark as 1.1.10 +* Thu Dec 12 2007 James Antill +- Add yum-aliases plugin * Fri Dec 7 2007 Tim Lauridsen - mark as 1.1.9 From ccadff4db5748af603fbb90aee94013be8b2a790 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Wed, 30 Jan 2008 06:24:36 +0000 Subject: [PATCH 06/16] Release 1.1.11 --- sources | 2 +- yum-utils.spec | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 46b63b7..d3df5d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -958aca92bacff1e5c56fe6e20c4e376e yum-utils-1.1.10.tar.gz +fc23c6635e6dcec3cbbcf30e064f522b yum-utils-1.1.11.tar.gz diff --git a/yum-utils.spec b/yum-utils.spec index 058fe51..db79ce3 100644 --- a/yum-utils.spec +++ b/yum-utils.spec @@ -1,6 +1,6 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.1.10 +Version: 1.1.11 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -203,6 +203,25 @@ Requires: yum >= 3.0.5 This plugin adds the command alias, and parses the aliases config. file to enable aliases. +%package -n yum-list-data +Summary: Yum plugin to list aggregate package data +Group: System Environment/Base +Requires: yum >= 3.0.5 + +%description -n yum-list-data +This plugin adds the commands list-vendors, groups, baseurls, packagers, +buildhosts, licenses and arches. + +%package -n yum-tmprepo +Summary: Yum plugin to add temporary repositories +Group: System Environment/Base +Requires: yum >= 3.0.5 + +%description -n yum-tmprepo +This plugin adds the option --tmprepo which takes a url to a .repo file +downloads it and enables it for a single run. This plugin tries to ensure +that temporary repositories are safe to use, by default, by not allowing +gpg checking to be disabled. %prep %setup -q @@ -215,7 +234,7 @@ make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install # Plugins to install plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module \ downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf \ - security protect-packages basearchonly upgrade-helper aliases" + security protect-packages basearchonly upgrade-helper aliases list-data tmprepo" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ @@ -247,6 +266,7 @@ fi %{_bindir}/debuginfo-install %{_bindir}/package-cleanup %{_bindir}/repoclosure +%{_bindir}/repodiff %{_bindir}/repomanage %{_bindir}/repoquery %{_bindir}/repotrack @@ -365,10 +385,26 @@ fi %config(noreplace) %{_sysconfdir}/yum/aliases.conf /usr/lib/yum-plugins/aliases.* +%files -n yum-list-data +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/list-data.conf +/usr/lib/yum-plugins/list-data.* + +%files -n yum-tmprepo +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tmprepo.conf +/usr/lib/yum-plugins/tmprepo.* + %changelog +* Wed Jan 30 2008 Tim Lauridsen +- mark as 1.1.11 +* Sun Jan 13 2008 Seth Vidal +- add repodiff + * Thu Jan 3 2008 Tim Lauridsen - mark as 1.1.10 + * Thu Dec 12 2007 James Antill - Add yum-aliases plugin From 7bb1d47130eac9737558cfe1eb4ca0441083c9a5 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Fri, 21 Mar 2008 07:51:20 +0000 Subject: [PATCH 07/16] Release 1.1.13-1 --- sources | 2 +- yum-utils-1.1.9-prio-fix.patch | 13 ------ yum-utils.spec | 75 ++++++++++++++++++++++++++++++---- 3 files changed, 67 insertions(+), 23 deletions(-) delete mode 100644 yum-utils-1.1.9-prio-fix.patch diff --git a/sources b/sources index d3df5d4..499f522 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fc23c6635e6dcec3cbbcf30e064f522b yum-utils-1.1.11.tar.gz +29eedb17fd40b158c129c84dc865d889 yum-utils-1.1.13.tar.gz diff --git a/yum-utils-1.1.9-prio-fix.patch b/yum-utils-1.1.9-prio-fix.patch deleted file mode 100644 index 8b12f57..0000000 --- a/yum-utils-1.1.9-prio-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -rup yum-utils-1.1.9/plugins/priorities/priorities.py yum-utils-1.1.9-prio-fix/plugins/priorities/priorities.py ---- yum-utils-1.1.9/plugins/priorities/priorities.py 2007-12-07 03:59:11.000000000 -0500 -+++ yum-utils-1.1.9-prio-fix/plugins/priorities/priorities.py 2007-12-27 17:27:46.000000000 -0500 -@@ -85,7 +85,7 @@ def exclude_hook(conduit): - - # Check whether the user specified the --samearch option. - opts, commands = conduit.getCmdLine() -- if opts.samearch: -+ if opts and opts.samearch: - only_samearch = True - - cnt = 0 -Only in yum-utils-1.1.9-prio-fix/plugins/priorities: priorities.py~ diff --git a/yum-utils.spec b/yum-utils.spec index db79ce3..461f6ff 100644 --- a/yum-utils.spec +++ b/yum-utils.spec @@ -1,6 +1,6 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.1.11 +Version: 1.1.13 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -13,7 +13,9 @@ Requires: python >= 2.4 , yum >= 3.1.1 %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. +more powerful to use. These tools include: debuginfo-install, package-cleanup, +repoclosure, repodiff, repo-graph, repomanage, repoquery, repo-rss, reposync, +repotrack, yum-builddep, yum-complete-transaction, yumdownloader. %package -n yum-updateonboot Summary: Run yum update on system boot @@ -209,13 +211,25 @@ Group: System Environment/Base Requires: yum >= 3.0.5 %description -n yum-list-data -This plugin adds the commands list-vendors, groups, baseurls, packagers, -buildhosts, licenses and arches. +This plugin adds the commands list- vendors, groups, packagers, licenses, +arches, committers, buildhosts, baseurls, package-sizes, archive-sizes and +installed-sizes. + +%package -n yum-filter-data +Summary: Yum plugin to list filter based on package data +Group: System Environment/Base +Requires: yum >= 3.0.5 + +%description -n yum-filter-data +This plugin adds the options --filter- vendors, groups, packagers, licenses, +arches, committers, buildhosts, baseurls, package-sizes, archive-sizes and +installed-sizes. Note that each package must match at least one pattern/range in +each category, if any were specified. %package -n yum-tmprepo Summary: Yum plugin to add temporary repositories Group: System Environment/Base -Requires: yum >= 3.0.5 +Requires: yum >= 3.2.11 %description -n yum-tmprepo This plugin adds the option --tmprepo which takes a url to a .repo file @@ -223,6 +237,16 @@ downloads it and enables it for a single run. This plugin tries to ensure that temporary repositories are safe to use, by default, by not allowing gpg checking to be disabled. +%package -n yum-verify +Summary: Yum plugin to add verify command, and options +Group: System Environment/Base +Requires: yum >= 3.2.12 + +%description -n yum-verify +This plugin adds the commands verify, verify-all and verify-rpm. There are +also a couple of options. This command works like rpm -V, to verify your +installation. + %prep %setup -q @@ -234,7 +258,7 @@ make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install # Plugins to install plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module \ downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf \ - security protect-packages basearchonly upgrade-helper aliases list-data tmprepo" + security protect-packages basearchonly upgrade-helper aliases list-data filter-data tmprepo verify" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ @@ -244,7 +268,7 @@ for plug in $plugins; do install -m 644 $plug/*.py $RPM_BUILD_ROOT/usr/lib/yum-plugins/ done install -m 644 aliases/aliases $RPM_BUILD_ROOT/%{_sysconfdir}/yum/aliases.conf - +install -m 644 versionlock/versionlock.list $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ %clean rm -rf $RPM_BUILD_ROOT @@ -275,13 +299,14 @@ fi %{_bindir}/repo-rss %{_bindir}/yumdownloader %{_bindir}/yum-builddep -%{_bindir}/yum-complete-transaction +%{_sbindir}/yum-complete-transaction +%{_mandir}/man1/yum-utils.1.* %{_mandir}/man1/package-cleanup.1.* %{_mandir}/man1/repo-rss.1.* %{_mandir}/man1/repoquery.1.* %{_mandir}/man1/reposync.1.* %{_mandir}/man1/yum-builddep.1.* -%{_mandir}/man1/yum-complete-transaction.1.* +%{_mandir}/man8/yum-complete-transaction.8.* %{_mandir}/man1/yumdownloader.1.* %files -n yum-updateonboot @@ -316,6 +341,7 @@ fi %defattr(-, root, root) %doc plugins/versionlock/README %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.conf +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.list /usr/lib/yum-plugins/versionlock.* %files -n yum-tsflags @@ -389,16 +415,47 @@ fi %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/list-data.conf /usr/lib/yum-plugins/list-data.* +%{_mandir}/man1/yum-list-data.1.* + +%files -n yum-filter-data +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/filter-data.conf +/usr/lib/yum-plugins/filter-data.* +%{_mandir}/man1/yum-filter-data.1.* %files -n yum-tmprepo %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tmprepo.conf /usr/lib/yum-plugins/tmprepo.* +%files -n yum-verify +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/verify.conf +/usr/lib/yum-plugins/verify.* +%{_mandir}/man1/yum-verify.1.* %changelog +* Fri Mar 21 2008 Tim Lauridsen +- mark as 1.1.13 +* Fri Mar 21 2008 Tim Lauridsen +- mark as 1.1.12 +* Tue Mar 18 2008 Shawn Starr +- Add yum-utils.1 manual page +- Rename yum-complete-transaction manual page to 8 +- Move yum-complete-transaction to /usr/sbin + +* Sat Mar 1 2008 James Antill +- Add verify plugin + +* Wed Feb 20 2008 James Antill +- Add empty versionlock file + +* Fri Feb 1 2008 James Antill +- Add filter-data plugin + * Wed Jan 30 2008 Tim Lauridsen - mark as 1.1.11 + * Sun Jan 13 2008 Seth Vidal - add repodiff From d09721d41aafcbd4be36078aa713fda7e520de85 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Wed, 21 May 2008 12:37:04 +0000 Subject: [PATCH 08/16] Release 1.1.14 --- sources | 2 +- yum-utils.spec | 58 +++++++++++++++++++++++++++++++++++++------------- 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/sources b/sources index 499f522..9052ac3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29eedb17fd40b158c129c84dc865d889 yum-utils-1.1.13.tar.gz +e1d0bba0249bf294488cbaac41dbeaee yum-utils-1.1.14.tar.gz diff --git a/yum-utils.spec b/yum-utils.spec index 461f6ff..1243866 100644 --- a/yum-utils.spec +++ b/yum-utils.spec @@ -1,6 +1,6 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.1.13 +Version: 1.1.14 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -12,10 +12,10 @@ Requires: python >= 2.4 , yum >= 3.1.1 %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 +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, yum-builddep, yum-complete-transaction, yumdownloader. +repotrack, yum-builddep, yum-complete-transaction, yumdownloader, yum-debug-dump %package -n yum-updateonboot Summary: Run yum update on system boot @@ -33,9 +33,10 @@ waiting until the next early morning cron job. Summary: Yum plugin for viewing package changelogs before/after updating Group: System Environment/Base Requires: yum >= 3.0 +Requires: python-dateutil %description -n yum-changelog -This plugin adds a command line option to allow viewing package changelog +This plugin adds a command line option to allow viewing package changelog deltas before or after updating packages. %package -n yum-fastestmirror @@ -53,7 +54,7 @@ Group: System Environment/Base Requires: yum >= 3.0 %description -n yum-fedorakmod -Plugin for Yum to handle installation of kmod-foo type of kernel modules, when new kernel versions +Plugin for Yum to handle installation of kmod-foo type of kernel modules, when new kernel versions are installed. kmod-foo kernel modules is described by the Fedora Extras packaging standards. @@ -73,7 +74,7 @@ Group: System Environment/Base Requires: yum >= 3.0 %description -n yum-versionlock -This plugin allows certain packages specified in a file to be protected from being updated by +This plugin allows certain packages specified in a file to be protected from being updated by newer versions. %package -n yum-tsflags @@ -91,7 +92,7 @@ Group: System Environment/Base Requires: yum >= 3.0 %description -n yum-kernel-module -This plugin handle installation of kernel-module-foo type of kernel modules when new version of +This plugin handle installation of kernel-module-foo type of kernel modules when new version of kernels are installed. @@ -123,12 +124,12 @@ This plugin adds a --skip-broken to yum to make it possible to check packages for dependency problems and skip the one with problems. %package -n yum-priorities -Summary: plugin to give priorities to packages from different repos +Summary: plugin to give priorities to packages from different repos Group: System Environment/Base Requires: yum >= 3.0 %description -n yum-priorities -This plugin allows repositories to have different priorities. +This plugin allows repositories to have different priorities. Packages in a repository with a lower priority can't be overridden by packages from a repository with a higher priority even if repo has a later version. @@ -165,14 +166,14 @@ 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-protect-packages -Summary: Yum plugin to prevents Yum from removing itself and other protected packages +Summary: Yum plugin to prevents Yum from removing itself and other protected packages Group: System Environment/Base Requires: yum >= 3.0 %description -n yum-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, +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. @@ -247,6 +248,15 @@ This plugin adds the commands verify, verify-all and verify-rpm. There are also a couple of options. This command works like rpm -V, to verify your installation. +%package -n yum-keys +Summary: Yum plugin to deal with signing keys +Group: System Environment/Base +Requires: yum >= 3.2.8 + +%description -n yum-keys +This plugin adds the commands keys, keys-info, keys-data and keys-remove. They +allow you to query and remove signing keys. + %prep %setup -q @@ -258,7 +268,7 @@ make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install # Plugins to install plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module \ downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf \ - security protect-packages basearchonly upgrade-helper aliases list-data filter-data tmprepo verify" + security protect-packages basearchonly upgrade-helper aliases list-data filter-data tmprepo verify keys" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ @@ -299,6 +309,7 @@ fi %{_bindir}/repo-rss %{_bindir}/yumdownloader %{_bindir}/yum-builddep +%{_bindir}/yum-debug-dump %{_sbindir}/yum-complete-transaction %{_mandir}/man1/yum-utils.1.* %{_mandir}/man1/package-cleanup.1.* @@ -306,6 +317,7 @@ fi %{_mandir}/man1/repoquery.1.* %{_mandir}/man1/reposync.1.* %{_mandir}/man1/yum-builddep.1.* +%{_mandir}/man1/yum-debug-dump.1.* %{_mandir}/man8/yum-complete-transaction.8.* %{_mandir}/man1/yumdownloader.1.* @@ -325,7 +337,7 @@ fi %files -n yum-fastestmirror %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fastestmirror.conf -/usr/lib/yum-plugins/fastestmirror.* +/usr/lib/yum-plugins/fastestmirror*.* %files -n yum-fedorakmod %defattr(-, root, root) @@ -410,6 +422,7 @@ fi %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/aliases.conf %config(noreplace) %{_sysconfdir}/yum/aliases.conf /usr/lib/yum-plugins/aliases.* +%{_mandir}/man1/yum-aliases.1.* %files -n yum-list-data %defattr(-, root, root) @@ -434,7 +447,22 @@ fi /usr/lib/yum-plugins/verify.* %{_mandir}/man1/yum-verify.1.* +%files -n yum-keys +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/keys.conf +/usr/lib/yum-plugins/keys.* + %changelog +* Wed May 21 2008 Tim Lauridsen + Make yum-fastestmirror %%files handle the fastestmirror-asyncore.py file +* Wed May 21 2008 Tim Lauridsen +- mark as 1.1.14 +* Fri Apr 10 2008 James Antill +- Add keys plugin + +* Fri Mar 31 2008 James Antill +- Add yum-aliases man page + * Fri Mar 21 2008 Tim Lauridsen - mark as 1.1.13 * Fri Mar 21 2008 Tim Lauridsen @@ -466,7 +494,7 @@ fi - Add yum-aliases plugin * Fri Dec 7 2007 Tim Lauridsen -- mark as 1.1.9 +- mark as 1.1.9 * Fri Oct 26 2007 Seth Vidal - add upgrade-helper plugin * Wed Oct 17 2007 Tim Lauridsen @@ -542,7 +570,7 @@ fi - mark it as 1.0.1 * Fri Oct 27 2006 Tim Lauridsen -- Added priorities plugin written by Daniel de Kok +- Added priorities plugin written by Daniel de Kok * Wed Oct 4 2006 Seth Vidal - mark it as 1.0 From 32b2f600342ad6e947f86455a5617f41b00b8585 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Mon, 26 May 2008 10:17:23 +0000 Subject: [PATCH 09/16] Release 1.1.4-3: fix som fastestmirror issues --- fastestmirror.patch | 14 ++++++++++++++ yum-utils.spec | 10 +++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 fastestmirror.patch diff --git a/fastestmirror.patch b/fastestmirror.patch new file mode 100644 index 0000000..4ec036d --- /dev/null +++ b/fastestmirror.patch @@ -0,0 +1,14 @@ +diff --git a/plugins/fastestmirror/fastestmirror.py b/plugins/fastestmirror/fastestmirror.py +index dc4df92..add870a 100644 +--- a/plugins/fastestmirror/fastestmirror.py ++++ b/plugins/fastestmirror/fastestmirror.py +@@ -130,7 +130,7 @@ def postreposetup_hook(conduit): + """ + global loadcache, exclude + opts, commands = conduit.getCmdLine() +- if opts.cacheonly: ++ if hasattr(opts, 'cacheonly') and opts.cacheonly: + return + if loadcache: + conduit.info(2, "Loading mirror speeds from cached hostfile") + diff --git a/yum-utils.spec b/yum-utils.spec index 1243866..0d0fc5f 100644 --- a/yum-utils.spec +++ b/yum-utils.spec @@ -1,10 +1,11 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 1.1.14 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz +Patch: fastestmirror.patch URL: http://linux.duke.edu/yum/download/yum-utils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -259,6 +260,9 @@ allow you to query and remove signing keys. %prep %setup -q +%patch -p1 +# temporary fix: we don't want fastestmirror-asyncore.py +rm -f $RPM_BUILD_ROOT/plugins/fastestmirror/fastestmirror-asyncore.py %install rm -rf $RPM_BUILD_ROOT @@ -453,6 +457,10 @@ fi /usr/lib/yum-plugins/keys.* %changelog +* Mon May 26 2008 Tim Lauridsen +- remove the fastestmirror-asyncore.py, we dont want it in this release +* Sat May 24 2008 Tim Lauridsen +- Added fastestmirror.patch from upstream to fix issues with the fastestmirror plugin. * Wed May 21 2008 Tim Lauridsen Make yum-fastestmirror %%files handle the fastestmirror-asyncore.py file * Wed May 21 2008 Tim Lauridsen From 9b4e617cea8a49b3fae58fdcad356f58f8a3bea7 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Thu, 29 May 2008 10:47:34 +0000 Subject: [PATCH 10/16] Release 1.1.14-4 : make fastestmirror-asyncore.py? go away --- yum-utils.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/yum-utils.spec b/yum-utils.spec index 0d0fc5f..a54f660 100644 --- a/yum-utils.spec +++ b/yum-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 1.1.14 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -261,14 +261,13 @@ allow you to query and remove signing keys. %prep %setup -q %patch -p1 -# temporary fix: we don't want fastestmirror-asyncore.py -rm -f $RPM_BUILD_ROOT/plugins/fastestmirror/fastestmirror-asyncore.py %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install + # Plugins to install plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module \ downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf \ @@ -283,6 +282,8 @@ for plug in $plugins; do done install -m 644 aliases/aliases $RPM_BUILD_ROOT/%{_sysconfdir}/yum/aliases.conf install -m 644 versionlock/versionlock.list $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ +# temporary fix: we don't want fastestmirror-asyncore.py +rm -f $RPM_BUILD_ROOT/usr/lib/yum-plugins/fastestmirror-asyncore.* %clean rm -rf $RPM_BUILD_ROOT @@ -457,6 +458,9 @@ fi /usr/lib/yum-plugins/keys.* %changelog +* Thu May 29 2008 Tim Lauridsen +- remove the fastestmirror-asyncore.py +- And do it right this time * Mon May 26 2008 Tim Lauridsen - remove the fastestmirror-asyncore.py, we dont want it in this release * Sat May 24 2008 Tim Lauridsen From b2610dd6171d67bf084e1a5d6d74d0a5082f3d03 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Thu, 7 Aug 2008 14:00:40 +0000 Subject: [PATCH 11/16] Release 1.1.15-1 --- sources | 2 +- yum-utils.spec | 68 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 46 insertions(+), 24 deletions(-) diff --git a/sources b/sources index 9052ac3..829c599 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1d0bba0249bf294488cbaac41dbeaee yum-utils-1.1.14.tar.gz +2063a77d0b865ece3c34f95372632fd2 yum-utils-1.1.15.tar.gz diff --git a/yum-utils.spec b/yum-utils.spec index a54f660..0219a6f 100644 --- a/yum-utils.spec +++ b/yum-utils.spec @@ -1,11 +1,10 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.1.14 -Release: 4%{?dist} +Version: 1.1.15 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz -Patch: fastestmirror.patch URL: http://linux.duke.edu/yum/download/yum-utils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -16,7 +15,8 @@ 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, yum-builddep, yum-complete-transaction, yumdownloader, yum-debug-dump +repotrack, verifytree, yum-builddep, yum-complete-transaction, yumdownloader, +yum-debug-dump %package -n yum-updateonboot Summary: Run yum update on system boot @@ -55,8 +55,8 @@ Group: System Environment/Base Requires: yum >= 3.0 %description -n yum-fedorakmod -Plugin for Yum to handle installation of kmod-foo type of kernel modules, when new kernel versions -are installed. +Plugin for Yum to handle installation of kmod-foo type of kernel modules, +when new kernel versions are installed. kmod-foo kernel modules is described by the Fedora Extras packaging standards. %package -n yum-protectbase @@ -75,8 +75,10 @@ Group: System Environment/Base Requires: yum >= 3.0 %description -n yum-versionlock -This plugin allows certain packages specified in a file to be protected from being updated by -newer versions. +This plugin takes a set of name/versions for packages and excludes all other +versions of those packages (including optionally following obsoletes). This +allows you to protect packages from being updated by newer versions, +for example. %package -n yum-tsflags Summary: Yum plugin to add tsflags by a commandline option @@ -158,7 +160,7 @@ package. %package -n yum-security Summary: Yum plugin to enable security filters Group: System Environment/Base -Requires: yum >= 3.0.5 +Requires: yum >= 3.2.18 %description -n yum-security This plugin adds the options --security, --cve, --bz and --advisory flags @@ -232,6 +234,7 @@ each category, if any were specified. Summary: Yum plugin to add temporary repositories Group: System Environment/Base Requires: yum >= 3.2.11 +Requires: createrepo %description -n yum-tmprepo This plugin adds the option --tmprepo which takes a url to a .repo file @@ -260,18 +263,38 @@ allow you to query and remove signing keys. %prep %setup -q -%patch -p1 %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install - # Plugins to install -plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module \ - downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf \ - security protect-packages basearchonly upgrade-helper aliases list-data filter-data tmprepo verify keys" +plugins="\ + changelog \ + fastestmirror \ + fedorakmod \ + protectbase \ + versionlock \ + tsflags \ + kernel-module \ + downloadonly \ + allowdowngrade \ + skip-broken \ + priorities \ + refresh-updatesd \ + merge-conf \ + security \ + protect-packages \ + basearchonly \ + upgrade-helper \ + aliases \ + list-data \ + filter-data \ + tmprepo \ + verify \ + keys \ +" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ @@ -282,8 +305,6 @@ for plug in $plugins; do done install -m 644 aliases/aliases $RPM_BUILD_ROOT/%{_sysconfdir}/yum/aliases.conf install -m 644 versionlock/versionlock.list $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ -# temporary fix: we don't want fastestmirror-asyncore.py -rm -f $RPM_BUILD_ROOT/usr/lib/yum-plugins/fastestmirror-asyncore.* %clean rm -rf $RPM_BUILD_ROOT @@ -312,6 +333,7 @@ fi %{_bindir}/reposync %{_bindir}/repo-graph %{_bindir}/repo-rss +%{_bindir}/verifytree %{_bindir}/yumdownloader %{_bindir}/yum-builddep %{_bindir}/yum-debug-dump @@ -360,6 +382,8 @@ fi %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.conf %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.list /usr/lib/yum-plugins/versionlock.* +%{_mandir}/man1/yum-versionlock.1.* +%{_mandir}/man5/yum-versionlock.conf.5.* %files -n yum-tsflags %defattr(-, root, root) @@ -458,13 +482,11 @@ fi /usr/lib/yum-plugins/keys.* %changelog -* Thu May 29 2008 Tim Lauridsen -- remove the fastestmirror-asyncore.py -- And do it right this time -* Mon May 26 2008 Tim Lauridsen -- remove the fastestmirror-asyncore.py, we dont want it in this release -* Sat May 24 2008 Tim Lauridsen -- Added fastestmirror.patch from upstream to fix issues with the fastestmirror plugin. +* Thu Aug 7 2008 Tim Lauridsen +- mark as 1.1.15 +* Wed May 21 2008 Tim Lauridsen +- add verifytree + * Wed May 21 2008 Tim Lauridsen Make yum-fastestmirror %%files handle the fastestmirror-asyncore.py file * Wed May 21 2008 Tim Lauridsen From ffa4e8a64b5470445e9d4cf99b4e1da74304585f Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Thu, 28 Aug 2008 04:55:12 +0000 Subject: [PATCH 12/16] Release 1.1.16-1 --- sources | 2 +- yum-utils.spec | 34 ++++++++++++++++++++++++++++------ 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/sources b/sources index 829c599..cd7a502 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2063a77d0b865ece3c34f95372632fd2 yum-utils-1.1.15.tar.gz +1c1d9df0914f7f945ab2a561d16e62de yum-utils-1.1.16.tar.gz diff --git a/yum-utils.spec b/yum-utils.spec index 0219a6f..9cd5bc4 100644 --- a/yum-utils.spec +++ b/yum-utils.spec @@ -1,14 +1,14 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.1.15 +Version: 1.1.16 Release: 1%{?dist} -License: GPL +License: GPLv2+ Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz URL: http://linux.duke.edu/yum/download/yum-utils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python >= 2.4 , yum >= 3.1.1 +Requires: python >= 2.4 , yum >= 3.2.19 %description yum-utils is a collection of utilities and examples for the yum package @@ -16,7 +16,7 @@ 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-dump and yum-groups-manager. %package -n yum-updateonboot Summary: Run yum update on system boot @@ -222,7 +222,7 @@ installed-sizes. %package -n yum-filter-data Summary: Yum plugin to list filter based on package data Group: System Environment/Base -Requires: yum >= 3.0.5 +Requires: yum >= 3.2.17 %description -n yum-filter-data This plugin adds the options --filter- vendors, groups, packagers, licenses, @@ -255,12 +255,23 @@ installation. %package -n yum-keys Summary: Yum plugin to deal with signing keys Group: System Environment/Base -Requires: yum >= 3.2.8 +Requires: yum >= 3.2.19 %description -n yum-keys This plugin adds the commands keys, keys-info, keys-data and keys-remove. They allow you to query and remove signing keys. +%package -n yum-NetworkManager-dispatcher +Summary: Yum plugin to deal with changing networks with NetworkManager +Group: System Environment/Base +Requires: yum >= 3.2.17 + +%description -n yum-NetworkManager-dispatcher +This plugin forces yum to check it's cache if/when a new network connection +happens in NetworkManager. Note that currently there is no checking of +previous data, so if your WiFi keeps going up and down (or you suspend/resume +a lot) yum will recheck it's cached data a lot. + %prep %setup -q @@ -337,6 +348,7 @@ fi %{_bindir}/yumdownloader %{_bindir}/yum-builddep %{_bindir}/yum-debug-dump +%{_bindir}/yum-groups-manager %{_sbindir}/yum-complete-transaction %{_mandir}/man1/yum-utils.1.* %{_mandir}/man1/package-cleanup.1.* @@ -346,6 +358,7 @@ fi %{_mandir}/man1/yum-builddep.1.* %{_mandir}/man1/yum-debug-dump.1.* %{_mandir}/man8/yum-complete-transaction.8.* +%{_mandir}/man1/yum-groups-manager.1.* %{_mandir}/man1/yumdownloader.1.* %files -n yum-updateonboot @@ -481,7 +494,16 @@ fi %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/keys.conf /usr/lib/yum-plugins/keys.* +%files -n yum-NetworkManager-dispatcher +%defattr(-, root, root) +/etc/NetworkManager/dispatcher.d/* + %changelog +* Wed Aug 27 2008 Tim Lauridsen +- mark as 1.1.16 +* Wed Aug 20 2008 James Antill +- add yum-groups-manager + * Thu Aug 7 2008 Tim Lauridsen - mark as 1.1.15 * Wed May 21 2008 Tim Lauridsen From 5a00c4a469444bb32b1faf99e9845be8ef53fe52 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Wed, 10 Sep 2008 13:31:59 +0000 Subject: [PATCH 13/16] Added patch to unbreak repoquery --- repoquery-unbreak.patch | 21 +++++++++++++++++++++ yum-utils.spec | 6 +++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 repoquery-unbreak.patch diff --git a/repoquery-unbreak.patch b/repoquery-unbreak.patch new file mode 100644 index 0000000..13fbf6a --- /dev/null +++ b/repoquery-unbreak.patch @@ -0,0 +1,21 @@ +From: Seth Vidal +Date: Thu, 28 Aug 2008 04:25:47 +0000 (-0400) +Subject: add a parens to unbreak reposync +X-Git-Url: http://devel.linux.duke.edu/gitweb/?p=yum-utils.git;a=commitdiff_plain;h=6b7a864e118df20c151c6d1d63398171e49f1fdb + +add a parens to unbreak reposync +--- + +diff --git a/reposync.py b/reposync.py +index 339a6ca..82cf4f0 100755 +--- a/reposync.py ++++ b/reposync.py +@@ -267,7 +267,7 @@ def main(): + try: + path = repo.getPackage(pkg) + except yum.Errors.RepoError, e: +- my.logger.error("Could not retrieve package %s. Error was %s" % (pkg, str(e)) ++ my.logger.error("Could not retrieve package %s. Error was %s" % (pkg, str(e))) + continue + + if opts.gpgcheck: diff --git a/yum-utils.spec b/yum-utils.spec index 9cd5bc4..b6be79e 100644 --- a/yum-utils.spec +++ b/yum-utils.spec @@ -1,10 +1,11 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 1.1.16 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz +Patch0: repoquery-unbreak.patch URL: http://linux.duke.edu/yum/download/yum-utils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -274,6 +275,7 @@ a lot) yum will recheck it's cached data a lot. %prep %setup -q +%patch0 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -499,6 +501,8 @@ fi /etc/NetworkManager/dispatcher.d/* %changelog +* Wed Sep 10 2008 Tim Lauridsen +- Added patch to unbreak repoquery * Wed Aug 27 2008 Tim Lauridsen - mark as 1.1.16 * Wed Aug 20 2008 James Antill From aa998cc82b38b7292cc1809f355c3b83c7fc9bba Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Thu, 18 Sep 2008 07:32:13 +0000 Subject: [PATCH 14/16] Release 1.1.17-1 --- fastestmirror.patch | 14 -------------- repoquery-unbreak.patch | 21 --------------------- sources | 2 +- yum-utils.spec | 30 ++++++++++++++++++++++++------ 4 files changed, 25 insertions(+), 42 deletions(-) delete mode 100644 fastestmirror.patch delete mode 100644 repoquery-unbreak.patch diff --git a/fastestmirror.patch b/fastestmirror.patch deleted file mode 100644 index 4ec036d..0000000 --- a/fastestmirror.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/plugins/fastestmirror/fastestmirror.py b/plugins/fastestmirror/fastestmirror.py -index dc4df92..add870a 100644 ---- a/plugins/fastestmirror/fastestmirror.py -+++ b/plugins/fastestmirror/fastestmirror.py -@@ -130,7 +130,7 @@ def postreposetup_hook(conduit): - """ - global loadcache, exclude - opts, commands = conduit.getCmdLine() -- if opts.cacheonly: -+ if hasattr(opts, 'cacheonly') and opts.cacheonly: - return - if loadcache: - conduit.info(2, "Loading mirror speeds from cached hostfile") - diff --git a/repoquery-unbreak.patch b/repoquery-unbreak.patch deleted file mode 100644 index 13fbf6a..0000000 --- a/repoquery-unbreak.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Seth Vidal -Date: Thu, 28 Aug 2008 04:25:47 +0000 (-0400) -Subject: add a parens to unbreak reposync -X-Git-Url: http://devel.linux.duke.edu/gitweb/?p=yum-utils.git;a=commitdiff_plain;h=6b7a864e118df20c151c6d1d63398171e49f1fdb - -add a parens to unbreak reposync ---- - -diff --git a/reposync.py b/reposync.py -index 339a6ca..82cf4f0 100755 ---- a/reposync.py -+++ b/reposync.py -@@ -267,7 +267,7 @@ def main(): - try: - path = repo.getPackage(pkg) - except yum.Errors.RepoError, e: -- my.logger.error("Could not retrieve package %s. Error was %s" % (pkg, str(e)) -+ my.logger.error("Could not retrieve package %s. Error was %s" % (pkg, str(e))) - continue - - if opts.gpgcheck: diff --git a/sources b/sources index cd7a502..2b60d80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c1d9df0914f7f945ab2a561d16e62de yum-utils-1.1.16.tar.gz +c9bb92a87a01e39d2d928ac3ae12e10a yum-utils-1.1.17.tar.gz diff --git a/yum-utils.spec b/yum-utils.spec index b6be79e..839cc34 100644 --- a/yum-utils.spec +++ b/yum-utils.spec @@ -1,11 +1,10 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 1.1.16 -Release: 2%{?dist} +Version: 1.1.17 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz -Patch0: repoquery-unbreak.patch URL: http://linux.duke.edu/yum/download/yum-utils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -262,6 +261,16 @@ Requires: yum >= 3.2.19 This plugin adds the commands keys, keys-info, keys-data and keys-remove. They allow you to query and remove signing keys. +%package -n yum-remove-with-leaves +Summary: Yum plugin to remove dependencies which are no longer used because of a removal +Group: System Environment/Base +Requires: yum >= 3.2.19 + +%description -n yum-remove-with-leaves +This plugin removes any unused dependencies that were brought in by an install +but would not normally be removed. It helps to keep a system clean of unused +libraries and packages. + %package -n yum-NetworkManager-dispatcher Summary: Yum plugin to deal with changing networks with NetworkManager Group: System Environment/Base @@ -275,7 +284,6 @@ a lot) yum will recheck it's cached data a lot. %prep %setup -q -%patch0 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -307,6 +315,7 @@ plugins="\ tmprepo \ verify \ keys \ + remove-with-leaves \ " mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ @@ -500,9 +509,18 @@ fi %defattr(-, root, root) /etc/NetworkManager/dispatcher.d/* +%files -n yum-remove-with-leaves +%defattr(-, root, root) +/usr/lib/yum-plugins/remove-with-leaves.* +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/remove-with-leaves.conf + %changelog -* Wed Sep 10 2008 Tim Lauridsen -- Added patch to unbreak repoquery +* Wed Sep 17 2008 Tim Lauridsen +- mark as 1.1.17 + +* Mon Sep 8 2008 Seth Vidal +- add yum-remove-with-leaves plugin + * Wed Aug 27 2008 Tim Lauridsen - mark as 1.1.16 * Wed Aug 20 2008 James Antill From ae81ed8f2b9af76e5b5233d525ac3ba45ca79aa2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:12:45 +0000 Subject: [PATCH 15/16] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3564d2f..fb4e6f8 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From 5db264685ef908079532110f1e4d1ff5064d59f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 18:32:07 +0000 Subject: [PATCH 16/16] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index fb4e6f8..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: yum-utils -# $Id$ -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) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8