Re: Remove the python2 subpackage from Fedora and RHEL > 7 as well as fix the tutorial build.

[Charalampos Stratakis <cstratak@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 607 bytes --]

----- Original Message -----
> From: "Charalampos Stratakis" <cstratak@redhat.com>
> To: systemtap@sourceware.org
> Sent: Wednesday, March 21, 2018 2:51:55 PM
> Subject: Remove the python2 subpackage from Fedora and RHEL > 7 as well as fix the tutorial build.
> 
> Originating PR downstream:
> https://src.fedoraproject.org/rpms/systemtap/pull-request/3#
> 
> --
> Regards,
> 
> Charalampos Stratakis
> Software Engineer
> Python Maintenance Team, Red Hat
> 

A small correction to the macros so resending the patches.

-- 
Regards,

Charalampos Stratakis
Software Engineer
Python Maintenance Team, Red Hat

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-Half-hearted-attempt-to-make-the-tutorial-build-agai.patch --]
[-- Type: text/x-patch; name=0002-Half-hearted-attempt-to-make-the-tutorial-build-agai.patch, Size: 1287 bytes --]

From 6241e705528079a20feed1b8485927ebdf243c4b Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori@redhat.com>
Date: Fri, 16 Mar 2018 14:47:55 +0000
Subject: [PATCH 2/2] Half-hearted attempt to make the tutorial build again

See https://bugzilla.redhat.com/show_bug.cgi?id=1557351
---
 doc/tutorial.tex | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/doc/tutorial.tex b/doc/tutorial.tex
index 5e1774771..dcb45f898 100644
--- a/doc/tutorial.tex
+++ b/doc/tutorial.tex
@@ -5,7 +5,6 @@
 % later version.
 
 \documentclass[compatible]{article}
-\usepackage{html}
 \usepackage{graphicx}
 % \usepackage{moreverb}
 \usepackage{fancyvrb}
@@ -18,8 +17,8 @@
 \usepackage{charter}
 
 \newenvironment{boxedminipage}%% Boxed minipage
-    {\begin{makeimage}\begin{center}\begin{Sbox}\begin{minipage}}%
-    {\end{minipage}\end{Sbox}\fbox{\TheSbox}\end{center}\end{makeimage}}
+    {\begin{center}\begin{Sbox}\begin{minipage}}%
+    {\end{minipage}\end{Sbox}\fbox{\TheSbox}\end{center}}
 
 \newcommand{\nomenclature}[2]{}
 
@@ -1109,9 +1108,6 @@ and a live GIT source repository.  Come join us!
 \section{Glossary}
 % \renewcommand{\nomname}{}
 % \printglossary
-% \begin{htmlonly}
-{\em Sorry, no glossary available.}
-% \end{htmlonly}
 
 \section{Errors}
 
-- 
2.14.3


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0001-Drop-Python-2-subpackage-in-future-systems.patch --]
[-- Type: text/x-patch; name=0001-Drop-Python-2-subpackage-in-future-systems.patch, Size: 1430 bytes --]

From b3acf7e851c4ef43bc052cc35b0e36852454fba9 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori@redhat.com>
Date: Fri, 16 Mar 2018 14:47:55 +0000
Subject: [PATCH 1/2] Drop Python 2 subpackage in future systems

---
 systemtap.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/systemtap.spec b/systemtap.spec
index 61a1cd9db..5a90da505 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -34,8 +34,8 @@
 %endif
 %{!?with_pyparsing: %global with_pyparsing 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
 %{!?with_python3: %global with_python3 0%{?fedora} >= 23 || 0%{?rhel} > 7}
-%{!?with_python2_probes: %global with_python2_probes 1}
-%{!?with_python3_probes: %global with_python3_probes 0%{?fedora} >= 23}
+%{!?with_python2_probes: %global with_python2_probes (0%{?fedora} <= 28 && 0%{?rhel} <= 7)}
+%{!?with_python3_probes: %global with_python3_probes (0%{?fedora} >= 23 || 0%{?rhel} > 7)}
 %{!?with_httpd: %global with_httpd 0}
 
 %ifarch ppc64le aarch64
@@ -421,6 +421,11 @@ License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 
+%if ! (%{with_python2_probes})
+# Provide an clean upgrade path when the python2 package is removed
+Obsoletes: %{name}-runtime-python2 < %{version}-%{release}
+%endif
+
 %description runtime-python3
 This package includes support files needed to run systemtap scripts
 that probe python 3 processes.
-- 
2.14.3