mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-04-10 14:58:21 +02:00
2018-08-17 Fred Gleason <fredg@paravelsystems.com>
* Refactored the RPM spec file to combine the 'rivendell' and 'rivendell-base' packages.
This commit is contained in:
Fred Gleason
parent
a385a50645
commit
cd65321161
@ -17482,3 +17482,6 @@
|
||||
when dropped on a sound panel button.
|
||||
2018-08-17 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Fixed the incorrect background color in the meters in rdcatch(1).
|
||||
2018-08-17 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Refactored the RPM spec file to combine the 'rivendell' and
|
||||
'rivendell-base' packages.
|
||||
|
||||
@ -113,7 +113,6 @@ EXTRA_DIST = autogen.sh\
|
||||
make_slack.in\
|
||||
PACKAGE_VERSION\
|
||||
rdrepld-suse.in\
|
||||
rivendell-gentoo\
|
||||
rivendell.ism\
|
||||
rivendell.pro\
|
||||
rivendell.spec.in\
|
||||
|
||||
49
configure.ac
49
configure.ac
@ -117,8 +117,8 @@ if test $ar_gcc_distro = suse ; then
|
||||
# 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(QT4_MYSQL_PKG,"qt-mysql")
|
||||
AC_SUBST(QT4_DEVEL_PKG,"qt-devel")
|
||||
AC_SUBST(DOC_PATH,"/usr/share/doc/rivendell")
|
||||
else
|
||||
AC_SUBST(APACHE_PKG,"httpd")
|
||||
@ -127,21 +127,21 @@ else
|
||||
if test $ar_distro_major -ge 7 ; then
|
||||
AC_SUBST(USERMODE_PKG,"usermode usermode-gtk")
|
||||
AC_SUBST(MYSQL_PKG,"mariadb")
|
||||
AC_SUBST(QT3_MYSQL_PKG,"qt3-MySQL")
|
||||
AC_SUBST(QT3_DEVEL_PKG,"qt3-devel")
|
||||
AC_SUBST(QT4_MYSQL_PKG,"qt-mysql")
|
||||
AC_SUBST(QT4_DEVEL_PKG,"qt-devel")
|
||||
AC_SUBST(CDDA2WAV_PKG,"icedax")
|
||||
else
|
||||
if test $ar_distro_major -ge 6 ; then
|
||||
AC_SUBST(USERMODE_PKG,"usermode")
|
||||
AC_SUBST(MYSQL_PKG,"mysql")
|
||||
AC_SUBST(QT3_MYSQL_PKG,"qt-MySQL")
|
||||
AC_SUBST(QT3_DEVEL_PKG,"qt3-devel")
|
||||
AC_SUBST(QT4_MYSQL_PKG,"qt4-mysql")
|
||||
AC_SUBST(QT4_DEVEL_PKG,"qt4-devel")
|
||||
AC_SUBST(CDDA2WAV_PKG,"icedax")
|
||||
else
|
||||
AC_SUBST(USERMODE_PKG,"usermode")
|
||||
AC_SUBST(MYSQL_PKG,"mysql")
|
||||
AC_SUBST(QT3_MYSQL_PKG,"qt-MySQL")
|
||||
AC_SUBST(QT3_DEVEL_PKG,"qt-devel")
|
||||
AC_SUBST(QT4_MYSQL_PKG,"qt-MySQL")
|
||||
AC_SUBST(QT4_DEVEL_PKG,"qt-devel")
|
||||
AC_SUBST(CDDA2WAV_PKG,"")
|
||||
fi
|
||||
fi
|
||||
@ -308,34 +308,12 @@ if test $HPI_FOUND ; then
|
||||
AC_SUBST(HPI_FILE2,$LIB_PATH/librdhpi.a)
|
||||
AC_SUBST(HPI_FILE3,$LIB_PATH/librdhpi.la)
|
||||
AC_SUBST(HPI_FILE4,$LIB_PATH/librdhpi.so)
|
||||
AC_SUBST(HPI_FILE5,"")
|
||||
AC_SUBST(HPI_FILE6,"")
|
||||
AC_SUBST(HPI_FILE7,$PREFIX/share/rivendell/rdhpi_es.qm)
|
||||
AC_SUBST(HPI_FILE8,$PREFIX/share/rivendell/rdhpi_cs.qm)
|
||||
AC_SUBST(HPI_FILE9,$PREFIX/share/rivendell/rdhpi_de.qm)
|
||||
AC_SUBST(HPI_FILE10,$PREFIX/share/rivendell/rdhpi_nn.qm)
|
||||
AC_SUBST(HPI_FILE11,$PREFIX/share/rivendell/rdhpi_nb.qm)
|
||||
AC_SUBST(HPI_FILE12,$PREFIX/share/rivendell/rdhpi_pt_BR.qm)
|
||||
AC_SUBST(HPI_FILE13,"")
|
||||
AC_SUBST(HPI_FILE14,"")
|
||||
AC_SUBST(HPI_FILE15,"")
|
||||
else
|
||||
AC_SUBST(LIBHPI,"")
|
||||
AC_SUBST(HPI_FILE1,"")
|
||||
AC_SUBST(HPI_FILE2,"")
|
||||
AC_SUBST(HPI_FILE3,"")
|
||||
AC_SUBST(HPI_FILE4,"")
|
||||
AC_SUBST(HPI_FILE5,"")
|
||||
AC_SUBST(HPI_FILE6,"")
|
||||
AC_SUBST(HPI_FILE7,"")
|
||||
AC_SUBST(HPI_FILE8,"")
|
||||
AC_SUBST(HPI_FILE9,"")
|
||||
AC_SUBST(HPI_FILE10,"")
|
||||
AC_SUBST(HPI_FILE11,"")
|
||||
AC_SUBST(HPI_FILE12,"")
|
||||
AC_SUBST(HPI_FILE13,"")
|
||||
AC_SUBST(HPI_FILE14,"")
|
||||
AC_SUBST(HPI_FILE15,"")
|
||||
fi
|
||||
else
|
||||
AC_SUBST(LIBHPI,"")
|
||||
@ -343,17 +321,6 @@ else
|
||||
AC_SUBST(HPI_FILE2,"")
|
||||
AC_SUBST(HPI_FILE3,"")
|
||||
AC_SUBST(HPI_FILE4,"")
|
||||
AC_SUBST(HPI_FILE5,"")
|
||||
AC_SUBST(HPI_FILE6,"")
|
||||
AC_SUBST(HPI_FILE7,"")
|
||||
AC_SUBST(HPI_FILE8,"")
|
||||
AC_SUBST(HPI_FILE9,"")
|
||||
AC_SUBST(HPI_FILE10,"")
|
||||
AC_SUBST(HPI_FILE11,"")
|
||||
AC_SUBST(HPI_FILE12,"")
|
||||
AC_SUBST(HPI_FILE13,"")
|
||||
AC_SUBST(HPI_FILE14,"")
|
||||
AC_SUBST(HPI_FILE15,"")
|
||||
fi
|
||||
AM_CONDITIONAL([HPI_RD_AM], [test "$USING_HPI" = yes])
|
||||
|
||||
|
||||
@ -26,13 +26,9 @@ License: GPL
|
||||
Packager: Fred Gleason <fredg@paravelsystems.com>
|
||||
Group: Productivity/Multimedia/Other
|
||||
Source: rivendell-@VERSION@.tar.gz
|
||||
Requires: @MYSQL_PKG@, @QT3_MYSQL_PKG@, @APACHE_PKG@, @QT3_DEVEL_PKG@, curl, @USERMODE_PKG@, rivendell-base = @VERSION@, @CDDA2WAV_PKG@,
|
||||
Requires: @MYSQL_PKG@, @QT4_MYSQL_PKG@, @APACHE_PKG@, @QT4_DEVEL_PKG@, curl, @USERMODE_PKG@, @CDDA2WAV_PKG@,
|
||||
BuildRoot: /var/tmp/rivendell-@VERSION@
|
||||
|
||||
%package base
|
||||
Summary: The base components for the Rivendell Radio Automation System
|
||||
Group: Productivity/Multimedia/Other
|
||||
Requires: @QT3_MYSQL_PKG@
|
||||
Obsoletes: rivendell-base
|
||||
|
||||
%package importers
|
||||
Summary: Library importers for the Rivendell Broadcast Automation System
|
||||
@ -61,12 +57,6 @@ audio content. Modules for the production and management of podcast
|
||||
audio are also included.
|
||||
|
||||
|
||||
%description base
|
||||
This package contains the common base components for the Rivendell
|
||||
Radio Broadcast Automation system, including the applications libraries
|
||||
and Core Audio Engine (CAE) daemon.
|
||||
|
||||
|
||||
%description importers
|
||||
This package contains various importer scripts, which can be used to
|
||||
import audio from existing legacy automation systems into Rivendell.
|
||||
@ -102,7 +92,7 @@ associated with.
|
||||
|
||||
%build
|
||||
%configure --libexecdir=@libexecdir@ --sysconfdir=@sysconfdir@ @RDXPORTDEBUG@
|
||||
make
|
||||
make -j
|
||||
|
||||
|
||||
%install
|
||||
@ -260,8 +250,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
@LOCAL_PREFIX@/bin/rdpanel
|
||||
@LOCAL_PREFIX@/bin/rdcartslots
|
||||
@LOCAL_PREFIX@/bin/rdcatch
|
||||
@LOCAL_PREFIX@/sbin/rdcatchd
|
||||
@LOCAL_PREFIX@/bin/rdrepld
|
||||
@LOCAL_PREFIX@/bin/rdgen
|
||||
@LOCAL_PREFIX@/bin/rdlibrary
|
||||
@LOCAL_PREFIX@/bin/rdlogedit
|
||||
@ -289,13 +277,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
@LOCAL_PREFIX@/bin/rd_backup
|
||||
@LOCAL_PREFIX@/bin/rdmemcheck.sh
|
||||
@LOCAL_PREFIX@/bin/rdrender
|
||||
@LOCAL_PREFIX@/sbin/ripcd
|
||||
@LOCAL_PREFIX@/sbin/sas_shim
|
||||
@LOCAL_PREFIX@/sbin/rdmarkerset
|
||||
@LOCAL_PREFIX@/sbin/rdcleandirs
|
||||
@LOCAL_PREFIX@/sbin/rddbmgr
|
||||
@LOCAL_PREFIX@/share/rivendell/*
|
||||
/etc/init.d/rdrepld
|
||||
@LOCAL_PREFIX@/share/icons/hicolor/16x16/apps/rivendell.png
|
||||
@LOCAL_PREFIX@/share/icons/hicolor/16x16/apps/rdadmin.png
|
||||
@LOCAL_PREFIX@/share/icons/hicolor/16x16/apps/rdairplay.png
|
||||
@ -390,12 +372,21 @@ rm -rf $RPM_BUILD_ROOT
|
||||
@LOCAL_PREFIX@/share/desktop-directories/rivendell-utilities.directory
|
||||
/etc/xdg/menus/applications-merged/rivendell-rivendell.menu
|
||||
/.qt/qt
|
||||
@libexecdir@/*
|
||||
@libexecdir@/*.gif
|
||||
@libexecdir@/*.html
|
||||
@libexecdir@/*.js
|
||||
@libexecdir@/*.mp3
|
||||
@libexecdir@/*.png
|
||||
@libexecdir@/*.xml
|
||||
@libexecdir@/rdcastmanager.cgi
|
||||
%attr(6755,root,root) @libexecdir@/rdxport.cgi
|
||||
%attr(6755,root,root) @libexecdir@/webget.cgi
|
||||
@sysconfdir@/rd-bin.conf
|
||||
@WIN32_PATH@
|
||||
/etc/security/console.apps/rdalsaconfig-root
|
||||
/etc/pam.d/rdalsaconfig-root
|
||||
/etc/pam.d/rivendell
|
||||
/lib/systemd/system/rivendell.service
|
||||
%{_mandir}/man1/rdclilogedit.1.gz
|
||||
%{_mandir}/man1/rdconvert.1.gz
|
||||
%{_mandir}/man1/rdexport.1.gz
|
||||
@ -405,33 +396,24 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_mandir}/man8/rddbmgr.8.gz
|
||||
%{_mandir}/man8/rdmarkerset.8.gz
|
||||
@DOC_PATH@/*
|
||||
|
||||
|
||||
%files base
|
||||
%defattr(-,root,root)
|
||||
@LOCAL_PREFIX@/@RD_LIB_PATH@/librd-@VERSION@.so
|
||||
@LOCAL_PREFIX@/@RD_LIB_PATH@/librd.a
|
||||
@LOCAL_PREFIX@/@RD_LIB_PATH@/librd.la
|
||||
@LOCAL_PREFIX@/@RD_LIB_PATH@/librd.so
|
||||
@LOCAL_PREFIX@/sbin/rdservice
|
||||
@LOCAL_PREFIX@/sbin/caed
|
||||
@LOCAL_PREFIX@/sbin/ripcd
|
||||
@LOCAL_PREFIX@/sbin/rdcatchd
|
||||
@LOCAL_PREFIX@/sbin/rdvairplayd
|
||||
/etc/init.d/rivendell
|
||||
%config /etc/sysconfig/rivendell
|
||||
@LOCAL_PREFIX@/sbin/rdrepld
|
||||
@LOCAL_PREFIX@/sbin/sas_shim
|
||||
@LOCAL_PREFIX@/sbin/rdmarkerset
|
||||
@LOCAL_PREFIX@/sbin/rdcleandirs
|
||||
@LOCAL_PREFIX@/sbin/rddbmgr
|
||||
@HPI_FILE1@
|
||||
@HPI_FILE2@
|
||||
@HPI_FILE3@
|
||||
@HPI_FILE4@
|
||||
@HPI_FILE5@
|
||||
@HPI_FILE6@
|
||||
@HPI_FILE7@
|
||||
@HPI_FILE8@
|
||||
@HPI_FILE9@
|
||||
@HPI_FILE10@
|
||||
@HPI_FILE11@
|
||||
@HPI_FILE12@
|
||||
@HPI_FILE13@
|
||||
@HPI_FILE14@
|
||||
@HPI_FILE15@
|
||||
|
||||
|
||||
%files importers
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user