anaconda-yum-plugins is now in its own source repo.

7 files changed, 2 insertions, 172 deletions

diff --git a/Makefile b/Makefile
index cad490a23..cb48c80d0 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ CVSROOT ?= ${CVSROOT:-$(shell cat CVS/Root 2>/dev/null)}
 
 SUBDIRS = isys loader po \
 	    textw utils scripts bootdisk installclasses \
-	    iw pixmaps command-stubs ui docs yum-plugins
+	    iw pixmaps command-stubs ui docs
 # fonts aren't on s390/s390x
 ifeq (,$(filter s390 s390x, $(ARCH)))
 SUBDIRS += fonts
diff --git a/anaconda.spec b/anaconda.spec
index 23e3784d2..137d8b7e2 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -135,6 +135,7 @@ Requires: yum-utils >= %{yumutilsver}
 Requires: NetworkManager >= %{nmver}
 Requires: dhclient
 Requires: dhcpv6-client
+Requires: anaconda-yum-plugins
 Obsoletes: anaconda-images <= 10
 Obsoletes: anaconda-runtime < %{version}-%{release}
 Provides: anaconda-runtime = %{version}-%{release}
@@ -143,15 +144,6 @@ Provides: anaconda-runtime = %{version}-%{release}
 The anaconda package contains the program which was used to install your 
 system.  These files are of little use on an already installed system.
 
-%package yum-plugins
-Summary:  Installation-related yum plugins
-Group:    Applications/System
-Requires: python, yum
-
-%description yum-plugins
-The anaconda yum-plugins package contains yum plugins that are useful for
-anaconda and other system installation-related programs.
-
 %prep
 %setup -q
 
@@ -209,11 +201,6 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu
 %{_datadir}/applications/*.desktop
 %endif
 
-%files yum-plugins
-%defattr(-,root,root)
-%{_sysconfdir}/yum/pluginconf.d/*
-%{_prefix}/lib/yum-plugins/*
-
 %triggerun -- anaconda < 8.0-1
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
diff --git a/yum-plugins/Makefile b/yum-plugins/Makefile
deleted file mode 100644
index af9e6e951..000000000
--- a/yum-plugins/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Makefile
-#
-# Copyright (C) 2008  Red Hat, Inc.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-include ../Makefile.inc
-
-all:
-	echo "nothing to make"
-
-install: 
-	mkdir -p $(DESTDIR)/etc/yum/pluginconf.d
-	install *.conf $(DESTDIR)/etc/yum/pluginconf.d
-	mkdir -p $(DESTDIR)/usr/lib/yum-plugins
-	install *.py $(DESTDIR)/usr/lib/yum-plugins
-	../py-compile --basedir $(DESTDIR)/usr/lib/yum-plugins $(DESTDIR)/usr/lib/yum-plugins/*.py
-
-clean:
-	rm -f *.pyc
-
-depend:
diff --git a/yum-plugins/blacklist.conf b/yum-plugins/blacklist.conf
deleted file mode 100644
index 0692d21c8..000000000
--- a/yum-plugins/blacklist.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[main]
-enabled=0
diff --git a/yum-plugins/blacklist.py b/yum-plugins/blacklist.py
deleted file mode 100644
index 0fce5cf26..000000000
--- a/yum-plugins/blacklist.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (C) 2008
-# Red Hat, Inc.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author(s): Chris Lumens <clumens@redhat.com>
-
-# This yum plugin handles the upgrade blacklist.  This is a repo-specific
-# metadata file that tells us about packages that have been obsoleted by
-# some other package and should therefore be removed on upgrade.  Usually
-# packages themselves provide this information through Obsoletes:, but
-# with multilib we can't always count on that.
-from yum.plugins import TYPE_CORE
-
-try:
-    from xml.etree import cElementTree
-except ImportError:
-    import cElementTree
-
-iterparse = cElementTree.iterparse
-
-requires_api_version = '2.6'
-plugin_type = (TYPE_CORE, )
-
-def exclude_hook(conduit):
-    rpmdb = conduit.getRpmDB()
-    tsinfo = conduit.getTsInfo()
-
-    for repo in conduit.getRepos().listEnabled():
-        try:
-            infile = repo.retrieveMD("group")
-        except:
-            continue
-
-        for event, elem in iterparse(infile):
-            if elem.tag == "blacklist":
-                for child in elem.getchildren():
-                    if elem.tag != "package":
-                        continue
-
-                    name = elem.get("name")
-                    try:
-                        arch = elem.get("arch")
-                    except:
-                        arch = None
-
-                    for po in rpmdb.searchNevra(name=name, arch=arch):
-                        tsinfo.addErase(po)
diff --git a/yum-plugins/whiteout.conf b/yum-plugins/whiteout.conf
deleted file mode 100644
index 0692d21c8..000000000
--- a/yum-plugins/whiteout.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[main]
-enabled=0
diff --git a/yum-plugins/whiteout.py b/yum-plugins/whiteout.py
deleted file mode 100644
index 3d45f4671..000000000
--- a/yum-plugins/whiteout.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (C) 2008
-# Red Hat, Inc.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author(s): Chris Lumens <clumens@redhat.com>
-
-# This yum plugin handles the whiteout file.  The whiteout is a repo-specific
-# metadata file that is used to break loops in dependencies.
-from yum.plugins import TYPE_CORE
-import rpm
-
-try:
-    from xml.etree import cElementTree
-except ImportError:
-    import cElementTree
-
-iterparse = cElementTree.iterparse
-
-requires_api_version = '2.6'
-plugin_type = (TYPE_CORE, )
-
-def postreposetup_hook(conduit):
-    whiteout = ""
-    lst = []
-
-    # Merge the whiteout from all enabled repos together.
-    for repo in conduit.getRepos().listEnabled():
-        try:
-            infile = repo.retrieveMD("group")
-        except:
-            continue
-
-        for event, elem in iterparse(infile):
-            if elem.tag == "whiteout":
-                for child in elem.getchildren():
-                    if child.tag != "ignoredep":
-                        continue
-
-                    lst.append("%s>%s" % (child.get("package"), child.get("requires")))
-
-    whiteout = " ".join(lst)
-
-    rpm.addMacro("_dependency_whiteout", whiteout)