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

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

Browse Source 
* Removed the conditional installation of 'rdalsaconfig-root'
	when building RPMs.
This commit is contained in:
Fred Gleason 2018-03-25 19:18:24 -04:00
parent 975ed69ed5
commit d1235f2893
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -16754,3 +16754,6 @@
2018-03-25 Fred Gleason <fredg@paravelsystems.com>
* Refactored the RPM spec file to determine target distro at
build time.
2018-03-25 Fred Gleason <fredg@paravelsystems.com>
* Removed the conditional installation of 'rdalsaconfig-root'
when building RPMs.

6
configure.ac
View File

@ -116,16 +116,16 @@ AC_SUBST(DISTRO,$ar_gcc_distro)
if test $ar_gcc_distro = suse ; then
AC_SUBST(APACHE_PKG,"apache2")
AC_SUBST(APACHE_CONFIG_DIR,"/etc/apache2/conf.d")
AC_SUBST(CONSOLEHELPER_RDALSACONFIG,"")
# AC_SUBST(CONSOLEHELPER_RDALSACONFIG,"")
AC_SUBST(USERMODE_PKG,"")
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")
AC_SUBST(DOC_PATH,"/usr/share/doc/rivendell")
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(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")

8
rivendell.spec.in
View File

@ -150,8 +150,7 @@ 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}/
cp scripts/engine_conv.py $RPM_BUILD_ROOT/@DOC_PATH@
%post
@ -266,7 +265,7 @@ rm -rf $RPM_BUILD_ROOT
@LOCAL_PREFIX@/bin/rdsoftkeys
@LOCAL_PREFIX@/bin/rdpopup
@LOCAL_PREFIX@/bin/rdalsaconfig
@CONSOLEHELPER_RDALSACONFIG@
@LOCAL_PREFIX@/bin/rdalsaconfig-root
@LOCAL_PREFIX@/bin/rdgpimon
@LOCAL_PREFIX@/bin/rdclilogedit
@LOCAL_PREFIX@/bin/rddelete
@ -403,7 +402,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/rddbcheck.8.gz
%{_mandir}/man8/rdmarkerset.8.gz
%{_mandir}/man8/rdrevert.8.gz
%{_docdir}/rivendell-%{version}/*
@DOC_PATH@/*
%files base
@ -444,7 +443,6 @@ rm -rf $RPM_BUILD_ROOT
@LOCAL_PREFIX@/bin/rddiscimport
@LOCAL_PREFIX@/share/applications/rivendell-rddgimport.desktop
@LOCAL_PREFIX@/share/applications/rivendell-rddiscimport.desktop
%{_docdir}/rivendell-importers-%{version}/*
%files opsguide