From 975ed69ed5ebcd1bea7a694796e6364202db8027 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Sun, 25 Mar 2018 18:01:58 -0400 Subject: [PATCH] 2018-03-25 Fred Gleason * Refactored the RPM spec file to determine target distro at build time. --- ChangeLog | 3 ++ configure.ac | 3 ++ rivendell.spec.in | 78 ++++++++++++++++++++++------------------------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35582cd4..050c9afb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16751,3 +16751,6 @@ * Added support for log notifications to the RDXport service. 2018-03-25 Fred Gleason * Added support for log notifications to rdairplay(1). +2018-03-25 Fred Gleason + * Refactored the RPM spec file to determine target distro at + build time. diff --git a/configure.ac b/configure.ac index 8a61bcb3..d441e046 100644 --- a/configure.ac +++ b/configure.ac @@ -24,6 +24,7 @@ AM_INIT_AUTOMAKE AC_SUBST(RPM_RELEASE,1) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_CONFIG_MACRO_DIR([m4]) +PKG_VERSION=m4_esyscmd(cat PACKAGE_VERSION) # # Some Fully Resolved Install Paths @@ -120,10 +121,12 @@ if test $ar_gcc_distro = suse ; then AC_SUBST(MYSQL_PKG,"mysql") AC_SUBST(QT3_MYSQL_PKG,"qt3-mysql") AC_SUBST(QT3_DEVEL_PKG,"qt3-devel") + AC_SUBST(DOC_PATH,"/usr/share/doc") else AC_SUBST(APACHE_PKG,"httpd") AC_SUBST(APACHE_CONFIG_DIR,"/etc/httpd/conf.d") 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 AC_SUBST(USERMODE_PKG,"usermode usermode-gtk") AC_SUBST(MYSQL_PKG,"mariadb") diff --git a/rivendell.spec.in b/rivendell.spec.in index 3dd86b8b..5926f18b 100644 --- a/rivendell.spec.in +++ b/rivendell.spec.in @@ -116,52 +116,46 @@ if test "@WIN32_SOURCE@" ; then mkdir -p $RPM_BUILD_ROOT/var/win32 cp @WIN32_SOURCE@ $RPM_BUILD_ROOT/var/win32/ fi -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version} -cp AUTHORS $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ -cp ChangeLog $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ -cp COPYING $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ -cp INSTALL $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ -cp NEWS $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ -cp README $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ -cp UPGRADING $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ -cp CODINGSTYLE $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ -cp conf/*.conf $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ -cp conf/rd.conf-sample $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ -cp conf/my.cnf-master $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ -cp conf/my.cnf-standby $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ -cp conf/asound.conf-sample $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ -cp utils/sas_shim/rc.sas_shim $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/ -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc -cp docs/misc/colors $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc/ -cp docs/misc/pam_rd.txt $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc/ -cp docs/misc/reports.txt $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc/ -cp docs/misc/ALSA.txt $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc/ -cp docs/misc/RDMONITOR.txt $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc/ -cp docs/misc/scheduler_formats.ods $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc/ -cp docs/misc/ando_interface.odt $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/misc/ -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version} -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/apis -cp docs/apis/*.pdf $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/apis/ -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/tables -cp docs/tables/*.txt $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/tables/ -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/scripts -cp scripts/rd_backup $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/scripts/ -cp scripts/start_traverso.sh $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/scripts/ -cp scripts/rd_mysql_enable_host.sh $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/scripts/ -cp scripts/rd_backup_system.sh $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/scripts/ -cp scripts/rd_restore_system.sh $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/scripts/ +mkdir -p $RPM_BUILD_ROOT/@DOC_PATH@ +cp AUTHORS $RPM_BUILD_ROOT/@DOC_PATH@/ +cp ChangeLog $RPM_BUILD_ROOT/@DOC_PATH@/ +cp COPYING $RPM_BUILD_ROOT/@DOC_PATH@/ +cp INSTALL $RPM_BUILD_ROOT/@DOC_PATH@/ +cp NEWS $RPM_BUILD_ROOT/@DOC_PATH@/ +cp README $RPM_BUILD_ROOT/@DOC_PATH@/ +cp UPGRADING $RPM_BUILD_ROOT/@DOC_PATH@/ +cp CODINGSTYLE $RPM_BUILD_ROOT/@DOC_PATH@/ +cp conf/*.conf $RPM_BUILD_ROOT/@DOC_PATH@/ +cp conf/rd.conf-sample $RPM_BUILD_ROOT/@DOC_PATH@/ +cp conf/my.cnf-master $RPM_BUILD_ROOT/@DOC_PATH@/ +cp conf/my.cnf-standby $RPM_BUILD_ROOT/@DOC_PATH@/ +cp conf/asound.conf-sample $RPM_BUILD_ROOT/@DOC_PATH@/ +cp utils/sas_shim/rc.sas_shim $RPM_BUILD_ROOT/@DOC_PATH@/ +mkdir -p $RPM_BUILD_ROOT/@DOC_PATH@/misc +cp docs/misc/colors $RPM_BUILD_ROOT/@DOC_PATH@/misc/ +cp docs/misc/pam_rd.txt $RPM_BUILD_ROOT/@DOC_PATH@/misc/ +cp docs/misc/reports.txt $RPM_BUILD_ROOT/@DOC_PATH@/misc/ +cp docs/misc/ALSA.txt $RPM_BUILD_ROOT/@DOC_PATH@/misc/ +cp docs/misc/RDMONITOR.txt $RPM_BUILD_ROOT/@DOC_PATH@/misc/ +cp docs/misc/scheduler_formats.ods $RPM_BUILD_ROOT/@DOC_PATH@/misc/ +cp docs/misc/ando_interface.odt $RPM_BUILD_ROOT/@DOC_PATH@/misc/ +mkdir -p $RPM_BUILD_ROOT/@DOC_PATH@ +mkdir -p $RPM_BUILD_ROOT/@DOC_PATH@/apis +cp docs/apis/*.pdf $RPM_BUILD_ROOT/@DOC_PATH@/apis/ +mkdir -p $RPM_BUILD_ROOT/@DOC_PATH@/tables +cp docs/tables/*.txt $RPM_BUILD_ROOT/@DOC_PATH@/tables/ +mkdir -p $RPM_BUILD_ROOT/@DOC_PATH@/scripts +cp scripts/rd_backup $RPM_BUILD_ROOT/@DOC_PATH@/scripts/ +cp scripts/start_traverso.sh $RPM_BUILD_ROOT/@DOC_PATH@/scripts/ +cp scripts/rd_mysql_enable_host.sh $RPM_BUILD_ROOT/@DOC_PATH@/scripts/ +cp scripts/rd_backup_system.sh $RPM_BUILD_ROOT/@DOC_PATH@/scripts/ +cp scripts/rd_restore_system.sh $RPM_BUILD_ROOT/@DOC_PATH@/scripts/ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-importers-%{version} cp scripts/engine_conv.py $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-importers-%{version}/ %post 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/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 @@ -175,7 +169,7 @@ if test ! -d /etc/rivendell.d ; then chmod 775 /etc/rivendell.d fi 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 fi 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 fi 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 if test -f /etc/init.d/mysql ; then /etc/init.d/mysql start