Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-28 06:32:32 +02:00
Code Issues Projects Releases Wiki Activity

2019-05-02 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified the 'rivendell-pypad' RPM package always to use
	Python 3.6.
This commit is contained in:
Fred Gleason 2019-05-02 15:14:39 -04:00
parent b0e92a7899
commit f8e3632e04
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18632,3 +18632,6 @@
2019-05-01 Fred Gleason <fredg@paravelsystems.com> 2019-05-01 Fred Gleason <fredg@paravelsystems.com>
* Fixed bugs in the 'Import' Web API call that caused import of * Fixed bugs in the 'Import' Web API call that caused import of
filenames containing multibyte UTF-8 characters to fail. filenames containing multibyte UTF-8 characters to fail.
2019-05-02 Fred Gleason <fredg@paravelsystems.com>
* Modified the 'rivendell-pypad' RPM package always to use
Python 3.6.

12
rivendell.spec.in
View File

@ -19,7 +19,7 @@
## ##
# So python bytecompilation works correctly # So python bytecompilation works correctly
%define __python /usr/bin/python3.4 %define __python /usr/bin/python3.6
Summary: Radio Broadcast Automation System Summary: Radio Broadcast Automation System
Name: rivendell Name: rivendell
@ -51,7 +51,7 @@ Requires: rivendell = @VERSION@, rivendell-webapi = @VERSION@
%package pypad %package pypad
Summary: PyPAD Program Associated Data script system for Rivendell Summary: PyPAD Program Associated Data script system for Rivendell
Requires: python34, python34-pycurl, python34-requests, python34-pyserial, python34-mysql Requires: python36, python36-pycurl, python36-requests, python36-pyserial, python36-mysql
%package select %package select
Summary: The RDSelect system selector tool for Rivendell. Summary: The RDSelect system selector tool for Rivendell.
@ -109,7 +109,7 @@ associated with.
%build %build
export PYTHON=/usr/bin/python3.4 export PYTHON=/usr/bin/python3.6
%configure --libexecdir=@libexecdir@ --sysconfdir=@sysconfdir@ @RDXPORTDEBUG@ %configure --libexecdir=@libexecdir@ --sysconfdir=@sysconfdir@ @RDXPORTDEBUG@
make -j 10 make -j 10
@ -157,7 +157,7 @@ cp scripts/engine_conv.py $RPM_BUILD_ROOT/@DOC_PATH@
cp scripts/init_template_host.py $RPM_BUILD_ROOT/@DOC_PATH@ cp scripts/init_template_host.py $RPM_BUILD_ROOT/@DOC_PATH@
rm -f $RPM_BUILD_ROOT/etc/auto.rd.audiostore rm -f $RPM_BUILD_ROOT/etc/auto.rd.audiostore
rm -rf $RPM_BUILD_ROOT%{_libdir}/rivendell/pypad/__pycache__ rm -rf $RPM_BUILD_ROOT%{_libdir}/rivendell/pypad/__pycache__
rm -rf $RPM_BUILD_ROOT%{_libdir}/python3.4/site-packages/__pycache__ rm -rf $RPM_BUILD_ROOT%{_libdir}/python3.6/site-packages/__pycache__
%post %post
/sbin/ldconfig /sbin/ldconfig
@ -484,8 +484,8 @@ rm -rf $RPM_BUILD_ROOT
%files pypad %files pypad
%{_libdir}/rivendell/pypad/* %{_libdir}/rivendell/pypad/*
%{_libdir}/python3.4/site-packages/pypad* %{_libdir}/python3.6/site-packages/pypad*
%{_libdir}/python3.4/site-packages/__pycache__/pypad* %{_libdir}/python3.6/site-packages/__pycache__/pypad*
%post pypad %post pypad