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

2018-10-22 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'evince', 'firefox' and 'rivendell' dependencies
	from the RPM 'opsguide' sub-package.
	* Removed the 'qt-devel' dependency from the RPM 'rivendell'
	package.
This commit is contained in:
Fred Gleason 2018-10-22 18:13:15 -04:00
parent c28e3be9d6
commit 41dcafe2a2
6 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -17870,3 +17870,5 @@
2018-10-22 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'evince', 'firefox' and 'rivendell' dependencies
from the RPM 'opsguide' sub-package.
* Removed the 'qt-devel' dependency from the RPM 'rivendell'
package.

6
configure.ac
View File

@ -149,7 +149,6 @@ if test $ar_gcc_distro = suse ; then
AC_SUBST(USERMODE_PKG,"")
AC_SUBST(MYSQL_PKG,"mysql")
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")
@ -159,20 +158,17 @@ else
AC_SUBST(USERMODE_PKG,"usermode usermode-gtk")
AC_SUBST(MYSQL_PKG,"mariadb")
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(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(QT4_MYSQL_PKG,"qt-MySQL")
AC_SUBST(QT4_DEVEL_PKG,"qt-devel")
AC_SUBST(CDDA2WAV_PKG,"")
fi
fi
@ -515,8 +511,6 @@ AC_CONFIG_FILES([rivendell.spec \
docs/rivwebcapi/Makefile \
docs/stylesheets/Makefile \
docs/tables/Makefile \
xdg/rivendell-opsguide-html.desktop \
xdg/rivendell-opsguide-pdf.desktop \
importers/Makefile \
ios/Makefile \
ios/rmlsend/Makefile \

2
rivendell.spec.in
View File

@ -25,7 +25,7 @@ Release: @RPM_RELEASE@
License: GPL
Packager: Fred Gleason <fredg@paravelsystems.com>
Source: rivendell-@VERSION@.tar.gz
Requires: @MYSQL_PKG@, @QT4_MYSQL_PKG@, @APACHE_PKG@, @QT4_DEVEL_PKG@, curl, @USERMODE_PKG@, @CDDA2WAV_PKG@,
Requires: @MYSQL_PKG@, @QT4_MYSQL_PKG@, @APACHE_PKG@, curl, @USERMODE_PKG@, @CDDA2WAV_PKG@,
BuildRoot: /var/tmp/rivendell-@VERSION@
Obsoletes: rivendell-base

9
xdg/Makefile.am
View File

@ -21,15 +21,11 @@
install-exec-am:
mkdir -p $(DESTDIR)@prefix@/share/applications
cp rivendell-opsguide-html.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-opsguide-pdf.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdadmin.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdairplay.desktop $(DESTDIR)@prefix@/share/applications/
## cp rivendell-rdalsaconfig.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdcartslots.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdcastmanager.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdcatch.desktop $(DESTDIR)@prefix@/share/applications/
## cp rivendell-rddbconfig.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rddgimport.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rddiscimport.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdgpimon.desktop $(DESTDIR)@prefix@/share/applications/
@ -78,8 +74,6 @@ EXTRA_DIST = rdalsaconfig-root-consolehelper\
rivendell-configuration.directory\
rivendell-documentation.directory\
rivendell-logtools.directory\
rivendell-opsguide-html.desktop.in\
rivendell-opsguide-pdf.desktop.in\
rivendell-rdadmin.desktop\
rivendell-rdairplay.desktop\
rivendell-rdalsaconfig.desktop\
@ -106,8 +100,5 @@ EXTRA_DIST = rdalsaconfig-root-consolehelper\
CLEANFILES = *~
DISTCLEANFILES = rivendell-opsguide-html.desktop\
rivendell-opsguide-pdf.desktop
MAINTAINERCLEANFILES = *~\
Makefile.in

11
xdg/rivendell-opsguide-html.desktop.in
View File

@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Terminal=false
Categories=Qt;KDE;Rivendell;
Name=Rivendell Operations Guide (HTML)
GenericName=Rivendell Operations Guide
Exec=firefox @prefix@/share/rivendell/html/index.html
Icon=rivendell
Type=Application
Terminal=false

11
xdg/rivendell-opsguide-pdf.desktop.in
View File

@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Terminal=false
Categories=Qt;KDE;Rivendell;
Name=Rivendell Operations Guide (PDF)
GenericName=Rivendell Operations Guide
Exec=evince @prefix@/share/rivendell/opsguide.pdf
Icon=rivendell
Type=Application
Terminal=false