diff --git a/.gitignore b/.gitignore index d664fc27..929af3c9 100644 --- a/.gitignore +++ b/.gitignore @@ -32,9 +32,18 @@ configure depcomp docs/apis/*.html docs/apis/*.pdf -docs/opsguide/frontspiece.xml docs/opsguide/*.html docs/opsguide/*.pdf +docs/opsguide/chain.png +docs/opsguide/frontspiece.xml +docs/opsguide/mic16.png +docs/opsguide/music.png +docs/opsguide/notemarker.png +docs/opsguide/play.png +docs/opsguide/rml5.png +docs/opsguide/track_cart.png +docs/opsguide/traffic.png +docs/opsguide/trashcan-32x32.png helpers/cwrap helpers/docbook helpers/jsmin @@ -117,3 +126,5 @@ utils/rdrender/rdrender utils/rdrevert/rdrevert utils/sas_shim/sas_shim web/rdfeed/rdfeed.xml +xdg/rivendell-opsguide-html.desktop +xdg/rivendell-opsguide-pdf.desktop diff --git a/ChangeLog b/ChangeLog index 80be7ecf..49022b12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16501,3 +16501,5 @@ * Added missing *.html files to 'docs/opsguide/Makefile.am'. 2017-12-18 Fred Gleason * Cleaned up hanging files from the 'make uninstall' target. +2017-12-18 Fred Gleason + * Added 'opsguide' subpackage. diff --git a/configure.ac b/configure.ac index b2cfe01e..8a61bcb3 100644 --- a/configure.ac +++ b/configure.ac @@ -459,6 +459,36 @@ dnl AC_SUBST(RPM_ROOT,/usr/src/packages) fi AC_SUBST(RPM_DATESTAMP,`date +%a\ %b\ %d\ %Y`) +# +# Create icon symlinks for Operations Guide +# +rm -f docs/opsguide/chain.png +ln -s ../../icons/chain.png docs/opsguide/chain.png + +rm -f docs/opsguide/mic16.png +ln -s ../../icons/mic16.png docs/opsguide/mic16.png + +rm -f docs/opsguide/music.png +ln -s ../../icons/music.png docs/opsguide/music.png + +rm -f docs/opsguide/notemarker.png +ln -s ../../icons/notemarker.png docs/opsguide/notemarker.png + +rm -f docs/opsguide/play.png +ln -s ../../icons/play.png docs/opsguide/play.png + +rm -f docs/opsguide/rml5.png +ln -s ../../icons/rml5.png docs/opsguide/rml5.png + +rm -f docs/opsguide/track_cart.png +ln -s ../../icons/track_cart.png docs/opsguide/track_cart.png + +rm -f docs/opsguide/traffic.png +ln -s ../../icons/traffic.png docs/opsguide/traffic.png + +rm -f docs/opsguide/trashcan-32x32.png +ln -s ../../icons/trashcan-32x32.png docs/opsguide/trashcan-32x32.png + AC_CONFIG_FILES([rivendell.spec \ Makefile \ make_slack \ @@ -514,6 +544,8 @@ AC_CONFIG_FILES([rivendell.spec \ docs/opsguide/Makefile \ docs/stylesheets/Makefile \ docs/tables/Makefile \ + xdg/rivendell-opsguide-html.desktop \ + xdg/rivendell-opsguide-pdf.desktop \ debian/Makefile \ debian/patches/Makefile \ xdg/Makefile \ diff --git a/docs/opsguide/Makefile.am b/docs/opsguide/Makefile.am index 4d8ed9c1..b8fa0bcf 100644 --- a/docs/opsguide/Makefile.am +++ b/docs/opsguide/Makefile.am @@ -261,8 +261,18 @@ OPSGUIDE_IMAGES = rdadmin.audio_resource_information_dialog.png\ voicetracking.voice_tracker_dialog_track_completed.png\ voicetracking.voice_tracker_dialog_track_selected.png +OPSGUIDE_ICONS = chain.png\ + mic16.png\ + music.png\ + notemarker.png\ + play.png\ + rml5.png\ + track_cart.png\ + traffic.png\ + trashcan-32x32.png OPSGUIDE_DEPS = $(OPSGUIDE_IMAGES) \ + $(OPSGUIDE_ICONS) \ filepath_wildcards.xml\ gpio_switcher_devices.xml\ gplv2.xml\ @@ -292,6 +302,17 @@ opsguide.pdf: $(OPSGUIDE_DEPS) ../../PACKAGE_VERSION\ ../stylesheets/book-fo-titlepages.xsl xsltproc ../stylesheets/book-fo.xml opsguide.xml | fop - -pdf opsguide.pdf +install-exec-local: + mkdir -p $(DESTDIR)$(prefix)/share/rivendell/html + cp opsguide.pdf $(DESTDIR)$(prefix)/share/rivendell/ + cp $(OPSGUIDE_HTML) $(DESTDIR)$(prefix)/share/rivendell/html/ + cp $(OPSGUIDE_IMAGES) $(DESTDIR)$(prefix)/share/rivendell/html/ + cp $(OPSGUIDE_ICONS) $(DESTDIR)$(prefix)/share/rivendell/html/ + +uninstall-local: + rm -rf $(DESTDIR)$(prefix)/share/rivendell/html + rm -rf $(DESTDIR)$(prefix)/share/rivendell/opsguide.pdf + all-local: $(OPSGUIDE_HTML) \ $(OPSGUIDE_IMAGES) \ opsguide.pdf @@ -306,6 +327,16 @@ CLEANFILES = *~\ *.html\ *.pdf +DISTCLEANFILES = chain.png \ + mic16.png \ + music.png \ + notemarker.png \ + play.png \ + rml5.png \ + track_cart.png \ + traffic.png \ + trashcan-32x32.png + MAINTAINERCLEANFILES = *~\ *.1\ *.8\ diff --git a/docs/opsguide/rdairplay.xml b/docs/opsguide/rdairplay.xml index e3ed1e09..c4d98140 100644 --- a/docs/opsguide/rdairplay.xml +++ b/docs/opsguide/rdairplay.xml @@ -359,7 +359,7 @@ - + diff --git a/docs/opsguide/rdlogedit.xml b/docs/opsguide/rdlogedit.xml index 6a0d5dbc..1ace3f6c 100644 --- a/docs/opsguide/rdlogedit.xml +++ b/docs/opsguide/rdlogedit.xml @@ -130,7 +130,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -202,7 +202,7 @@ - + @@ -214,7 +214,7 @@ - + diff --git a/icons/Makefile.am b/icons/Makefile.am index fd82bd65..97b503d0 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -183,7 +183,6 @@ install-exec-am: cp rivendell-16x16.xpm $(DESTDIR)@prefix@/share/X11/fvwm2/pixmaps/mini.rivendell.xpm cp rivendell-32x32.xpm $(DESTDIR)@prefix@/share/X11/fvwm2/pixmaps/rivendell.xpm - uninstall-local: rm -f $(DESTDIR)@libexecdir@/greencheckmark.png rm -f $(DESTDIR)@libexecdir@/redx.png diff --git a/rivendell.spec.in b/rivendell.spec.in index 64298b45..251638da 100644 --- a/rivendell.spec.in +++ b/rivendell.spec.in @@ -39,6 +39,10 @@ Summary: Library importers for the Rivendell Broadcast Automation System Group: Productivity/Multimedia/Other Requires: rivendell madplay +%package opsguide +Summary: The Rivendell Operations and Administration Guide +Group: Productivity/Multimedia/Other +Requires: evince firefox rivendell %package devel Summary: Header files and example code for developing Rivendell Loadable Modules @@ -74,6 +78,11 @@ initializing switcher matrices for the Christian Radio Consortium are included. +%description opsguide +This package contains the Rivendell Operations and Administration Guide, +in both HTML and PDF formats. + + %description devel This package contains header files and example code for developing Rivendell Loadable Modules (RLMs), which can be used to generate custom Now & Next data @@ -130,10 +139,7 @@ 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}/opsguide/html -cp docs/opsguide/*.pdf $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/opsguide/ -cp docs/opsguide/*.html $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/opsguide/html/ -cp docs/opsguide/*.png $RPM_BUILD_ROOT/%{_datadir}/doc/rivendell-%{version}/opsguide/html +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 @@ -380,6 +386,7 @@ rm -rf $RPM_BUILD_ROOT @LOCAL_PREFIX@/share/applications/rivendell-rmlsend.desktop @LOCAL_PREFIX@/share/applications/rivendell-rdsoftkeys.desktop @LOCAL_PREFIX@/share/desktop-directories/rivendell-configuration.directory +@LOCAL_PREFIX@/share/desktop-directories/rivendell-documentation.directory @LOCAL_PREFIX@/share/desktop-directories/rivendell-logtools.directory @LOCAL_PREFIX@/share/desktop-directories/rivendell-rivendell.directory @LOCAL_PREFIX@/share/desktop-directories/rivendell-utilities.directory @@ -446,6 +453,13 @@ rm -rf $RPM_BUILD_ROOT %{_docdir}/rivendell-importers-%{version}/* +%files opsguide +@LOCAL_PREFIX@/share/applications/rivendell-opsguide-html.desktop +@LOCAL_PREFIX@/share/applications/rivendell-opsguide-pdf.desktop +@LOCAL_PREFIX@/share/rivendell/opsguide.pdf +@LOCAL_PREFIX@/share/rivendell/html/* + + %files devel @LOCAL_PREFIX@/include/rlm/* @LOCAL_PREFIX@/src/rlm/* diff --git a/xdg/Makefile.am b/xdg/Makefile.am index e1ec2206..990c4bf1 100644 --- a/xdg/Makefile.am +++ b/xdg/Makefile.am @@ -21,6 +21,8 @@ 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-rdcartslots.desktop $(DESTDIR)@prefix@/share/applications/ @@ -71,7 +73,10 @@ EXTRA_DIST = rdalsaconfig-root-consolehelper\ rdhpiinfo-root-consolehelper\ rdhpiinfo-root-pam\ 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\ @@ -98,5 +103,8 @@ EXTRA_DIST = rdalsaconfig-root-consolehelper\ CLEANFILES = *~ +DISTCLEANFILES = rivendell-opsguide-html.desktop\ + rivendell-opsguide-pdf.desktop + MAINTAINERCLEANFILES = *~\ Makefile.in diff --git a/xdg/rivendell-documentation.directory b/xdg/rivendell-documentation.directory new file mode 100644 index 00000000..6253ec9b --- /dev/null +++ b/xdg/rivendell-documentation.directory @@ -0,0 +1,6 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Directory +Name=Documentation +Icon=rivendell + diff --git a/xdg/rivendell-opsguide-html.desktop.in b/xdg/rivendell-opsguide-html.desktop.in new file mode 100644 index 00000000..652345bb --- /dev/null +++ b/xdg/rivendell-opsguide-html.desktop.in @@ -0,0 +1,11 @@ +[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 + diff --git a/xdg/rivendell-opsguide-pdf.desktop.in b/xdg/rivendell-opsguide-pdf.desktop.in new file mode 100644 index 00000000..cbf0f065 --- /dev/null +++ b/xdg/rivendell-opsguide-pdf.desktop.in @@ -0,0 +1,11 @@ +[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 + diff --git a/xdg/rivendell-rivendell.menu b/xdg/rivendell-rivendell.menu index 67bca572..39d85f94 100644 --- a/xdg/rivendell-rivendell.menu +++ b/xdg/rivendell-rivendell.menu @@ -26,6 +26,14 @@ rivendell-rdhpiinfo-root.desktop + + Documentation + rivendell-documentation.directory + + rivendell-opsguide-html.desktop + rivendell-opsguide-pdf.desktop + + Log Tools rivendell-logtools.directory