diff --git a/ChangeLog b/ChangeLog index 9616c4d1..39f9837d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17851,3 +17851,6 @@ 2018-10-19 Fred Gleason * Removed check for Win32 installer from 'configure.ac'. * Removed win32 clauses from '.pro' files. +2018-10-19 Fred Gleason + * Removed the 'make slack' target. + * Removed the 'make slax' target. diff --git a/Makefile.am b/Makefile.am index c14c0808..7fac5ee4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,14 +79,6 @@ rpm: dist mv $(HOME)/rpmbuild/SRPMS/rivendell-*.src.rpm $(top_srcdir)/ rm $(HOME)/rpmbuild/SOURCES/rivendell-$(VERSION).tar.gz -slack: all - ./make_slack - -slax: all - rm -f rivendell-$(VERSION)-$(ARCH)-$(RPM_RELEASE).mo - ./make_slack - tgz2mo rivendell-$(VERSION)-$(ARCH)-$(RPM_RELEASE).tgz rivendell-$(VERSION)-$(ARCH)-$(RPM_RELEASE).mo - zip: dist tar -zxf rivendell-@VERSION@.tar.gz zip -r rivendell-@VERSION@.zip rivendell-@VERSION@ @@ -110,14 +102,11 @@ EXTRA_DIST = autogen.sh\ get_distro.pl\ get_target.sh\ INSTALL-WINDOWS\ - make_slack.in\ PACKAGE_VERSION\ rdrepld-suse.in\ rivendell.ism\ rivendell.pro\ rivendell.spec.in\ - slack-desc.in\ - slack_doinst.sh\ UPGRADING CLEANFILES = *~\ @@ -130,11 +119,9 @@ CLEANFILES = *~\ DISTCLEANFILES = config.guess\ config.sub\ ltmain.sh\ - make_slack\ rdrepld-suse\ rivendell\ - rivendell.spec\ - slack-desc + rivendell.spec MAINTAINERCLEANFILES = *~\ *.tar.gz\ diff --git a/configure.ac b/configure.ac index 896b3298..25cb581d 100644 --- a/configure.ac +++ b/configure.ac @@ -461,8 +461,6 @@ ln -s ../../icons/trashcan-32x32.png docs/opsguide/trashcan-32x32.png AC_CONFIG_FILES([rivendell.spec \ Makefile \ - make_slack \ - slack-desc \ rdrepld-suse \ conf/rd-bin.conf \ icons/Makefile \ @@ -551,7 +549,6 @@ AC_CONFIG_FILES([rivendell.spec \ xdg/Makefile \ ]) AC_OUTPUT() -chmod 755 make_slack chmod 755 rdrepld-suse # diff --git a/make_slack.in b/make_slack.in deleted file mode 100755 index 1f89c88f..00000000 --- a/make_slack.in +++ /dev/null @@ -1,185 +0,0 @@ -#!/bin/bash - -# make_slack -# -# Make a Slackware package. -# -# (C) Copyright 2006,2016 Fred Gleason -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation; -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, -# Boston, MA 02111-1307 USA -# - -# -# USAGE -# make_slack [] -# - -# -# Clean the build tree -# -BUILD_DIR=/var/tmp/rivendell-@VERSION@ -rm -rf $BUILD_DIR - -# -# Build the package tree -# -mkdir -p $BUILD_DIR@LOCAL_PREFIX@/bin -cp cae/.libs/caed $BUILD_DIR@LOCAL_PREFIX@/bin/ -chmod 4755 $BUILD_DIR@LOCAL_PREFIX@/bin/caed -cp ripcd/.libs/ripcd $BUILD_DIR@LOCAL_PREFIX@/bin/ -chmod 4755 $BUILD_DIR@LOCAL_PREFIX@/bin/ripcd -cp rdcatchd/.libs/rdcatchd $BUILD_DIR@LOCAL_PREFIX@/bin/ -chmod 4755 $BUILD_DIR@LOCAL_PREFIX@/bin/rdcatchd -cp rdadmin/.libs/rdadmin $BUILD_DIR@LOCAL_PREFIX@/bin/ -cp rdairplay/.libs/rdairplay $BUILD_DIR@LOCAL_PREFIX@/bin/ -cp rdpanel/.libs/rdpanel $BUILD_DIR@LOCAL_PREFIX@/bin/ -cp rdcatch/.libs/rdcatch $BUILD_DIR@LOCAL_PREFIX@/bin/ -cp utils/rdgen/rdgen $BUILD_DIR@LOCAL_PREFIX@/bin/ -cp rdlibrary/.libs/rdlibrary $BUILD_DIR@LOCAL_PREFIX@/bin/ -cp rdlogedit/.libs/rdlogedit $BUILD_DIR@LOCAL_PREFIX@/bin/ -cp rdlogmanager/.libs/rdlogmanager $BUILD_DIR@LOCAL_PREFIX@/bin/ -cp rdcastmanager/.libs/rdcastmanager $BUILD_DIR@LOCAL_PREFIX@/bin/ -cp rdlogin/.libs/rdlogin $BUILD_DIR@LOCAL_PREFIX@/bin/ -mkdir -p /$BUILD_DIR@LOCAL_PREFIX@/lib -cp lib/.libs/librd-@VERSION@.so $BUILD_DIR@LOCAL_PREFIX@/lib/ -ln -s @LOCAL_PREFIX@/lib/librd-@VERSION@ $BUILD_DIR@LOCAL_PREFIX@/lib/librd.so -cp utils/rmlsend/.libs/rmlsend $BUILD_DIR@LOCAL_PREFIX@/bin/ -cp utils/rdgpimon/.libs/rdgpimon $BUILD_DIR@LOCAL_PREFIX@/bin/ -cp utils/rdfilewrite/.libs/rdfilewrite $BUILD_DIR@LOCAL_PREFIX@/bin/ -cp utils/rdimport/.libs/rdimport $BUILD_DIR@LOCAL_PREFIX@/bin/ -cp scripts/rd_audio_sync $BUILD_DIR@LOCAL_PREFIX@/bin/ -cp scripts/rd_config $BUILD_DIR@LOCAL_PREFIX@/bin/ -mkdir -p $BUILD_DIR@LOCAL_PREFIX@/sbin -cp utils/sas_shim/.libs/sas_shim $BUILD_DIR@LOCAL_PREFIX@/sbin/ -cp utils/rddbcheck/.libs/rddbcheck $BUILD_DIR@LOCAL_PREFIX@/sbin/ -mkdir -p $BUILD_DIR@libexecdir@ -cp web/rdfeed/.libs/rdfeed.xml $BUILD_DIR@libexecdir@/ -cp web/rdcastmanager/.libs/rdcastmanager.cgi $BUILD_DIR@libexecdir@/ -ln -s @libexecdir@/rdfeed.xml $BUILD_DIR@libexecdir@/rdfeed.mp3 -cp icons/greencheckmark.png $BUILD_DIR@libexecdir@/ -cp icons/redx.png $BUILD_DIR@libexecdir@/ -cp icons/greenball.png $BUILD_DIR@libexecdir@/ -cp icons/redball.png $BUILD_DIR@libexecdir@/ -cp icons/whiteball.png $BUILD_DIR@libexecdir@/ -mkdir -p $BUILD_DIR/etc/httpd/extra -cp conf/rd-bin.conf $BUILD_DIR/etc/httpd/extra/ -mkdir -p $BUILD_DIR@LOCAL_PREFIX@/share/srlabs -cp lib/librd_es.qm $BUILD_DIR@LOCAL_PREFIX@/share/srlabs/ -cp rdadmin/rdadmin_es.qm $BUILD_DIR@LOCAL_PREFIX@/share/srlabs/ -cp rdairplay/rdairplay_es.qm $BUILD_DIR@LOCAL_PREFIX@/share/srlabs/ -cp rdpanel/rdpanel_es.qm $BUILD_DIR@LOCAL_PREFIX@/share/srlabs/ -cp rdcatch/rdcatch_es.qm $BUILD_DIR@LOCAL_PREFIX@/share/srlabs/ -cp rdlibrary/rdlibrary_es.qm $BUILD_DIR@LOCAL_PREFIX@/share/srlabs/ -cp rdlogedit/rdlogedit_es.qm $BUILD_DIR@LOCAL_PREFIX@/share/srlabs/ -cp rdlogin/rdlogin_es.qm $BUILD_DIR@LOCAL_PREFIX@/share/srlabs/ -cp rdlogmanager/rdlogmanager_es.qm @LOCAL_PREFIX@/share/srlabs/ -cp utils/rdgpimon/rdgpimon_es.qm $BUILD_DIR@LOCAL_PREFIX@/share/srlabs/ -cp utils/rmlsend/rmlsend_es.qm $BUILD_DIR@LOCAL_PREFIX@/share/srlabs/ -mkdir -p $BUILD_DIR/etc/init.d -cp rivendell-suse $BUILD_DIR/etc/init.d/rivendell -mkdir -p $BUILD_DIR/usr/share/icons/hicolor/16x16/apps -cp icons/rivendell-16x16.xpm $BUILD_DIR/usr/share/icons/hicolor/16x16/apps/rivendell.xpm -mkdir -p $BUILD_DIR/usr/share/icons/hicolor/22x22/apps -cp icons/rivendell-22x22.xpm $BUILD_DIR/usr/share/icons/hicolor/22x22/apps/rivendell.xpm -mkdir -p $BUILD_DIR/usr/share/icons/hicolor/32x32/apps -cp icons/rivendell-32x32.xpm $BUILD_DIR/usr/share/icons/hicolor/32x32/apps/rivendell.xpm -mkdir -p $BUILD_DIR/usr/share/icons/hicolor/48x48/apps -cp icons/rivendell-48x48.xpm $BUILD_DIR/usr/share/icons/hicolor/48x48/apps/rivendell.xpm -mkdir -p $BUILD_DIR/usr/share/icons/hicolor/64x64/apps -cp icons/rivendell-64x64.xpm $BUILD_DIR/usr/share/icons/hicolor/64x64/apps/rivendell.xpm -mkdir -p $BUILD_DIR/usr/share/icons/hicolor/128x128/apps -cp icons/rivendell-128x128.xpm $BUILD_DIR/usr/share/icons/hicolor/128x128/apps/rivendell.xpm -mkdir -p $BUILD_DIR/usr/share/applications -cp xdg/rdadmin.desktop $BUILD_DIR/usr/share/applications/ -cp xdg/rdairplay.desktop $BUILD_DIR/usr/share/applications/ -cp xdg/rdpanel.desktop $BUILD_DIR/usr/share/applications/ -cp xdg/rdcatch.desktop $BUILD_DIR/usr/share/applications/ -cp xdg/rdgpimon.desktop $BUILD_DIR/usr/share/applications/ -cp xdg/rdlibrary.desktop $BUILD_DIR/usr/share/applications/ -cp xdg/rdlogedit.desktop $BUILD_DIR/usr/share/applications/ -cp xdg/rdlogmanager.desktop $BUILD_DIR/usr/share/applications/ -cp xdg/rmlsend.desktop $BUILD_DIR/usr/share/applications/ -mkdir -p $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp AUTHORS $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp ChangeLog $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp COPYING $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp INSTALL $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp NEWS $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp README $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp SupportedCards $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp ToDo $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp conf/rd.conf-sample $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp conf/rd.conf-complete-sample $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp conf/my.cnf-master $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp conf/my.cnf-standby $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/cae.sxw $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/catchd.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/colors $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/GPIO.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/ripc.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/SWITCHERS.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/JACK.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/ENCODERS.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/pam_rd.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/rml.sxw $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/audio_perms.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/audio_ports.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/cart.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/clipboard.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/cuts.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/decks.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/groups.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/log_format.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/logs.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/panels.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/rd_airplay.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/rd_library.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/rd_logedit.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/recordings.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/services.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/sources.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/svc_rec_format.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/stations.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/triggers.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/ttys.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/users.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/tables/version.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -mkdir -p $BUILD_DIR/var/run/rivendell -cp docs/implemented_macros.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp utils/sas_shim/rc.sas_shim $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/reports.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/NOW+NEXT.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/WIN32.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -cp docs/ALSA.txt $BUILD_DIR/usr/doc/rivendell-@VERSION@ -mkdir -p $BUILD_DIR/install -cp slack-desc $BUILD_DIR/install/ -cp slack_doinst.sh $BUILD_DIR/install/doinst.sh - -# -# Generate the package -# -SOURCE_DIR=`pwd` -cd $BUILD_DIR -makepkg --prepend --linkadd y --chown n rivendell.tgz -cd $SOURCE_DIR -cp $BUILD_DIR/rivendell.tgz ./rivendell-@VERSION@-i586-@RPM_RELEASE@.tgz - -# -# Clean up and exit -# -rm -r $BUILD_DIR - - -# End of make_slack diff --git a/slack-desc.in b/slack-desc.in deleted file mode 100644 index dcbeacce..00000000 --- a/slack-desc.in +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -rivendell-@VERSION@-i586-@RPM_RELEASE@: rivendell (A Radio Broadcast Automation System) -rivendell-@VERSION@-i586-@RPM_RELEASE@: -rivendell-@VERSION@-i586-@RPM_RELEASE@: Rivendell aims to be a complete radio broadcast automation solution, with -rivendell-@VERSION@-i586-@RPM_RELEASE@: facilities for the acquisition, management, scheduling and playout of -rivendell-@VERSION@-i586-@RPM_RELEASE@: audio content. -rivendell-@VERSION@-i586-@RPM_RELEASE@: -rivendell-@VERSION@-i586-@RPM_RELEASE@: -rivendell-@VERSION@-i586-@RPM_RELEASE@: -rivendell-@VERSION@-i586-@RPM_RELEASE@: -rivendell-@VERSION@-i586-@RPM_RELEASE@: -rivendell-@VERSION@-i586-@RPM_RELEASE@: diff --git a/slack_doinst.sh b/slack_doinst.sh deleted file mode 100755 index b0ba4128..00000000 --- a/slack_doinst.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# -# slack_doinst.sh -# -# Libradio installation package script for Slackware -# -# Copyright 2002-2006,2016 Fred Gleason -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -/sbin/ldconfig - - -# End of slack_doinst.sh -