Blob Blame Raw
From dda48bc6076f4a075e26d09d374f313724ce693f Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Mon, 28 Nov 2016 10:48:11 +0100
Subject: [PATCH] don't install torproxy under py2

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
 dnf-plugins-extras.spec | 4 ----
 plugins/CMakeLists.txt  | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/dnf-plugins-extras.spec b/dnf-plugins-extras.spec
index 1f491fc..09b2525 100644
--- a/dnf-plugins-extras.spec
+++ b/dnf-plugins-extras.spec
@@ -398,9 +398,6 @@ popd
 
 %find_lang %{name}
 
-# no python2-torproxy
-rm -rf %{buildroot}%{python2_sitelib}/dnf-plugins/torproxy.*
-
 %check
 PYTHONPATH="%{buildroot}%{python2_sitelib}:%{buildroot}%{python2_sitelib}/dnf-plugins/" nosetests-%{python2_version} -s tests/
 PYTHONPATH="%{buildroot}%{python3_sitelib}:%{buildroot}%{python3_sitelib}/dnf-plugins/" nosetests-%{python3_version} -s tests/
@@ -524,5 +521,4 @@ PYTHONPATH="%{buildroot}%{python3_sitelib}:%{buildroot}%{python3_sitelib}/dnf-pl
 %{python3_sitelib}/dnf-plugins/torproxy.*
 %{python3_sitelib}/dnf-plugins/__pycache__/torproxy.*
 
-
 %changelog
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 11190d6..e23394e 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,5 +1,6 @@
 if (${PYTHON_DESIRED} STREQUAL "3")
 INSTALL (FILES rpm_conf.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
+INSTALL (FILES torproxy.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
 else()
 INSTALL (FILES migrate.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
 endif()
@@ -11,7 +12,6 @@ INSTALL (FILES repograph.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
 INSTALL (FILES repomanage.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
 INSTALL (FILES show_leaves.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
 INSTALL (FILES snapper.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
-INSTALL (FILES torproxy.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
 INSTALL (FILES tracer.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
 INSTALL (FILES versionlock.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
 INSTALL (FILES kickstart.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
-- 
2.10.2