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

* Added a 'Rivendell->Configuration' menu entry for rddbconfig(8).
This commit is contained in:
Fred Gleason 2018-10-16 18:12:35 -04:00
parent 22bbd6b5d6
commit ac7e3d1bd9
10 changed files with 55 additions and 5 deletions

1
.gitignore vendored
View File

@ -124,6 +124,7 @@ utils/rdclilogedit/rdclilogedit
utils/rdcleandirs/rdcleandirs
utils/rdsoftkeys/rdsoftkeys
utils/rddbcheck/rddbcheck
utils/rddbconfig/rddbconfig
utils/rdalsaconfig/rdalsaconfig
utils/rdpopup/rdpopup
utils/rddbmgr/rddbmgr

View File

@ -17778,3 +17778,5 @@
* Added exit logging to rdxport.cgi.
2018-10-16 Patrick Linstruth <patrick@deltecent.com>
* Added rddbconfig(8).
2018-10-16 Fred Gleason <fredg@paravelsystems.com>
* Added a 'Rivendell->Configuration' menu entry for rddbconfig(8).

View File

@ -241,6 +241,8 @@ rm -rf $RPM_BUILD_ROOT
@LOCAL_PREFIX@/bin/rdalsaconfig-root
@LOCAL_PREFIX@/bin/rdgpimon
@LOCAL_PREFIX@/bin/rdclilogedit
@LOCAL_PREFIX@/bin/rddbconfig
@LOCAL_PREFIX@/bin/rddbconfig-root
@LOCAL_PREFIX@/bin/rddelete
@LOCAL_PREFIX@/bin/rdexport
@LOCAL_PREFIX@/bin/rdimport
@ -337,6 +339,7 @@ rm -rf $RPM_BUILD_ROOT
@LOCAL_PREFIX@/share/applications/rivendell-rdcatch.desktop
@LOCAL_PREFIX@/share/applications/rivendell-rdgpimon.desktop
@LOCAL_PREFIX@/share/applications/rivendell-rdalsaconfig-root.desktop
@LOCAL_PREFIX@/share/applications/rivendell-rddbconfig-root.desktop
@LOCAL_PREFIX@/share/applications/rivendell-rdlibrary.desktop
@LOCAL_PREFIX@/share/applications/rivendell-rdlogedit.desktop
@LOCAL_PREFIX@/share/applications/rivendell-rdlogmanager.desktop
@ -363,6 +366,8 @@ rm -rf $RPM_BUILD_ROOT
@WIN32_PATH@
/etc/security/console.apps/rdalsaconfig-root
/etc/pam.d/rdalsaconfig-root
/etc/security/console.apps/rddbconfig-root
/etc/pam.d/rddbconfig-root
/etc/pam.d/rivendell
/lib/systemd/system/rivendell.service
%{_mandir}/man1/rdclilogedit.1.gz

View File

@ -35,8 +35,6 @@ nodist_rddbconfig_SOURCES = moc_rddbconfig.cpp moc_mysql_login.cpp
rddbconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT4_LIBS@ -lQt3Support
EXTRA_DIST = rddbconfig.pro
CLEANFILES = *~\
*.qm\
moc_*

View File

@ -25,9 +25,11 @@ install-exec-am:
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/
@ -39,7 +41,6 @@ install-exec-am:
cp rivendell-rdpanel.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdsoftkeys.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rmlsend.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdalsaconfig-root.desktop $(DESTDIR)@prefix@/share/applications/
mkdir -p $(DESTDIR)@prefix@/share/desktop-directories
cp *.directory $(DESTDIR)@prefix@/share/desktop-directories/
@ -47,10 +48,17 @@ install-exec-am:
cp *.menu $(DESTDIR)/etc/xdg/menus/applications-merged/
mkdir -p $(DESTDIR)/etc/pam.d
cp rdalsaconfig-root-pam $(DESTDIR)/etc/pam.d/rdalsaconfig-root
cp rddbconfig-root-pam $(DESTDIR)/etc/pam.d/rddbconfig-root
mkdir -p $(DESTDIR)/etc/security/console.apps
cp rdalsaconfig-root-consolehelper $(DESTDIR)/etc/security/console.apps/rdalsaconfig-root
cp rddbconfig-root-consolehelper $(DESTDIR)/etc/security/console.apps/rddbconfig-root
cp rivendell-rdalsaconfig-root.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rddbconfig-root.desktop $(DESTDIR)@prefix@/share/applications/
rm -f $(DESTDIR)$(prefix)/bin/rdalsaconfig-root
ln -s /usr/bin/consolehelper $(DESTDIR)$(prefix)/bin/rdalsaconfig-root
cp rivendell-rddbconfig-root.desktop $(DESTDIR)@prefix@/share/applications/
rm -f $(DESTDIR)$(prefix)/bin/rddbconfig-root
ln -s /usr/bin/consolehelper $(DESTDIR)$(prefix)/bin/rddbconfig-root
uninstall-local:
rm -f $(DESTDIR)@prefix@/share/applications/rivendell-*.desktop
@ -59,9 +67,14 @@ uninstall-local:
rm -f $(DESTDIR)/etc/pam.d/rdalsaconfig-root
rm -f $(DESTDIR)/etc/security/console.apps/rdalsaconfig-root
rm -f $(DESTDIR)$(prefix)/bin/rdalsaconfig-root
rm -f $(DESTDIR)/etc/pam.d/rddbconfig-root
rm -f $(DESTDIR)/etc/security/console.apps/rddbconfig-root
rm -f $(DESTDIR)$(prefix)/bin/rddbconfig-root
EXTRA_DIST = rdalsaconfig-root-consolehelper\
rdalsaconfig-root-pam\
rddbconfig-root-consolehelper\
rddbconfig-root-pam\
rivendell-configuration.directory\
rivendell-documentation.directory\
rivendell-logtools.directory\
@ -74,6 +87,8 @@ EXTRA_DIST = rdalsaconfig-root-consolehelper\
rivendell-rdcartslots.desktop\
rivendell-rdcastmanager.desktop\
rivendell-rdcatch.desktop\
rivendell-rddbconfig.desktop\
rivendell-rddbconfig-root.desktop\
rivendell-rddgimport.desktop\
rivendell-rddiscimport.desktop\
rivendell-rdgpimon.desktop\

View File

@ -0,0 +1,3 @@
USER=root
PROGRAM=/usr/bin/rddbconfig
SESSION=true

4
xdg/rddbconfig-root-pam Normal file
View File

@ -0,0 +1,4 @@
#%PAM-1.0
auth include config-util
account include config-util
session include config-util

View File

@ -0,0 +1,10 @@
[Desktop Entry]
Encoding=UTF-8
Terminal=false
Categories=Qt;KDE;Rivendell;
Name=RDDBConfig
GenericName=Rivendell Database Management
Exec=rddbconfig-root
Icon=rdadmin
Type=Application
Terminal=false

View File

@ -0,0 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
Terminal=false
Categories=Qt;KDE;Rivendell;
Name=RDDBConfig
GenericName=Rivendell Database Management
Exec=rddbconfig
Icon=rdadmin
Type=Application
Terminal=false
X-KDE-SubstituteUID=true
X-KDE-Username=root

View File

@ -22,8 +22,8 @@
<Filename>rivendell-rdadmin.desktop</Filename>
<Filename>rivendell-rdalsaconfig.desktop</Filename>
<Filename>rivendell-rdalsaconfig-root.desktop</Filename>
<Filename>rivendell-rdhpiinfo.desktop</Filename>
<Filename>rivendell-rdhpiinfo-root.desktop</Filename>
<Filename>rivendell-rddbconfig.desktop</Filename>
<Filename>rivendell-rddbconfig-root.desktop</Filename>
</Include>
</Menu>
<Menu>