diff --git a/ChangeLog b/ChangeLog index 49aeddef..2bc2be5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22858,3 +22858,5 @@ 2021-12-29 Fred Gleason * Fixed a bug in caed(8) that could cause segfaults when attempting to capture audio via JACK. +2022-01-04 Fred Gleason + * Removed generation of the 'rivwebpyapi' RPM package. diff --git a/Makefile.am b/Makefile.am index 4f6b5668..2c591f3d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ ## ## Top level automake.am for Rivendell ## -## (C) Copyright 2002-2021 Fred Gleason +## (C) Copyright 2002-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -73,7 +73,7 @@ maintainer-clean-local: deb: dist ./build_debs.sh -base-rpm: dist +rpm: dist mkdir -p $(HOME)/rpmbuild/SOURCES cp rivendell-$(VERSION).tar.gz $(HOME)/rpmbuild/SOURCES/ $(RPMBUILD) -ba --target $(ARCH)-$(VENDOR)-linux rivendell.spec @@ -82,16 +82,6 @@ base-rpm: dist mv $(HOME)/rpmbuild/SRPMS/rivendell-*.src.rpm $(top_srcdir)/ rm $(HOME)/rpmbuild/SOURCES/rivendell-$(VERSION).tar.gz -py-rpm: dist - mkdir -p $(HOME)/rpmbuild/SOURCES - cp rivendell-$(VERSION).tar.gz $(HOME)/rpmbuild/SOURCES/ - $(RPMBUILD) -ba --target noarch-$(VENDOR)-linux rivwebpyapi.spec - mv $(HOME)/rpmbuild/RPMS/noarch/python36-rivwebpyapi-*.rpm $(top_srcdir)/ - mv $(HOME)/rpmbuild/SRPMS/python36-rivwebpyapi-*.rpm $(top_srcdir)/ - rm $(HOME)/rpmbuild/SOURCES/rivendell-$(VERSION).tar.gz - -rpm: py-rpm base-rpm - zip: dist tar -zxf rivendell-@VERSION@.tar.gz zip -r rivendell-@VERSION@.zip rivendell-@VERSION@ @@ -105,7 +95,6 @@ EXTRA_DIST = autogen.sh\ rivendell.ism\ rivendell.pro\ rivendell.spec.in\ - rivwebpyapi.spec.in\ UPGRADING CLEANFILES = *~\ diff --git a/configure.ac b/configure.ac index 73fba4d9..1cf13197 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl dnl Autoconf configuration for Rivendell. dnl Use autoconf to process this into a configure script dnl -dnl (C) Copyright 2002-2021 Fred Gleason +dnl (C) Copyright 2002-2022 Fred Gleason dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License version 2 as @@ -594,7 +594,6 @@ ln -s ../../icons/redx.png docs/opsguide/redx.png AC_CONFIG_FILES([rivendell.spec \ - rivwebpyapi.spec \ versions/Makefile \ debian/Makefile \ debian/source/Makefile \ diff --git a/rivwebpyapi.spec.in b/rivwebpyapi.spec.in deleted file mode 100644 index 6b31bee5..00000000 --- a/rivwebpyapi.spec.in +++ /dev/null @@ -1,88 +0,0 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -@GENERATED_SCRIPT_FILE_WARNING@ - -# Turn off brp-python-bytecompile automagic -# See https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation -%global _python_bytecompile_extra 0 - -# So python bytecompilation works correctly -%define __python /usr/bin/python3.6 - -Name: python36-rivwebpyapi -Version: @VERSION@ -Release: 1%{?dist} -Summary: Python 3.6 interface for accessing the Rivendell Web API -Group: Development/Languages -License: LGPLv2 -URL: https://github.com/ElvishArtisan/rivendell -Source: rivendell-%{version}.tar.gz -Requires: python36-requests -BuildRequires: python36-devel - -%description -This is a Python 3 language binding for the Rivendell Web API. - -%prep - - -%setup -q -n rivendell-%{version} - - -%build -export PYTHON=/usr/bin/python3.6 -%configure --libexecdir=@libexecdir@ --sysconfdir=@sysconfdir@ @RDXPORTDEBUG@ - -%install -make -C apis/rivwebpyapi install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples -helpers/install_python.sh apis/rivwebpyapi/tests/add_cart.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/add_cart.py -helpers/install_python.sh apis/rivwebpyapi/tests/add_cut.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/add_cut.py -helpers/install_python.sh apis/rivwebpyapi/tests/add_log.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/add_log.py -helpers/install_python.sh apis/rivwebpyapi/tests/assign_sched_code.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/assign_sched_code.py -helpers/install_python.sh apis/rivwebpyapi/tests/audio_info.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/audio_info.py -helpers/install_python.sh apis/rivwebpyapi/tests/audio_store.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/audio_store.py -helpers/install_python.sh apis/rivwebpyapi/tests/delete_audio.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/delete_audio.py -helpers/install_python.sh apis/rivwebpyapi/tests/delete_log.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/delete_log.py -helpers/install_python.sh apis/rivwebpyapi/tests/edit_cart.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/edit_cart.py -helpers/install_python.sh apis/rivwebpyapi/tests/edit_cut.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/edit_cut.py -helpers/install_python.sh apis/rivwebpyapi/tests/export_peaks.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/export_peaks.py -helpers/install_python.sh apis/rivwebpyapi/tests/export.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/export.py -helpers/install_python.sh apis/rivwebpyapi/tests/get_podcast.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/get_podcast.py -helpers/install_python.sh apis/rivwebpyapi/tests/import.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/import.py -helpers/install_python.sh apis/rivwebpyapi/tests/list_cart.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/list_cart.py -helpers/install_python.sh apis/rivwebpyapi/tests/list_cart_sched_codes.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/list_cart_sched_codes.py -helpers/install_python.sh apis/rivwebpyapi/tests/list_carts.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/list_carts.py -helpers/install_python.sh apis/rivwebpyapi/tests/list_cut.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/list_cut.py -helpers/install_python.sh apis/rivwebpyapi/tests/list_cuts.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/list_cuts.py -helpers/install_python.sh apis/rivwebpyapi/tests/list_group.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/list_group.py -helpers/install_python.sh apis/rivwebpyapi/tests/list_groups.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/list_groups.py -helpers/install_python.sh apis/rivwebpyapi/tests/list_log.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/list_log.py -helpers/install_python.sh apis/rivwebpyapi/tests/list_logs.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/list_logs.py -helpers/install_python.sh apis/rivwebpyapi/tests/list_scheduler_codes.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/list_scheduler_codes.py -helpers/install_python.sh apis/rivwebpyapi/tests/list_services.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/list_services.py -helpers/install_python.sh apis/rivwebpyapi/tests/list_system_settings.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/list_system_settings.py -helpers/install_python.sh apis/rivwebpyapi/tests/lock_log.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/lock_log.py -helpers/install_python.sh apis/rivwebpyapi/tests/post_image.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/post_image.py -helpers/install_python.sh apis/rivwebpyapi/tests/post_podcast.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/post_podcast.py -helpers/install_python.sh apis/rivwebpyapi/tests/post_rss.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/post_rss.py -helpers/install_python.sh apis/rivwebpyapi/tests/rehash.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/rehash.py -helpers/install_python.sh apis/rivwebpyapi/tests/remove_cart.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/remove_cart.py -helpers/install_python.sh apis/rivwebpyapi/tests/remove_cut.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/remove_cut.py -helpers/install_python.sh apis/rivwebpyapi/tests/remove_image.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/remove_image.py -helpers/install_python.sh apis/rivwebpyapi/tests/remove_podcast.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/remove_podcast.py -helpers/install_python.sh apis/rivwebpyapi/tests/remove_rss.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/remove_rss.py -helpers/install_python.sh apis/rivwebpyapi/tests/save_log.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/save_log.py -helpers/install_python.sh apis/rivwebpyapi/tests/save_podcast.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/save_podcast.py -helpers/install_python.sh apis/rivwebpyapi/tests/trim_audio.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/trim_audio.py -helpers/install_python.sh apis/rivwebpyapi/tests/unassign_sched_code.py $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/examples/unassign_sched_code.py -cp LICENSES/LGPLv2.txt $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/ - -%files -/usr/lib64/python3.6/site-packages/rivwebpyapi/* -%{_datadir}/doc/%{name}-%{version} - - -%changelog -* @RPM_DATESTAMP@ Fred Gleason - @VERSION@-@RPM_RELEASE@ --- Autogenerated from build tree.