dist-git conversion

#2781)

Makefile

@@ -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 $$/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)

repoclosure-class-api.patch

@@ -1,14 +0,0 @@
---- a/repoclosure.py
-+++ b/repoclosure.py
-@@ -63,8 +63,10 @@ def parseArgs():
-     (opts, args) = parser.parse_args()
-     return (opts, args)
- 
-+#  Note that this is a "real" API, used by spam-o-matic etc.
-+# so we have to do at least some API guarantee stuff.
- class RepoClosure(yum.YumBase):
--    def __init__(self, pkgonly, arch = [], config = "/etc/yum.conf", builddeps = False ):
-+    def __init__(self, arch=[], config="/etc/yum.conf", builddeps=False, pkgonly=None):
-         yum.YumBase.__init__(self)
-         self.logger = logging.getLogger("yum.verbose.repoclosure")
-         self.arch = arch

sources

@@ -1 +1 @@
-3d19fd09adf74780b08fe0f5b0f77efe  yum-utils-1.1.21.tar.gz
+6e5c0e3143b098912728d00a5934db76  yum-utils-1.1.23.tar.gz

yum-utils.spec

@@ -1,15 +1,14 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.1.21
-Release: 2%{?dist}
+Version: 1.1.23
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz
-Patch1: yumdownloader-syntax-fix-2009-03-28.patch
 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.22
+Requires: python >= 2.4 , yum >= 3.2.23
 
 %description
 yum-utils is a collection of utilities and examples for the yum package
@@ -17,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 and yum-groups-manager.
+yum-debug-dump, yum-debug-restore and yum-groups-manager.
 
 %package -n yum-updateonboot
 Summary: Run yum update on system boot
@@ -37,7 +36,8 @@ Group: System Environment/Base
 Provides: yum-changelog = %{version}-%{release}
 Obsoletes: yum-changelog < 1.1.20-0
 Conflicts: yum-changelog < 1.1.20-0
-Requires: yum >= 3.2.19
+# changelog requires new update_md.UpdateMetadata() API in 3.2.23
+Requires: yum >= 3.2.23
 Requires: python-dateutil
 
 %description -n yum-plugin-changelog
@@ -75,7 +75,7 @@ Group: System Environment/Base
 Provides: yum-versionlock = %{version}-%{release}
 Obsoletes: yum-versionlock < 1.1.20-0
 Conflicts: yum-versionlock < 1.1.20-0
-Requires: yum >= 3.0
+Requires: yum >= 3.2.24
 
 %description -n yum-plugin-versionlock
 This plugin takes a set of name/versions for packages and excludes all other
@@ -107,18 +107,6 @@ Requires: yum >= 3.0
 This plugin adds a --downloadonly flag to yum so that yum will only download
 the packages and not install/update them.
 
-%package -n yum-plugin-allowdowngrade
-Summary: Yum plugin to enable manual downgrading of packages
-Group: System Environment/Base
-Provides: yum-allowdowngrade = %{version}-%{release}
-Obsoletes: yum-allowdowngrade < 1.1.20-0
-Conflicts: yum-allowdowngrade < 1.1.20-0
-Requires: yum >= 3.0
-
-%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-plugin-priorities
 Summary: plugin to give priorities to packages from different repos
 Group: System Environment/Base
@@ -220,7 +208,8 @@ Group: System Environment/Base
 Provides: yum-aliases = %{version}-%{release}
 Obsoletes: yum-aliases < 1.1.20-0
 Conflicts: yum-aliases < 1.1.20-0
-Requires: yum >= 3.0.5
+# Requires args_hook
+Requires: yum >= 3.2.23
 
 %description -n yum-plugin-aliases
 This plugin adds the command alias, and parses the aliases config. file to
@@ -355,11 +344,18 @@ 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.
 
+%package -n yum-plugin-show-leaves
+Summary: Yum plugin which shows newly installed leaf packages
+Group: System Environment/Base
+Requires: yum >= 3.2.23
+
+%description -n yum-plugin-show-leaves
+Yum plugin which shows newly installed leaf packages
+and packages that became leaves after a transaction
+
 %prep
 %setup -q
 
-%patch1 -p1
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -373,7 +369,6 @@ plugins="\
  versionlock \
  tsflags \
  downloadonly \
- allowdowngrade \
  priorities \
  refresh-updatesd \
  merge-conf \
@@ -391,6 +386,7 @@ plugins="\
  post-transaction-actions \
  rpm-warm-cache \
  auto-update-debuginfo \
+ show-leaves \
 "
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
@@ -437,7 +433,9 @@ fi
 %{_bindir}/yum-builddep
 %{_bindir}/yum-debug-dump
 %{_bindir}/yum-groups-manager
+%{_bindir}/yum-debug-restore
 %{_sbindir}/yum-complete-transaction
+%{_sbindir}/yumdb
 %{_mandir}/man1/yum-utils.1.*
 %{_mandir}/man1/debuginfo-install.1.*
 %{_mandir}/man1/package-cleanup.1.*
@@ -493,11 +491,6 @@ fi
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/downloadonly.conf
 /usr/lib/yum-plugins/downloadonly.*
 
-%files -n yum-plugin-allowdowngrade
-%defattr(-, root, root)
-%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/allowdowngrade.conf
-/usr/lib/yum-plugins/allowdowngrade.*
-
 %files -n yum-plugin-priorities
 %defattr(-, root, root)
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/priorities.conf
@@ -596,11 +589,21 @@ fi
 /usr/lib/yum-plugins/auto-update-debuginfo.*
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/auto-update-debuginfo.conf
 
+%files -n yum-plugin-show-leaves
+%defattr(-, root, root)
+/usr/lib/yum-plugins/show-leaves.*
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/show-leaves.conf
+
 
 %changelog
-* Sat Mar 28 2009 James Antill <james@fedoraproject.org>
-- Fix yumdownloader syntax error.
-- Include newer rawhide versions of auto-debuginfo in obs.
+* Wed Sep 2 2009 Tim Lauridsen <timlau@fedoraproject.org>
+- mark as 1.1.23
+
+* Tue May 19 2009 Tim Lauridsen <timlau@fedoraproject.org>
+- mark as 1.1.22 
+
+* Mon May 18 2009 Seth Vidal <skvidal at fedoraproject.org>
+- add show-leaves plugin from Ville Skyttä
 
 * Wed Mar 25 2009 Tim Lauridsen <timlau@fedoraproject.org>
 - mark as 1.1.21 

yumdownloader-import-os.patch

@@ -1,19 +0,0 @@
-commit 8862e979ecae64d5463c8c130dea036b752de550
-Author: Seth Vidal <skvidal@fedoraproject.org>
-Date:   Mon Mar 2 16:38:52 2009 -0500
-
-    import os and os.path to make the other changes from 2 weeks ago work
-
-diff --git a/yumdownloader.py b/yumdownloader.py
-index e5e9c94..53749e9 100755
---- a/yumdownloader.py
-+++ b/yumdownloader.py
-@@ -14,6 +14,8 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
- import sys
-+import os
-+import os.path
- sys.path.insert(0,'/usr/share/yum-cli')
- 
- import yum

yumdownloader-syntax-fix-2009-03-28.patch

@@ -1,19 +0,0 @@
-commit 8ec41e7c3ccbc3ecd74cbc87f2550e330b3b5be3
-Author: James Antill <james@and.org>
-Date:   Sat Mar 28 14:00:38 2009 -0400
-
-    Fix syntax error
-
-diff --git a/yumdownloader.py b/yumdownloader.py
-index 1c4e98b..991853b 100755
---- a/yumdownloader.py
-+++ b/yumdownloader.py
-@@ -246,7 +246,7 @@ class YumDownloader(YumUtilBase):
-                     self.logger.error("Cannot write to file %s. Error was: %s" % (local, e))
-                     continue
-                 except RepoError, e:
--                    self.logger.error("Could not download/verify pkg %s: %s" % (download, e)
-+                    self.logger.error("Could not download/verify pkg %s: %s" % (download, e))
-                     continue
-     
-                 if not os.path.exists(local) or not os.path.samefile(path, local):