Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-11 17:13:47 +02:00
Code Issues Projects Releases Wiki Activity

2018-03-25 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored the RPM spec file to determine target distro at
	build time.
This commit is contained in:
Fred Gleason
2018-03-25 18:01:58 -04:00
parent 1057fb16d2
commit 975ed69ed5
3 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -16751,3 +16751,6 @@
* Added support for log notifications to the RDXport service. * Added support for log notifications to the RDXport service.
2018-03-25 Fred Gleason <fredg@paravelsystems.com> 2018-03-25 Fred Gleason <fredg@paravelsystems.com>
* Added support for log notifications to rdairplay(1). * Added support for log notifications to rdairplay(1).
2018-03-25 Fred Gleason <fredg@paravelsystems.com>
* Refactored the RPM spec file to determine target distro at
build time.

3
configure.ac
View File

@@ -24,6 +24,7 @@ AM_INIT_AUTOMAKE
AC_SUBST(RPM_RELEASE,1) AC_SUBST(RPM_RELEASE,1)
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
PKG_VERSION=m4_esyscmd(cat PACKAGE_VERSION)
# #
# Some Fully Resolved Install Paths # Some Fully Resolved Install Paths
@@ -120,10 +121,12 @@ if test $ar_gcc_distro = suse ; then
AC_SUBST(MYSQL_PKG,"mysql") AC_SUBST(MYSQL_PKG,"mysql")
AC_SUBST(QT3_MYSQL_PKG,"qt3-mysql") AC_SUBST(QT3_MYSQL_PKG,"qt3-mysql")
AC_SUBST(QT3_DEVEL_PKG,"qt3-devel") AC_SUBST(QT3_DEVEL_PKG,"qt3-devel")
AC_SUBST(DOC_PATH,"/usr/share/doc")
else else
AC_SUBST(APACHE_PKG,"httpd") AC_SUBST(APACHE_PKG,"httpd")
AC_SUBST(APACHE_CONFIG_DIR,"/etc/httpd/conf.d") AC_SUBST(APACHE_CONFIG_DIR,"/etc/httpd/conf.d")
AC_SUBST(CONSOLEHELPER_RDALSACONFIG,"/usr/bin/rdalsaconfig-root") AC_SUBST(CONSOLEHELPER_RDALSACONFIG,"/usr/bin/rdalsaconfig-root")
AC_SUBST(DOC_PATH,"/usr/share/doc/rivendell-$PKG_VERSION")
if test $ar_distro_major -ge 7 ; then if test $ar_distro_major -ge 7 ; then
AC_SUBST(USERMODE_PKG,"usermode usermode-gtk") AC_SUBST(USERMODE_PKG,"usermode usermode-gtk")
AC_SUBST(MYSQL_PKG,"mariadb") AC_SUBST(MYSQL_PKG,"mariadb")

78
rivendell.spec.in
View File

@@ -116,52 +116,46 @@ if test "@WIN32_SOURCE@" ; then
mkdir -p $RPM_BUILD_ROOT/var/win32 mkdir -p $RPM_BUILD_ROOT/var/win32
cp @WIN32_SOURCE@ $RPM_BUILD_ROOT/var/win32/ cp @WIN32_SOURCE@ $RPM_BUILD_ROOT/var/win32/
fi fi
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version} mkdir -p $RPM_BUILD_ROOT/@DOC_PATH@
cp AUTHORS $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ cp AUTHORS $RPM_BUILD_ROOT/@DOC_PATH@/
cp ChangeLog $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ cp ChangeLog $RPM_BUILD_ROOT/@DOC_PATH@/
cp COPYING $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ cp COPYING $RPM_BUILD_ROOT/@DOC_PATH@/
cp INSTALL $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ cp INSTALL $RPM_BUILD_ROOT/@DOC_PATH@/
cp NEWS $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ cp NEWS $RPM_BUILD_ROOT/@DOC_PATH@/
cp README $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ cp README $RPM_BUILD_ROOT/@DOC_PATH@/
cp UPGRADING $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ cp UPGRADING $RPM_BUILD_ROOT/@DOC_PATH@/
cp CODINGSTYLE $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ cp CODINGSTYLE $RPM_BUILD_ROOT/@DOC_PATH@/
cp conf/*.conf $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ cp conf/*.conf $RPM_BUILD_ROOT/@DOC_PATH@/
cp conf/rd.conf-sample $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ cp conf/rd.conf-sample $RPM_BUILD_ROOT/@DOC_PATH@/
cp conf/my.cnf-master $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ cp conf/my.cnf-master $RPM_BUILD_ROOT/@DOC_PATH@/
cp conf/my.cnf-standby $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ cp conf/my.cnf-standby $RPM_BUILD_ROOT/@DOC_PATH@/
cp conf/asound.conf-sample $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ cp conf/asound.conf-sample $RPM_BUILD_ROOT/@DOC_PATH@/
cp utils/sas_shim/rc.sas_shim $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ cp utils/sas_shim/rc.sas_shim $RPM_BUILD_ROOT/@DOC_PATH@/
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc mkdir -p $RPM_BUILD_ROOT/@DOC_PATH@/misc
cp docs/misc/colors $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc/ cp docs/misc/colors $RPM_BUILD_ROOT/@DOC_PATH@/misc/
cp docs/misc/pam_rd.txt $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc/ cp docs/misc/pam_rd.txt $RPM_BUILD_ROOT/@DOC_PATH@/misc/
cp docs/misc/reports.txt $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc/ cp docs/misc/reports.txt $RPM_BUILD_ROOT/@DOC_PATH@/misc/
cp docs/misc/ALSA.txt $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc/ cp docs/misc/ALSA.txt $RPM_BUILD_ROOT/@DOC_PATH@/misc/
cp docs/misc/RDMONITOR.txt $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc/ cp docs/misc/RDMONITOR.txt $RPM_BUILD_ROOT/@DOC_PATH@/misc/
cp docs/misc/scheduler_formats.ods $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc/ cp docs/misc/scheduler_formats.ods $RPM_BUILD_ROOT/@DOC_PATH@/misc/
cp docs/misc/ando_interface.odt $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc/ cp docs/misc/ando_interface.odt $RPM_BUILD_ROOT/@DOC_PATH@/misc/
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version} mkdir -p $RPM_BUILD_ROOT/@DOC_PATH@
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/apis mkdir -p $RPM_BUILD_ROOT/@DOC_PATH@/apis
cp docs/apis/*.pdf $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/apis/ cp docs/apis/*.pdf $RPM_BUILD_ROOT/@DOC_PATH@/apis/
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/tables mkdir -p $RPM_BUILD_ROOT/@DOC_PATH@/tables
cp docs/tables/*.txt $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/tables/ cp docs/tables/*.txt $RPM_BUILD_ROOT/@DOC_PATH@/tables/
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/scripts mkdir -p $RPM_BUILD_ROOT/@DOC_PATH@/scripts
cp scripts/rd_backup $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/scripts/ cp scripts/rd_backup $RPM_BUILD_ROOT/@DOC_PATH@/scripts/
cp scripts/start_traverso.sh $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/scripts/ cp scripts/start_traverso.sh $RPM_BUILD_ROOT/@DOC_PATH@/scripts/
cp scripts/rd_mysql_enable_host.sh $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/scripts/ cp scripts/rd_mysql_enable_host.sh $RPM_BUILD_ROOT/@DOC_PATH@/scripts/
cp scripts/rd_backup_system.sh $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/scripts/ cp scripts/rd_backup_system.sh $RPM_BUILD_ROOT/@DOC_PATH@/scripts/
cp scripts/rd_restore_system.sh $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/scripts/ cp scripts/rd_restore_system.sh $RPM_BUILD_ROOT/@DOC_PATH@/scripts/
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-importers-%{version} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-importers-%{version}
cp scripts/engine_conv.py $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-importers-%{version}/ cp scripts/engine_conv.py $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-importers-%{version}/
%post %post
ldconfig ldconfig
if test "@DISTRO@" = "suse" ; then
PACKAGE_DOC_DIR=%_docdir/%{name}
fi
if test "@DISTRO@" = "redhat" ; then
PACKAGE_DOC_DIR=%_docdir/%{name}-@VERSION@
fi
/usr/sbin/groupadd -r -g 150 %{name} &>/dev/null || : /usr/sbin/groupadd -r -g 150 %{name} &>/dev/null || :
/usr/sbin/useradd -o -u 150 -g %{name} -s /bin/false -r -c "Rivendell radio automation system" -d /var/snd %{name} &>/dev/null || : /usr/sbin/useradd -o -u 150 -g %{name} -s /bin/false -r -c "Rivendell radio automation system" -d /var/snd %{name} &>/dev/null || :
if test ! -e /var/snd ; then if test ! -e /var/snd ; then
@@ -175,7 +169,7 @@ if test ! -d /etc/rivendell.d ; then
chmod 775 /etc/rivendell.d chmod 775 /etc/rivendell.d
fi fi
if test ! -e /etc/rd.conf ; then if test ! -e /etc/rd.conf ; then
cp $PACKAGE_DOC_DIR/rd.conf-sample /etc/rivendell.d/rd-default.conf cp @DOC_PATH@/rd.conf-sample /etc/rivendell.d/rd-default.conf
ln -s /etc/rivendell.d/rd-default.conf /etc/rd.conf ln -s /etc/rivendell.d/rd-default.conf /etc/rd.conf
fi fi
if test ! -h /etc/rd.conf ; then if test ! -h /etc/rd.conf ; then
@@ -183,7 +177,7 @@ if test ! -h /etc/rd.conf ; then
ln -s /etc/rivendell.d/rd-default.conf /etc/rd.conf ln -s /etc/rivendell.d/rd-default.conf /etc/rd.conf
fi fi
if test ! -e /etc/asound.conf ; then if test ! -e /etc/asound.conf ; then
cp $PACKAGE_DOC_DIR/asound.conf-sample /etc/asound.conf cp @DOC_PATH@/asound.conf-sample /etc/asound.conf
fi fi
if test -f /etc/init.d/mysql ; then if test -f /etc/init.d/mysql ; then
/etc/init.d/mysql start /etc/init.d/mysql start