From 96d0a3b5b62aa9bce1bd22afb5b0b0057e182047 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Sat, 8 Jan 2022 16:35:01 -0500
Subject: [PATCH] 2022-01-08 Fred Gleason <fredg@paravelsystems.com> 	*
 Fixed a regression that broke the 'make rpm' target.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
---
 ChangeLog                        | 2 ++
 apis/pypad/api/Makefile.am       | 2 +-
 apis/rivwebpyapi/api/Makefile.am | 2 +-
 rivendell.spec.in                | 4 +---
 versions/Makefile.am             | 1 -
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fa563dc3..93edc2c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22874,3 +22874,5 @@
 2022-01-08 Fred Gleason <fredg@paravelsystems.com>
 	* Consolidated the 'pypad' and 'rivwebpyapi' Python modules into
 	a single 'rivendellaudio' package namespace.
+2022-01-08 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed a regression that broke the 'make rpm' target.
diff --git a/apis/pypad/api/Makefile.am b/apis/pypad/api/Makefile.am
index eaca2294..e41efc05 100644
--- a/apis/pypad/api/Makefile.am
+++ b/apis/pypad/api/Makefile.am
@@ -20,7 +20,7 @@
 ##
 ## Use automake to process this into a Makefile.in
 
-rivendelldir = $(pyexecdir)/rivendell
+rivendelldir = $(pyexecdir)/rivendellaudio
 rivendell_PYTHON = pypad.py
 
 CLEANFILES = *~\
diff --git a/apis/rivwebpyapi/api/Makefile.am b/apis/rivwebpyapi/api/Makefile.am
index 1c52f38b..c5c88f5a 100644
--- a/apis/rivwebpyapi/api/Makefile.am
+++ b/apis/rivwebpyapi/api/Makefile.am
@@ -20,7 +20,7 @@
 ##
 ## Use automake to process this into a Makefile.in
 
-rivendelldir = $(pyexecdir)/rivendell
+rivendelldir = $(pyexecdir)/rivendellaudio
 rivendell_PYTHON = rivwebpyapi.py
 
 CLEANFILES = *~\
diff --git a/rivendell.spec.in b/rivendell.spec.in
index 2d958d89..2ec1ac79 100644
--- a/rivendell.spec.in
+++ b/rivendell.spec.in
@@ -468,9 +468,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/librd.la
 %{_libdir}/librd.so
 %{_libdir}/rivendell/pypad/*
-%{_libdir}/python3.6/site-packages/pypad*
-%{_libdir}/python3.6/site-packages/__pycache__/pypad*
-%{_libdir}/python3.6/site-packages/rivwebpyapi/*
+%{_libdir}/python3.6/site-packages/rivendellaudio/*
 %{_sbindir}/rdservice
 %{_sbindir}/caed
 %{_sbindir}/ripcd
diff --git a/versions/Makefile.am b/versions/Makefile.am
index 36e60d5f..bbcc65e7 100644
--- a/versions/Makefile.am
+++ b/versions/Makefile.am
@@ -19,7 +19,6 @@
 ## Use automake to process this into a Makefile.in
 
 EXTRA_DIST = PACKAGE_VERSION\
-             PYPAD_VERSION\
              PYTHONAPI_VERSION\
              README.txt\
              RIVWEBCAPI_AGE\