[yum-utils] Update to latest HEAD.

Zdeněk Pavlas zpavlas at fedoraproject.org
Mon Jan 14 12:31:18 UTC 2013 

commit 2f3174c0b2c3140c19f2ff15070ee1f606143e76
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Mon Jan 14 13:30:48 2013 +0100

    Update to latest HEAD.

 yum-utils-HEAD.patch |  268 ++++++++++++++++++++++++++++++++++++++++++++++----
 yum-utils.spec       |   71 +++++++------
 2 files changed, 286 insertions(+), 53 deletions(-)
---
diff --git a/yum-utils-HEAD.patch b/yum-utils-HEAD.patch
index ba851fe..bb499ec 100644
--- a/yum-utils-HEAD.patch
+++ b/yum-utils-HEAD.patch
@@ -1814,7 +1814,7 @@ index a3bb111..a854c23 100755
          # setup the fake repos
          for repo in opts.repofrompath:
 diff --git a/reposync.py b/reposync.py
-index 7950854..f868594 100755
+index 7950854..a749973 100755
 --- a/reposync.py
 +++ b/reposync.py
 @@ -11,8 +11,8 @@
@@ -1846,10 +1846,29 @@ index 7950854..f868594 100755
      parser.add_option("--source", default=False, dest="source", action="store_true",
                        help='operate on source packages')
      parser.add_option("-r", "--repoid", default=[], action='append',
-@@ -162,6 +162,12 @@ def main():
+@@ -153,15 +153,27 @@ def main():
+         opts.tempcache = True
+ 
+     if opts.tempcache:
+-        cachedir = getCacheDir()
+-        if cachedir is None:
++        if not my.setCacheDir(force=True):
+             print >> sys.stderr, "Error: Could not make cachedir, exiting"
+             sys.exit(50)
+-            
+-        my.repos.setCacheDir(cachedir)
++        my.conf.uid = 1 # force locking of user cache
      elif opts.cachedir:
          my.repos.setCacheDir(opts.cachedir)
  
++    # Lock if they've not given an explicit cachedir
++    if not opts.cachedir:
++        try:
++            my.doLock()
++        except yum.Errors.LockError, e:
++            print >> sys.stderr, "Error: %s" % e
++            sys.exit(50)
++
 +    #  Use progress bar display when downloading repo metadata
 +    # and package files ... needs to be setup before .repos (ie. RHN/etc.).
 +    if not opts.quiet:
@@ -1859,7 +1878,7 @@ index 7950854..f868594 100755
      if len(opts.repoid) > 0:
          myrepos = []
          
-@@ -182,13 +188,6 @@ def main():
+@@ -182,13 +194,6 @@ def main():
          print >> sys.stderr, "Error: Can't use --norepopath with multiple repositories"
          sys.exit(1)
  
@@ -1873,7 +1892,15 @@ index 7950854..f868594 100755
      try:
          arches = rpmUtils.arch.getArchList(opts.arch)
          if opts.source:
-@@ -277,73 +276,48 @@ def main():
+@@ -199,6 +204,7 @@ def main():
+         # maybe this shouldn't be entirely fatal
+         sys.exit(1)
+     
++    exit_code = 0
+     for repo in my.repos.listEnabled():
+         reposack = ListPackageSack(my.pkgSack.returnPackages(repoid=repo.id))
+ 
+@@ -277,73 +283,47 @@ def main():
              urlgrabber.progress.text_meter_total_size(remote_size)
  
          download_list.sort(sortPkgObj)
@@ -1945,7 +1972,6 @@ index 7950854..f868594 100755
 +            pkg.repo.cache = 0
 +
 +        # use downloader from YumBase
-+        exit_code = 0
 +        probs = my.downloadPkgs(download_list)
 +        if probs:
 +            exit_code = 1
@@ -2577,10 +2603,10 @@ index 1d37231..20e8e5c 100644
  # mode: shell-script
  # sh-basic-offset: 4
 diff --git a/yum-utils.spec b/yum-utils.spec
-index ce7fb64..cdefb85 100644
+index ce7fb64..16b568e 100644
 --- a/yum-utils.spec
 +++ b/yum-utils.spec
-@@ -1,3 +1,9 @@
+@@ -1,4 +1,11 @@
 +%if 0%{?rhel}
 +%define package_yum_updatesd 0
 +%else
@@ -2588,9 +2614,11 @@ index ce7fb64..cdefb85 100644
 +%endif
 +
  %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
++%define pluginhome /usr/lib/yum-plugins
  
  Summary: Utilities based around the yum package manager
-@@ -105,18 +111,6 @@ Requires: yum >= 3.0
+ Name: yum-utils
+@@ -105,18 +112,6 @@ Requires: yum >= 3.0
  This plugin allows you to specify optional transaction flags on the yum
  command line
  
@@ -2609,7 +2637,7 @@ index ce7fb64..cdefb85 100644
  %package -n yum-plugin-priorities
  Summary: plugin to give priorities to packages from different repos
  Group: System Environment/Base
-@@ -130,6 +124,7 @@ This plugin allows repositories to have different priorities.
+@@ -130,6 +125,7 @@ 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.
  
@@ -2617,7 +2645,7 @@ index ce7fb64..cdefb85 100644
  %package -n yum-plugin-refresh-updatesd
  Summary: Tell yum-updatesd to check for updates when yum exits
  Group: System Environment/Base
-@@ -143,6 +138,7 @@ Requires: yum-updatesd
+@@ -143,6 +139,7 @@ Requires: yum-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.
@@ -2625,7 +2653,16 @@ index ce7fb64..cdefb85 100644
  
  %package -n yum-plugin-merge-conf
  Summary: Yum plugin to merge configuration changes when installing packages
-@@ -395,9 +391,7 @@ plugins="\
+@@ -290,7 +287,7 @@ This plugin allows the user to run arbitrary actions immediately following a
+ transaction when specified packages are changed.
+ 
+ %package -n yum-NetworkManager-dispatcher
+-Summary: NetworkManager script which tells yum to check it's cache on network change
++Summary: NetworkManager script which tells yum to check its cache on network change
+ Group: System Environment/Base
+ Requires: yum >= 3.2.17
+ 
+@@ -395,9 +392,7 @@ plugins="\
   protectbase \
   versionlock \
   tsflags \
@@ -2635,20 +2672,31 @@ index ce7fb64..cdefb85 100644
   merge-conf \
   security \
   upgrade-helper \
-@@ -418,6 +412,12 @@ plugins="\
+@@ -418,14 +413,20 @@ plugins="\
   puppetverify \
  "
  
+-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
 +%if %{package_yum_updatesd}
 +plugins="$plugins \
 + refresh-updatesd \
 +"
 +%endif
 +
- mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
++mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/%pluginhome
  mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/post-actions
  
-@@ -469,8 +469,8 @@ fi
+ cd plugins
+ 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/
+-    %{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT/usr/lib/yum-plugins', 1)"
++    install -m 644 $plug/*.py $RPM_BUILD_ROOT/%pluginhome
++    %{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT/%pluginhome', 1)"
+ 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/
+@@ -469,8 +470,8 @@ fi
  %{_bindir}/yum-builddep
  %{_bindir}/yum-config-manager
  %{_bindir}/yum-debug-dump
@@ -2658,7 +2706,7 @@ index ce7fb64..cdefb85 100644
  %{_bindir}/show-installed
  %{_bindir}/show-changed-rco
  %{_sbindir}/yum-complete-transaction
-@@ -487,6 +487,7 @@ fi
+@@ -487,6 +488,7 @@ fi
  %{_mandir}/man1/show-installed.1.*
  %{_mandir}/man1/yum-builddep.1.*
  %{_mandir}/man1/yum-debug-dump.1.*
@@ -2666,32 +2714,210 @@ index ce7fb64..cdefb85 100644
  %{_mandir}/man8/yum-complete-transaction.8.*
  %{_mandir}/man1/yum-groups-manager.1.*
  %{_mandir}/man8/yumdb.8.*
-@@ -533,23 +534,19 @@ fi
- %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tsflags.conf
- /usr/lib/yum-plugins/tsflags.*
+@@ -502,7 +504,7 @@ fi
+ %defattr(-, root, root)
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/changelog.conf
+ %doc COPYING
+-/usr/lib/yum-plugins/changelog.*
++%{pluginhome}/changelog.*
+ %{_mandir}/man1/yum-changelog.1.*
+ %{_mandir}/man5/yum-changelog.conf.5.*
+ 
+@@ -510,20 +512,20 @@ fi
+ %defattr(-, root, root)
+ %doc COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fastestmirror.conf
+-/usr/lib/yum-plugins/fastestmirror*.*
++%{pluginhome}/fastestmirror*.*
  
+ %files -n yum-plugin-protectbase
+ %defattr(-, root, root)
+ %doc COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protectbase.conf
+-/usr/lib/yum-plugins/protectbase.*
++%{pluginhome}/protectbase.*
+ 
+ %files -n yum-plugin-versionlock
+ %defattr(-, root, root)
+ %doc plugins/versionlock/README COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.conf
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.list
+-/usr/lib/yum-plugins/versionlock.*
++%{pluginhome}/versionlock.*
+ %{_mandir}/man1/yum-versionlock.1.*
+ %{_mandir}/man5/yum-versionlock.conf.5.*
+ 
+@@ -531,85 +533,81 @@ fi
+ %defattr(-, root, root)
+ %doc COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tsflags.conf
+-/usr/lib/yum-plugins/tsflags.*
+-
 -%files -n yum-plugin-downloadonly
 -%defattr(-, root, root)
 -%doc COPYING
 -%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/downloadonly.conf
 -/usr/lib/yum-plugins/downloadonly.*
--
++%{pluginhome}/tsflags.*
+ 
  %files -n yum-plugin-priorities
  %defattr(-, root, root)
  %doc COPYING
  %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/priorities.conf
- /usr/lib/yum-plugins/priorities.*
+-/usr/lib/yum-plugins/priorities.*
++%{pluginhome}/priorities.*
  
 +%if %{package_yum_updatesd}
  %files -n yum-plugin-refresh-updatesd
  %defattr(-, root, root)
  %doc COPYING
  %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-updatesd.conf
- /usr/lib/yum-plugins/refresh-updatesd.*
+-/usr/lib/yum-plugins/refresh-updatesd.*
++%{pluginhome}/refresh-updatesd.*
 +%endif
  
  %files -n yum-plugin-merge-conf
  %defattr(-, root, root)
+ %doc COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/merge-conf.conf
+-/usr/lib/yum-plugins/merge-conf.*
++%{pluginhome}/merge-conf.*
+ 
+ %files -n yum-plugin-security
+ %defattr(-, root, root)
+ %doc COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/security.conf
+-/usr/lib/yum-plugins/security.*
++%{pluginhome}/security.*
+ %{_mandir}/man8/yum-security.8.*
+ 
+ %files -n yum-plugin-upgrade-helper
+ %defattr(-, root, root)
+ %doc COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/upgrade-helper.conf
+-/usr/lib/yum-plugins/upgrade-helper.*
++%{pluginhome}/upgrade-helper.*
+ 
+ %files -n yum-plugin-aliases
+ %defattr(-, root, root)
+ %doc COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/aliases.conf
+ %config(noreplace) %{_sysconfdir}/yum/aliases.conf
+-/usr/lib/yum-plugins/aliases.*
++%{pluginhome}/aliases.*
+ %{_mandir}/man1/yum-aliases.1.*
+ 
+ %files -n yum-plugin-list-data
+ %defattr(-, root, root)
+ %doc COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/list-data.conf
+-/usr/lib/yum-plugins/list-data.*
++%{pluginhome}/list-data.*
+ %{_mandir}/man1/yum-list-data.1.*
+ 
+ %files -n yum-plugin-filter-data
+ %defattr(-, root, root)
+ %doc COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/filter-data.conf
+-/usr/lib/yum-plugins/filter-data.*
++%{pluginhome}/filter-data.*
+ %{_mandir}/man1/yum-filter-data.1.*
+ 
+ %files -n yum-plugin-tmprepo
+ %defattr(-, root, root)
+ %doc COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tmprepo.conf
+-/usr/lib/yum-plugins/tmprepo.*
++%{pluginhome}/tmprepo.*
+ 
+ %files -n yum-plugin-verify
+ %defattr(-, root, root)
+ %doc COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/verify.conf
+-/usr/lib/yum-plugins/verify.*
++%{pluginhome}/verify.*
+ %{_mandir}/man1/yum-verify.1.*
+ 
+ %files -n yum-plugin-keys
+ %defattr(-, root, root)
+ %doc COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/keys.conf
+-/usr/lib/yum-plugins/keys.*
++%{pluginhome}/keys.*
+ 
+ %files -n yum-NetworkManager-dispatcher
+ %defattr(-, root, root)
+@@ -619,13 +617,13 @@ fi
+ %files -n yum-plugin-remove-with-leaves
+ %defattr(-, root, root)
+ %doc COPYING
+-/usr/lib/yum-plugins/remove-with-leaves.*
++%{pluginhome}/remove-with-leaves.*
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/remove-with-leaves.conf
+ 
+ %files -n yum-plugin-post-transaction-actions
+ %defattr(-, root, root)
+ %doc COPYING
+-/usr/lib/yum-plugins/post-transaction-actions.*
++%{pluginhome}/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.
+@@ -634,19 +632,19 @@ fi
+ %files -n yum-plugin-rpm-warm-cache
+ %defattr(-, root, root)
+ %doc COPYING
+-/usr/lib/yum-plugins/rpm-warm-cache.*
++%{pluginhome}/rpm-warm-cache.*
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/rpm-warm-cache.conf
+ 
+ %files -n yum-plugin-auto-update-debug-info
+ %defattr(-, root, root)
+ %doc COPYING
+-/usr/lib/yum-plugins/auto-update-debuginfo.*
++%{pluginhome}/auto-update-debuginfo.*
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/auto-update-debuginfo.conf
+ 
+ %files -n yum-plugin-show-leaves
+ %defattr(-, root, root)
+ %doc COPYING
+-/usr/lib/yum-plugins/show-leaves.*
++%{pluginhome}/show-leaves.*
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/show-leaves.conf
+ 
+ %files -n yum-plugin-local
+@@ -654,13 +652,13 @@ fi
+ %doc COPYING
+ %ghost %{_sysconfdir}/yum.repos.d/_local.repo
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/local.conf
+-/usr/lib/yum-plugins/local.*
++%{pluginhome}/local.*
+ 
+ %files -n yum-plugin-fs-snapshot
+ %defattr(-, root, root)
+ %doc COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fs-snapshot.conf
+-/usr/lib/yum-plugins/fs-snapshot.*
++%{pluginhome}/fs-snapshot.*
+ %{_mandir}/man1/yum-fs-snapshot.1.*
+ %{_mandir}/man5/yum-fs-snapshot.conf.5.*
+ 
+@@ -668,13 +666,13 @@ fi
+ %defattr(-, root, root)
+ %doc COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/ps.conf
+-/usr/lib/yum-plugins/ps.*
++%{pluginhome}/ps.*
+ 
+ %files -n yum-plugin-puppetverify
+ %defattr(-, root, root)
+ %doc COPYING
+ %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/puppetverify.conf
+-/usr/lib/yum-plugins/puppetverify.*
++%{pluginhome}/puppetverify.*
+ 
+ %changelog
+ * Thu Aug 10 2011 Tim Lauridsen <timlau at fedoraproject.org> 
 diff --git a/yumdb.py b/yumdb.py
 index 8a4888e..4e549cd 100755
 --- a/yumdb.py
diff --git a/yum-utils.spec b/yum-utils.spec
index 0950349..ab5c74b 100644
--- a/yum-utils.spec
+++ b/yum-utils.spec
@@ -5,11 +5,12 @@
 %endif
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%define pluginhome /usr/lib/yum-plugins
 
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.1.31
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz
@@ -288,7 +289,7 @@ This plugin allows the user to run arbitrary actions immediately following a
 transaction when specified packages are changed.
 
 %package -n yum-NetworkManager-dispatcher
-Summary: NetworkManager script which tells yum to check it's cache on network change
+Summary: NetworkManager script which tells yum to check its cache on network change
 Group: System Environment/Base
 Requires: yum >= 3.2.17
 
@@ -422,14 +423,14 @@ plugins="$plugins \
 "
 %endif
 
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/%pluginhome
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/post-actions
 
 cd plugins
 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/
-    %{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT/usr/lib/yum-plugins', 1)"
+    install -m 644 $plug/*.py $RPM_BUILD_ROOT/%pluginhome
+    %{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT/%pluginhome', 1)"
 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/
@@ -507,7 +508,7 @@ fi
 %defattr(-, root, root)
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/changelog.conf
 %doc COPYING
-/usr/lib/yum-plugins/changelog.*
+%{pluginhome}/changelog.*
 %{_mandir}/man1/yum-changelog.1.*
 %{_mandir}/man5/yum-changelog.conf.5.*
 
@@ -515,20 +516,20 @@ fi
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fastestmirror.conf
-/usr/lib/yum-plugins/fastestmirror*.*
+%{pluginhome}/fastestmirror*.*
 
 %files -n yum-plugin-protectbase
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protectbase.conf
-/usr/lib/yum-plugins/protectbase.*
+%{pluginhome}/protectbase.*
 
 %files -n yum-plugin-versionlock
 %defattr(-, root, root)
 %doc plugins/versionlock/README COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.conf
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.list
-/usr/lib/yum-plugins/versionlock.*
+%{pluginhome}/versionlock.*
 %{_mandir}/man1/yum-versionlock.1.*
 %{_mandir}/man5/yum-versionlock.conf.5.*
 
@@ -536,81 +537,81 @@ fi
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tsflags.conf
-/usr/lib/yum-plugins/tsflags.*
+%{pluginhome}/tsflags.*
 
 %files -n yum-plugin-priorities
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/priorities.conf
-/usr/lib/yum-plugins/priorities.*
+%{pluginhome}/priorities.*
 
 %if %{package_yum_updatesd}
 %files -n yum-plugin-refresh-updatesd
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-updatesd.conf
-/usr/lib/yum-plugins/refresh-updatesd.*
+%{pluginhome}/refresh-updatesd.*
 %endif
 
 %files -n yum-plugin-merge-conf
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/merge-conf.conf
-/usr/lib/yum-plugins/merge-conf.*
+%{pluginhome}/merge-conf.*
 
 %files -n yum-plugin-security
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/security.conf
-/usr/lib/yum-plugins/security.*
+%{pluginhome}/security.*
 %{_mandir}/man8/yum-security.8.*
 
 %files -n yum-plugin-upgrade-helper
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/upgrade-helper.conf
-/usr/lib/yum-plugins/upgrade-helper.*
+%{pluginhome}/upgrade-helper.*
 
 %files -n yum-plugin-aliases
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/aliases.conf
 %config(noreplace) %{_sysconfdir}/yum/aliases.conf
-/usr/lib/yum-plugins/aliases.*
+%{pluginhome}/aliases.*
 %{_mandir}/man1/yum-aliases.1.*
 
 %files -n yum-plugin-list-data
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/list-data.conf
-/usr/lib/yum-plugins/list-data.*
+%{pluginhome}/list-data.*
 %{_mandir}/man1/yum-list-data.1.*
 
 %files -n yum-plugin-filter-data
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/filter-data.conf
-/usr/lib/yum-plugins/filter-data.*
+%{pluginhome}/filter-data.*
 %{_mandir}/man1/yum-filter-data.1.*
 
 %files -n yum-plugin-tmprepo
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tmprepo.conf
-/usr/lib/yum-plugins/tmprepo.*
+%{pluginhome}/tmprepo.*
 
 %files -n yum-plugin-verify
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/verify.conf
-/usr/lib/yum-plugins/verify.*
+%{pluginhome}/verify.*
 %{_mandir}/man1/yum-verify.1.*
 
 %files -n yum-plugin-keys
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/keys.conf
-/usr/lib/yum-plugins/keys.*
+%{pluginhome}/keys.*
 
 %files -n yum-NetworkManager-dispatcher
 %defattr(-, root, root)
@@ -620,13 +621,13 @@ fi
 %files -n yum-plugin-remove-with-leaves
 %defattr(-, root, root)
 %doc COPYING
-/usr/lib/yum-plugins/remove-with-leaves.*
+%{pluginhome}/remove-with-leaves.*
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/remove-with-leaves.conf
 
 %files -n yum-plugin-post-transaction-actions
 %defattr(-, root, root)
 %doc COPYING
-/usr/lib/yum-plugins/post-transaction-actions.*
+%{pluginhome}/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.
@@ -635,19 +636,19 @@ fi
 %files -n yum-plugin-rpm-warm-cache
 %defattr(-, root, root)
 %doc COPYING
-/usr/lib/yum-plugins/rpm-warm-cache.*
+%{pluginhome}/rpm-warm-cache.*
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/rpm-warm-cache.conf
 
 %files -n yum-plugin-auto-update-debug-info
 %defattr(-, root, root)
 %doc COPYING
-/usr/lib/yum-plugins/auto-update-debuginfo.*
+%{pluginhome}/auto-update-debuginfo.*
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/auto-update-debuginfo.conf
 
 %files -n yum-plugin-show-leaves
 %defattr(-, root, root)
 %doc COPYING
-/usr/lib/yum-plugins/show-leaves.*
+%{pluginhome}/show-leaves.*
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/show-leaves.conf
 
 %files -n yum-plugin-local
@@ -655,13 +656,13 @@ fi
 %doc COPYING
 %ghost %{_sysconfdir}/yum.repos.d/_local.repo
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/local.conf
-/usr/lib/yum-plugins/local.*
+%{pluginhome}/local.*
 
 %files -n yum-plugin-fs-snapshot
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fs-snapshot.conf
-/usr/lib/yum-plugins/fs-snapshot.*
+%{pluginhome}/fs-snapshot.*
 %{_mandir}/man1/yum-fs-snapshot.1.*
 %{_mandir}/man5/yum-fs-snapshot.conf.5.*
 
@@ -669,18 +670,24 @@ fi
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/ps.conf
-/usr/lib/yum-plugins/ps.*
+%{pluginhome}/ps.*
 
 %files -n yum-plugin-puppetverify
 %defattr(-, root, root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/puppetverify.conf
-/usr/lib/yum-plugins/puppetverify.*
+%{pluginhome}/puppetverify.*
 
 %changelog
-* Wed Nov 21 2012 Zdenek Pavlas <zpavlas at redhat.com> - 1.1.31-8
+* Wed Nov 21 2013 Zdenek Pavlas <zpavlas at redhat.com> - 1.1.31-9
+- Update to latest HEAD.
+- Added pluginhome %define to get rid of hardcoded paths
+- Fix yum-NetworkManager-dispatcher description, BZ 894729
+- reposync should lock. BZ 880722
+- Initialize exit_code correctly.  BZ 882536
+
+* Mon Jan 14 2013 Zdenek Pavlas <zpavlas at redhat.com> - 1.1.31-8
 - Update to latest HEAD.
-- Remove downloadonly plugin.
 
 * Wed Aug  8 2012 Zdenek Pavlas <zpavlas at redhat.com> - 1.1.31-7
 - Update to latest HEAD.

More information about the scm-commits mailing list