From 2a958728a225d1cb75aa4ff94f912114c820fd38 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 22 Apr 2008 04:24:06 +0000 Subject: [PATCH 01/12] Initialize branch F-9 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..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 8db704084cff0a92da7f6497599d7886f3376edc Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Wed, 21 May 2008 12:14:32 +0000 Subject: [PATCH 02/12] Release 1.1.14 --- sources | 2 +- yum-utils.spec | 60 +++++++++++++++++++++++++++++++++++--------------- 2 files changed, 43 insertions(+), 19 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 f3e2df5..1243866 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.13 -Release: 2%{?dist} +Version: 1.1.14 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -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 @@ -36,7 +36,7 @@ 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 @@ -54,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. @@ -74,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 @@ -92,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. @@ -124,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. @@ -166,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. @@ -248,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 @@ -259,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/ @@ -300,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.* @@ -307,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.* @@ -326,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) @@ -411,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) @@ -435,9 +447,21 @@ 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 -* Fri Mar 21 2008 Seth Vidal -- add python-dateutil requires to yum-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 @@ -470,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 @@ -546,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 9af273d8b20f68e4763f22ea588cbc2a394f1643 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Mon, 26 May 2008 08:54:07 +0000 Subject: [PATCH 03/12] 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 41174569e50d23376ea29ff768c2017143371242 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Thu, 29 May 2008 10:29:01 +0000 Subject: [PATCH 04/12] 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 784c0a3732ccdfc41e6e1e6e1415239f0d9d5109 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Thu, 7 Aug 2008 13:52:44 +0000 Subject: [PATCH 05/12] 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 8ce858eef09779a0738c85dab90134c041501290 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Thu, 28 Aug 2008 04:44:42 +0000 Subject: [PATCH 06/12] 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 d1bf2e0dbfc161afc9d2232c0dde8f2ec332aec0 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Wed, 10 Sep 2008 13:00:07 +0000 Subject: [PATCH 07/12] 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 84391dd6ee10e1027d08ab051fd6cd8df5d75dfa Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Thu, 18 Sep 2008 07:24:20 +0000 Subject: [PATCH 08/12] Release 1.1.17-1 --- fastestmirror.patch | 14 ------ repoquery-unbreak.patch | 21 --------- sources | 2 +- yum-downloader-archlist.patch | 89 ----------------------------------- yum-utils.spec | 30 +++++++++--- 5 files changed, 25 insertions(+), 131 deletions(-) delete mode 100644 fastestmirror.patch delete mode 100644 repoquery-unbreak.patch delete mode 100644 yum-downloader-archlist.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-downloader-archlist.patch b/yum-downloader-archlist.patch deleted file mode 100644 index bcfdfed..0000000 --- a/yum-downloader-archlist.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- a/yumdownloader.py 2008-01-30 01:03:15.000000000 -0500 -+++ b/yumdownloader.py 2008-03-07 10:54:06.000000000 -0500 -@@ -26,6 +26,7 @@ - from urlgrabber.progress import TextMeter - import shutil - -+import rpmUtils - - class YumDownloader(YumUtilBase): - NAME = 'yumdownloader' -@@ -64,9 +65,12 @@ - self.logger.error("Error: Could not make cachedir, exiting") - sys.exit(50) - self.repos.setCacheDir(cachedir) -- # Turn of cache -- self.conf.cache = 0 - -+ # Turn off cache -+ self.conf.cache = 0 -+ # make sure the repos know about it, too -+ self.repos.setCache(0) -+ - # Setup yum (Ts, RPM db, Repo & Sack) - self.doUtilYumSetup(opts) - # Setup source repos -@@ -116,14 +120,12 @@ - - def downloadPackages(self,opts): - -- avail = self.pkgSack.returnPackages() -- - toDownload = [] - - packages = self.cmds - for pkg in packages: - toActOn = [] -- exactmatch, matched, unmatched = parsePackages(avail, [pkg]) -+ exactmatch, matched, unmatched = parsePackages(self.pkgSack.returnPackages(), [pkg]) - installable = yum.misc.unique(exactmatch + matched) - if len(unmatched) > 0: # if we get back anything in unmatched, it fails - self.logger.error('No Match for argument %s' % pkg) -@@ -158,9 +160,12 @@ - if toActOn: - if opts.source: - toDownload.extend(self.bestPackagesFromList(toActOn, 'src')) -+ elif opts.archlist: -+ for arch in opts.archlist.split(','): -+ toDownload.extend(self.bestPackagesFromList(toActOn, arch)) - else: - toDownload.extend(self.bestPackagesFromList(toActOn)) -- -+ - # If the user supplies to --resolve flag, resolve dependencies for - # all packages - # note this might require root access because the headers need to be -@@ -215,18 +220,20 @@ - size=os.stat(path).st_size) - shutil.copy2(path, local) - progress.end(progress.size) -- -+ - # sligly modified from the one in YumUtilBase - def doUtilYumSetup(self,opts): - """do a default setup for all the normal/necessary yum components, - really just a shorthand for testing""" - try: -- self._getTs() -- self._getRpmDB() - self._getRepos() - # if '--source' is used the add src to the archlist - if opts.source: - archlist = rpmUtils.arch.getArchList() + ['src'] -+ elif opts.archlist: -+ archlist = [] -+ for a in opts.archlist.split(','): -+ archlist.extend(rpmUtils.arch.getArchList(a)) - else: - archlist = rpmUtils.arch.getArchList() - self._getSacks(archlist=archlist) -@@ -251,7 +258,8 @@ - help='resolve dependencies and download required packages') - parser.add_option("--source", default=False, dest="source", action="store_true", - help='operate on source packages') -- -+ parser.add_option("--archlist", -+ help="only download packages of certain architecture(s)") - if __name__ == '__main__': - util = YumDownloader() - 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 e17423443797ebe74228a7a9303333dc97c30636 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Thu, 18 Dec 2008 12:41:52 +0000 Subject: [PATCH 09/12] Release 1.1.19-1 --- sources | 2 +- yum-utils.spec | 69 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 59 insertions(+), 12 deletions(-) diff --git a/sources b/sources index 2b60d80..519c500 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9bb92a87a01e39d2d928ac3ae12e10a yum-utils-1.1.17.tar.gz +ebd74b37c9d87ebcce43670f94ceedf4 yum-utils-1.1.19.tar.gz diff --git a/yum-utils.spec b/yum-utils.spec index 839cc34..4cb46ea 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.17 +Version: 1.1.19 Release: 1%{?dist} 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/ +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.19 +Requires: python >= 2.4 , yum >= 3.2.20 %description yum-utils is a collection of utilities and examples for the yum package @@ -271,6 +271,15 @@ 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-post-transaction-actions +Summary: Yum plugin to run arbitrary commands when certain pkgs are acted on +Group: System Environment/Base +Requires: yum >= 3.2.19 + +%description -n yum-post-transaction-actions +This plugin allows the user to run arbitrary actions immediately following a +transaction when specified packages are changed. + %package -n yum-NetworkManager-dispatcher Summary: Yum plugin to deal with changing networks with NetworkManager Group: System Environment/Base @@ -282,6 +291,15 @@ 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. +%package -n yum-rpm-warm-cache +Summary: Yum plugin to access the rpmdb files early to warm up access to the db +Group: System Environment/Base +Requires: yum >= 3.2.19 + +%description -n yum-rpm-warm-cache +This plugin reads the rpmdb files into the system cache before accessing the +rpmdb directly. In some cases this should speed up access to rpmdb information + %prep %setup -q @@ -301,7 +319,6 @@ plugins="\ kernel-module \ downloadonly \ allowdowngrade \ - skip-broken \ priorities \ refresh-updatesd \ merge-conf \ @@ -316,9 +333,12 @@ plugins="\ verify \ keys \ remove-with-leaves \ + post-transaction-actions \ + rpm-warm-cache \ " mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/post-actions cd plugins for plug in $plugins; do @@ -346,6 +366,7 @@ fi %doc COPYING %doc plugins/README %{_bindir}/debuginfo-install +%{_bindir}/find-repos-of-install %{_bindir}/package-cleanup %{_bindir}/repoclosure %{_bindir}/repodiff @@ -362,9 +383,11 @@ fi %{_bindir}/yum-groups-manager %{_sbindir}/yum-complete-transaction %{_mandir}/man1/yum-utils.1.* +%{_mandir}/man1/debuginfo-install.1.* %{_mandir}/man1/package-cleanup.1.* %{_mandir}/man1/repo-rss.1.* %{_mandir}/man1/repoquery.1.* +%{_mandir}/man1/repodiff.1.* %{_mandir}/man1/reposync.1.* %{_mandir}/man1/yum-builddep.1.* %{_mandir}/man1/yum-debug-dump.1.* @@ -429,11 +452,6 @@ fi %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/allowdowngrade.conf /usr/lib/yum-plugins/allowdowngrade.* -%files -n yum-skip-broken -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/skip-broken.conf -/usr/lib/yum-plugins/skip-broken.* - %files -n yum-priorities %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/priorities.conf @@ -514,7 +532,36 @@ fi /usr/lib/yum-plugins/remove-with-leaves.* %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/remove-with-leaves.conf +%files -n yum-post-transaction-actions +%defattr(-, root, root) +/usr/lib/yum-plugins/post-transaction-actions.* +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/post-transaction-actions.conf +%doc plugins/post-transaction-actions/sample.action +# Default *.action file dropping dir. +%dir %{_sysconfdir}/yum/post-actions + +%files -n yum-rpm-warm-cache +%defattr(-, root, root) +/usr/lib/yum-plugins/rpm-warm-cache.* +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/rpm-warm-cache.conf + + %changelog +* Wed Dec 17 2008 Tim Lauridsen +- mark as 1.1.19 + +* Wed Dec 10 2008 Seth Vidal +- add find-repos-of-install from James' stash of misc stuff + +* Wed Oct 29 2008 Tim Lauridsen +- mark as 1.1.18 + +* Mon Oct 27 2008 Seth Vidal +- add rpm-warm-cache plugin + +* Fri Sep 19 2008 Tim Lauridsen +- removed skip-broken plugin + * Wed Sep 17 2008 Tim Lauridsen - mark as 1.1.17 @@ -532,7 +579,7 @@ fi - add verifytree * Wed May 21 2008 Tim Lauridsen - Make yum-fastestmirror %%files handle the fastestmirror-asyncore.py file + 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 From 32a05365a9c509be882d3d354195de790b3a03af Mon Sep 17 00:00:00 2001 From: Tim Lauridsen Date: Sun, 1 Mar 2009 13:00:26 +0000 Subject: [PATCH 10/12] Release 1.1.20 --- sources | 2 +- yum-utils.spec | 298 +++++++++++++++++++++++++++++-------------------- 2 files changed, 179 insertions(+), 121 deletions(-) diff --git a/sources b/sources index 519c500..af43973 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ebd74b37c9d87ebcce43670f94ceedf4 yum-utils-1.1.19.tar.gz +cb98191c2545b72edecf26ba46ded94a yum-utils-1.1.20.tar.gz diff --git a/yum-utils.spec b/yum-utils.spec index 4cb46ea..ba11d0c 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.19 +Version: 1.1.20 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools @@ -8,7 +8,7 @@ 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.20 +Requires: python >= 2.4 , yum >= 3.2.22 %description yum-utils is a collection of utilities and examples for the yum package @@ -21,6 +21,9 @@ yum-debug-dump and yum-groups-manager. %package -n yum-updateonboot Summary: Run yum update on system boot Group: System Environment/Base +Provides: yum-updateonboot +Obsoletes: yum-updateonboot < 1.1.20-0 +Conflicts: yum-updateonboot < 1.1.20-0 Requires: python, yum >= 2.4 Requires(pre): chkconfig Requires(post): chkconfig @@ -30,275 +33,325 @@ Runs yum update on system boot. This allows machines that have been turned off for an extended amount of time to become secure immediately, instead of waiting until the next early morning cron job. -%package -n yum-changelog +%package -n yum-plugin-changelog Summary: Yum plugin for viewing package changelogs before/after updating Group: System Environment/Base -Requires: yum >= 3.0 +Provides: yum-changelog +Obsoletes: yum-changelog < 1.1.20-0 +Conflicts: yum-changelog < 1.1.20-0 +Requires: yum >= 3.2.19 Requires: python-dateutil -%description -n yum-changelog +%description -n yum-plugin-changelog This plugin adds a command line option to allow viewing package changelog deltas before or after updating packages. -%package -n yum-fastestmirror +%package -n yum-plugin-fastestmirror Summary: Yum plugin which chooses fastest repository from a mirrorlist Group: System Environment/Base +Provides: yum-fastestmirror +Obsoletes: yum-fastestmirror < 1.1.20-0 +Conflicts: yum-fastestmirror < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-fastestmirror +%description -n yum-plugin-fastestmirror This plugin sorts each repository's mirrorlist by connection speed prior to downloading packages. -%package -n yum-fedorakmod -Summary: Yum plugin to handle fedora kernel modules. -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. -kmod-foo kernel modules is described by the Fedora Extras packaging standards. - -%package -n yum-protectbase +%package -n yum-plugin-protectbase Summary: Yum plugin to protect packages from certain repositories. Group: System Environment/Base +Provides: yum-protectbase +Obsoletes: yum-protectbase < 1.1.20-0 +Conflicts: yum-protectbase < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-protectbase +%description -n yum-plugin-protectbase This plugin allows certain repositories to be protected. Packages in the protected repositories can't be overridden by packages in non-protected repositories even if the non-protected repo has a later version. -%package -n yum-versionlock +%package -n yum-plugin-versionlock Summary: Yum plugin to lock specified packages from being updated Group: System Environment/Base +Provides: yum-versionlock +Obsoletes: yum-versionlock < 1.1.20-0 +Conflicts: yum-versionlock < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-versionlock +%description -n yum-plugin-versionlock 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 +%package -n yum-plugin-tsflags Summary: Yum plugin to add tsflags by a commandline option Group: System Environment/Base +Provides: yum-tsflags +Obsoletes: yum-tsflags < 1.1.20-0 +Conflicts: yum-tsflags < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-tsflags +%description -n yum-plugin-tsflags This plugin allows you to specify optional transaction flags on the yum command line -%package -n yum-kernel-module -Summary: Yum plugin to handle kernel-module-foo type of kernel module -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 -kernels are installed. - - -%package -n yum-downloadonly +%package -n yum-plugin-downloadonly Summary: Yum plugin to add downloadonly command option Group: System Environment/Base +Provides: yum-downloadonly +Obsoletes: yum-downloadonly < 1.1.20-0 +Conflicts: yum-downloadonly < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-downloadonly +%description -n yum-plugin-downloadonly This plugin adds a --downloadonly flag to yum so that yum will only download the packages and not install/update them. -%package -n yum-allowdowngrade +%package -n yum-plugin-allowdowngrade Summary: Yum plugin to enable manual downgrading of packages Group: System Environment/Base +Provides: yum-allowdowngrade +Obsoletes: yum-allowdowngrade < 1.1.20-0 +Conflicts: yum-allowdowngrade < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-allowdowngrade +%description -n yum-plugin-allowdowngrade This plugin adds a --allow-downgrade flag to yum to make it possible to manually downgrade packages to specific versions. -%package -n yum-skip-broken -Summary: Yum plugin to handle skiping packages with dependency problems -Group: System Environment/Base -Requires: yum >= 3.0 - -%description -n yum-skip-broken -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 +%package -n yum-plugin-priorities Summary: plugin to give priorities to packages from different repos Group: System Environment/Base +Provides: yum-priorities +Obsoletes: yum-priorities < 1.1.20-0 +Conflicts: yum-priorities < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-priorities +%description -n yum-plugin-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. -%package -n yum-refresh-updatesd +%package -n yum-plugin-refresh-updatesd Summary: Tell yum-updatesd to check for updates when yum exits Group: System Environment/Base +Provides: yum-refresh-updatesd +Obsoletes: yum-refresh-updatesd < 1.1.20-0 +Conflicts: yum-refresh-updatesd < 1.1.20-0 Requires: yum >= 3.0 Requires: yum-updatesd -%description -n yum-refresh-updatesd +%description -n yum-plugin-refresh-updatesd yum-refresh-updatesd tells yum-updatesd to check for updates when yum exits. This way, if you run 'yum update' and install all available updates, puplet will almost instantly update itself to reflect this. -%package -n yum-merge-conf +%package -n yum-plugin-merge-conf Summary: Yum plugin to merge configuration changes when installing packages Group: System Environment/Base +Provides: yum-merge-conf +Obsoletes: yum-merge-conf < 1.1.20-0 +Conflicts: yum-merge-conf < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-merge-conf +%description -n yum-plugin-merge-conf This yum plugin adds the "--merge-conf" command line option. With this option, Yum will ask you what to do with config files which have changed on updating a package. -%package -n yum-security +%package -n yum-plugin-security Summary: Yum plugin to enable security filters Group: System Environment/Base +Provides: yum-security +Obsoletes: yum-security < 1.1.20-0 +Conflicts: yum-security < 1.1.20-0 Requires: yum >= 3.2.18 -%description -n yum-security +%description -n yum-plugin-security 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. -%package -n yum-protect-packages +%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 +Obsoletes: yum-protect-packages < 1.1.20-0 +Conflicts: yum-protect-packages < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-protect-packages +%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-basearchonly +%package -n yum-plugin-basearchonly Summary: Yum plugin to let Yum install only basearch packages. Group: System Environment/Base +Provides: yum-basearchonly +Obsoletes: yum-basearchonly < 1.1.20-0 +Conflicts: yum-basearchonly < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-basearchonly +%description -n yum-plugin-basearchonly this plugin makes Yum only install basearch packages on multiarch systems. If you type 'yum install foo' on a x68_64 system, only 'foo-x.y.x86_46.rpm' is installed. 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 +%package -n yum-plugin-upgrade-helper Summary: Yum plugin to help upgrades to the next distribution version Group: System Environment/Base +Provides: yum-upgrade-helper +Obsoletes: yum-upgrade-helper < 1.1.20-0 +Conflicts: yum-upgrade-helper < 1.1.20-0 Requires: yum >= 3.0 -%description -n yum-upgrade-helper +%description -n yum-plugin-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. -%package -n yum-aliases +%package -n yum-plugin-aliases Summary: Yum plugin to enable aliases filters Group: System Environment/Base +Provides: yum-aliases +Obsoletes: yum-aliases < 1.1.20-0 +Conflicts: yum-aliases < 1.1.20-0 Requires: yum >= 3.0.5 -%description -n yum-aliases +%description -n yum-plugin-aliases This plugin adds the command alias, and parses the aliases config. file to enable aliases. -%package -n yum-list-data +%package -n yum-plugin-list-data Summary: Yum plugin to list aggregate package data Group: System Environment/Base +Provides: yum-list-data +Obsoletes: yum-list-data < 1.1.20-0 +Conflicts: yum-list-data < 1.1.20-0 Requires: yum >= 3.0.5 -%description -n yum-list-data +%description -n yum-plugin-list-data 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 +%package -n yum-plugin-filter-data Summary: Yum plugin to list filter based on package data Group: System Environment/Base +Provides: yum-filter-data +Obsoletes: yum-filter-data < 1.1.20-0 +Conflicts: yum-filter-data < 1.1.20-0 Requires: yum >= 3.2.17 -%description -n yum-filter-data +%description -n yum-plugin-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 +%package -n yum-plugin-tmprepo Summary: Yum plugin to add temporary repositories Group: System Environment/Base +Provides: yum-tmprepo +Obsoletes: yum-tmprepo < 1.1.20-0 +Conflicts: yum-tmprepo < 1.1.20-0 Requires: yum >= 3.2.11 Requires: createrepo -%description -n yum-tmprepo +%description -n yum-plugin-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. -%package -n yum-verify +%package -n yum-plugin-verify Summary: Yum plugin to add verify command, and options Group: System Environment/Base +Provides: yum-verify +Obsoletes: yum-verify < 1.1.20-0 +Conflicts: yum-verify < 1.1.20-0 Requires: yum >= 3.2.12 -%description -n yum-verify +%description -n yum-plugin-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. -%package -n yum-keys +%package -n yum-plugin-keys Summary: Yum plugin to deal with signing keys Group: System Environment/Base +Provides: yum-keys +Obsoletes: yum-keys < 1.1.20-0 +Conflicts: yum-keys < 1.1.20-0 Requires: yum >= 3.2.19 -%description -n yum-keys +%description -n yum-plugin-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-remove-with-leaves +%package -n yum-plugin-remove-with-leaves Summary: Yum plugin to remove dependencies which are no longer used because of a removal Group: System Environment/Base +Provides: yum-remove-with-leaves +Obsoletes: yum-remove-with-leaves < 1.1.20-0 +Conflicts: yum-remove-with-leaves < 1.1.20-0 Requires: yum >= 3.2.19 -%description -n yum-remove-with-leaves +%description -n yum-plugin-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-post-transaction-actions +%package -n yum-plugin-post-transaction-actions Summary: Yum plugin to run arbitrary commands when certain pkgs are acted on Group: System Environment/Base +Provides: yum-post-transaction-actions +Obsoletes: yum-post-transaction-actions < 1.1.20-0 +Conflicts: yum-post-transaction-actions < 1.1.20-0 Requires: yum >= 3.2.19 -%description -n yum-post-transaction-actions +%description -n yum-plugin-post-transaction-actions This plugin allows the user to run arbitrary actions immediately following a transaction when specified packages are changed. %package -n yum-NetworkManager-dispatcher -Summary: Yum plugin to deal with changing networks with NetworkManager +Summary: NetworkManager script which tells yum to check it's cache on network change 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. +This NetworkManager "dispatch script" forces yum to check its 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 its cached data a lot. -%package -n yum-rpm-warm-cache +%package -n yum-plugin-rpm-warm-cache Summary: Yum plugin to access the rpmdb files early to warm up access to the db Group: System Environment/Base +Provides: yum-rpm-warm-cache +Obsoletes: yum-rpm-warm-cache < 1.1.20-0 +Conflicts: yum-rpm-warm-cache < 1.1.20-0 +Requires: yum >= 3.2.19 + +%description -n yum-plugin-rpm-warm-cache +This plugin reads the rpmdb files into the system cache before accessing the +rpmdb directly. In some cases this should speed up access to rpmdb information + +%package -n yum-plugin-auto-update-debuginfo +Summary: Yum plugin to enable automatic updates to installed debuginfo packages +Group: System Environment/Base Requires: yum >= 3.2.19 -%description -n yum-rpm-warm-cache -This plugin reads the rpmdb files into the system cache before accessing the -rpmdb directly. In some cases this should speed up access to rpmdb information +%description -n yum-plugin-auto-update-debuginfo +This plugin looks to see if any debuginfo packages are installed, and if there +are it enables all debuginfo repositories that are "children" of enabled +repositories. %prep %setup -q @@ -312,11 +365,9 @@ make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install plugins="\ changelog \ fastestmirror \ - fedorakmod \ protectbase \ versionlock \ tsflags \ - kernel-module \ downloadonly \ allowdowngrade \ priorities \ @@ -335,6 +386,7 @@ plugins="\ remove-with-leaves \ post-transaction-actions \ rpm-warm-cache \ + auto-update-debuginfo \ " mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ @@ -401,29 +453,24 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/yum-updateonboot %{_initrddir}/yum-updateonboot -%files -n yum-changelog +%files -n yum-plugin-changelog %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/changelog.conf /usr/lib/yum-plugins/changelog.* %{_mandir}/man1/yum-changelog.1.* %{_mandir}/man5/yum-changelog.conf.5.* -%files -n yum-fastestmirror +%files -n yum-plugin-fastestmirror %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fastestmirror.conf /usr/lib/yum-plugins/fastestmirror*.* -%files -n yum-fedorakmod -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fedorakmod.conf -/usr/lib/yum-plugins/fedorakmod.* - -%files -n yum-protectbase +%files -n yum-plugin-protectbase %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protectbase.conf /usr/lib/yum-plugins/protectbase.* -%files -n yum-versionlock +%files -n yum-plugin-versionlock %defattr(-, root, root) %doc plugins/versionlock/README %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.conf @@ -432,93 +479,88 @@ fi %{_mandir}/man1/yum-versionlock.1.* %{_mandir}/man5/yum-versionlock.conf.5.* -%files -n yum-tsflags +%files -n yum-plugin-tsflags %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tsflags.conf /usr/lib/yum-plugins/tsflags.* -%files -n yum-kernel-module -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/kernel-module.conf -/usr/lib/yum-plugins/kernel-module.* - -%files -n yum-downloadonly +%files -n yum-plugin-downloadonly %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/downloadonly.conf /usr/lib/yum-plugins/downloadonly.* -%files -n yum-allowdowngrade +%files -n yum-plugin-allowdowngrade %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/allowdowngrade.conf /usr/lib/yum-plugins/allowdowngrade.* -%files -n yum-priorities +%files -n yum-plugin-priorities %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/priorities.conf /usr/lib/yum-plugins/priorities.* -%files -n yum-refresh-updatesd +%files -n yum-plugin-refresh-updatesd %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-updatesd.conf /usr/lib/yum-plugins/refresh-updatesd.* -%files -n yum-merge-conf +%files -n yum-plugin-merge-conf %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/merge-conf.conf /usr/lib/yum-plugins/merge-conf.* -%files -n yum-security +%files -n yum-plugin-security %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/security.conf /usr/lib/yum-plugins/security.* %{_mandir}/man8/yum-security.8.* -%files -n yum-protect-packages +%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-basearchonly +%files -n yum-plugin-basearchonly %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/basearchonly.conf /usr/lib/yum-plugins/basearchonly.* -%files -n yum-upgrade-helper +%files -n yum-plugin-upgrade-helper %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/upgrade-helper.conf /usr/lib/yum-plugins/upgrade-helper.* -%files -n yum-aliases +%files -n yum-plugin-aliases %defattr(-, root, root) %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 +%files -n yum-plugin-list-data %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 +%files -n yum-plugin-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 +%files -n yum-plugin-tmprepo %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tmprepo.conf /usr/lib/yum-plugins/tmprepo.* -%files -n yum-verify +%files -n yum-plugin-verify %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/verify.conf /usr/lib/yum-plugins/verify.* %{_mandir}/man1/yum-verify.1.* -%files -n yum-keys +%files -n yum-plugin-keys %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/keys.conf /usr/lib/yum-plugins/keys.* @@ -527,12 +569,12 @@ fi %defattr(-, root, root) /etc/NetworkManager/dispatcher.d/* -%files -n yum-remove-with-leaves +%files -n yum-plugin-remove-with-leaves %defattr(-, root, root) /usr/lib/yum-plugins/remove-with-leaves.* %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/remove-with-leaves.conf -%files -n yum-post-transaction-actions +%files -n yum-plugin-post-transaction-actions %defattr(-, root, root) /usr/lib/yum-plugins/post-transaction-actions.* %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/post-transaction-actions.conf @@ -540,13 +582,29 @@ fi # Default *.action file dropping dir. %dir %{_sysconfdir}/yum/post-actions -%files -n yum-rpm-warm-cache +%files -n yum-plugin-rpm-warm-cache %defattr(-, root, root) /usr/lib/yum-plugins/rpm-warm-cache.* %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/rpm-warm-cache.conf +%files -n yum-plugin-auto-update-debuginfo +%defattr(-, root, root) +/usr/lib/yum-plugins/auto-update-debuginfo.* +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/auto-update-debuginfo.conf + %changelog +* Sun Mar 1 2009 Tim Lauridsen +- mark as 1.1.20 +- rename plugins from yum-name to yum-plugin-name + +* Wed Feb 25 2009 Tim Lauridsen +- Remove yum-kernel-module & yum-fedorakmod plugins (no obsoleting yet) +- Remove yum-skip-broken plugin leftovers + +* Tue Feb 3 2009 James Antill +- add auto-update-debuginfo plugin + * Wed Dec 17 2008 Tim Lauridsen - mark as 1.1.19 From 2d941a9886172f8f4c3f768e5bb3eaab07780acc Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:12:45 +0000 Subject: [PATCH 11/12] 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 c9e5c1f3132534c1fe0882b6bc1a6f4fdcf84a29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 18:32:26 +0000 Subject: [PATCH 12/12] 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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9