Fixed conflict in 'ChangeLog'

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-12-03 14:34:47 -05:00
15 changed files with 201 additions and 8 deletions

View File

@@ -135,6 +135,8 @@ touch $RPM_BUILD_ROOT/.qt/qt
rm -rf $RPM_BUILD_ROOT/@libexecdir@/logos
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
cp conf/logrotate-sample $RPM_BUILD_ROOT/etc/logrotate.d/rivendell
mkdir -p $RPM_BUILD_ROOT%{_datadir}/rivendell
cp conf/rivendell-env.sh $RPM_BUILD_ROOT%{_datadir}/rivendell/
mkdir -p $RPM_BUILD_ROOT/@DOC_PATH@/logos
cp icons/webget_logo.png $RPM_BUILD_ROOT/@DOC_PATH@/logos/
cp AUTHORS $RPM_BUILD_ROOT/@DOC_PATH@/
@@ -205,6 +207,9 @@ fi
if test ! -e /etc/asound.conf ; then
cp @DOC_PATH@/asound.conf-sample /etc/asound.conf
fi
if test ! -e /etc/profile.d/rivendell-env.sh ; then
cp /usr/share/rivendell/rivendell-env.sh /etc/profile.d/
fi
%{_sbindir}/rddbmgr --modify
/bin/systemctl restart rivendell
/bin/systemctl enable rivendell
@@ -294,6 +299,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/rdmemcheck.sh
%{_bindir}/rdrender
%{_datadir}/rivendell/*.qm
%{_datadir}/rivendell/rivendell-env.sh
%{_datadir}/icons/hicolor/16x16/apps/rivendell.png
%{_datadir}/icons/hicolor/16x16/apps/rdadmin.png
%{_datadir}/icons/hicolor/16x16/apps/rdairplay.png