[createrepo/f19: 3/3] Merge branch 'master' into f19

[Zdeněk Pavlas]

commit beaa76dd45dbc0907273f73736b597af1927cf65
Merge: 89db2b6 b974faf
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Fri Oct 18 14:24:17 2013 +0200

    Merge branch 'master' into f19

 .gitignore            |    1 +
 createrepo-drpm.patch |   78 --
 createrepo-head.patch | 2195 -------------------------------------------------
 createrepo.spec       |   17 +-
 sources               |    2 +-
 5 files changed, 13 insertions(+), 2280 deletions(-)
---
diff --cc createrepo.spec
index 3be7694,f00c024..34b077c
--- a/createrepo.spec
+++ b/createrepo.spec
@@@ -59,6 -57,13 +57,13 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitelib}/createrepo
  
  %changelog
+ * Fri Oct 18 2013 Zdenek Pavlas <zpavlas at redhat.com> - 0.10-0
+ - update to latest HEAD
 -- Don't spawn more workers that #pkgfiles.
++- Don't spawn more workers than #pkgfiles.
+ - abort if $PWD does not exist. BZ 1001629
+ - mergerepo: merge package versions from multiple repos. BZ 1020756
+ - mergerepo: --repo option should work with relative paths.
+ 
  * Tue Oct  1 2013 Zdenek Pavlas <zpavlas at redhat.com> - 0.9.9-23
  - update to latest HEAD
  - docs: Escape dashes in command-line options